Commit Graph

2596 Commits

Author SHA1 Message Date
Joshua Peek
cbefcc88b3 add activesupport and activemodel load paths to actionpack tests 2010-02-28 18:25:02 -06:00
Joshua Peek
7317d9ef4c Remove implicit controller namespacing from new dsl 2010-02-28 16:39:01 -06:00
Carlhuda
4bdc783d37 1.9 seems to have a bug involving cloned classes and super. Fix it by not cloning (and instead creating classes on demand). The 1.9 bug should be investigated. 2010-02-26 18:25:56 -08:00
Carlhuda
050831803a If IntegrationSession is initialized with an objects that responds to #routes, automatically extend the URL helpers from the RouteSet onto it 2010-02-26 17:18:45 -08:00
Carlhuda
be0bf10a3c Upon further reflection, we realized that SharedTestRoutes is not really a hack, but is instead a standin (in the Rails tests) for Rails.application.routes.
* In a real application, action_controller/railties.rb does AC::Base.include(app.routes.url_helpers)
  * ActionController itself does not know about Rails.application, but instead can have named routes for any router
  * SharedTestRoutes are created in abstract_unit to stand in for Rails.application.routes, and is used in
    internal functional tests
2010-02-26 16:06:54 -08:00
Carlhuda
74df7795a8 Relatively speaking, it's not actually that bad... 2010-02-26 15:58:24 -08:00
Carlhuda
ab0cc7286f Setting UrlFor in with_routing is no longer needed now that it's not global 2010-02-26 15:56:38 -08:00
Carlhuda
3bad24c85d Remove traces of SharedTestRoutes from user code; leave it as a standin for Rails.application.routes in Rails internal tests 2010-02-26 15:44:22 -08:00
Carlhuda
5797575bac Stop setting UrlFor using SharedTestHelpers 2010-02-26 15:40:36 -08:00
Carlhuda
47fe14bfcc Silence test deprecation warnings 2010-02-26 15:34:12 -08:00
Carlhuda
98f77e0827 Rename named_url_helpers to url_helpers and url_helpers to url_for 2010-02-26 15:04:50 -08:00
José Valim
bd36418c51 Fix controller_path returnsing an empty string in Ruby 1.8.7 [#4036 status:resolved] 2010-02-26 11:51:21 +01:00
Carlhuda
f863045c45 Rename metaclass to singleton_class 2010-02-25 17:56:58 -08:00
Carlhuda
8760add31a Get URL helpers working again in integration tests. 2010-02-25 17:53:30 -08:00
Carlhuda
36fd9efb5e Continued effort to deglobalize the router 2010-02-25 17:53:01 -08:00
Carlhuda
a278f23310 Fix all of AP's tests with the non global router 2010-02-25 17:53:01 -08:00
Carlhuda
4b038f638d Merge branch 'master' of github.com:rails/rails 2010-02-25 17:53:01 -08:00
Carlhuda
226dfc2681 WIP: Remove the global router 2010-02-25 17:53:00 -08:00
Santiago Pastorino
f76eaa4b7c add time_separator for minutes only if minutes aren't hidden
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-25 08:31:02 -08:00
José Valim
df85ab41c1 Renamed LocalizedCache to DetailsCache. 2010-02-24 22:17:26 +01:00
José Valim
a39c7505bd Cleanup render callstack and make render(:json => {}, :status => 401) work again. 2010-02-24 22:17:25 +01:00
Carl Lerche
6a061187e2 Remove ActionController::Base.resources_path_names 2010-02-24 10:52:16 -08:00
Yehuda Katz
ae933a093d Fix render :file => "#{Rails.root}/public/404.html", :status => :not_found. Closes #8994 2010-02-23 22:45:42 -08:00
Carlhuda
24ab5665b2 Revert "Fix test load paths for those not using bundler"
This reverts commit eec2d301d4.

This commit broke tests. You cannot have a file called "bundler" on the load path.
2010-02-23 17:31:17 -08:00
Carlhuda
5e2bd08023 Makes send_file work again by deferring to Rack::Sendfile.
* Add the Rack::Sendfile middleware
  * Make the header to use configurable via config.action_dispatch.x_sendfile_header (default to "X-Sendfile"). 
  * Add Railties tests to confirm that these work
  * Remove the :stream, :buffer_size, and :x_senfile default options to send_file
  * Change the log subscriber to always say "Sent file"
  * Add deprecation warnings for options that are now no-ops

Note that servers can configure this by setting X-Sendfile-Type. Hosting companies and those creating packages of servers specially designed for Rails applications are encouraged to specify this header so that this can work transparently.
2010-02-23 17:06:35 -08:00
Carlhuda
3345af61fb Fix streaming by having it create a File object, which can be handled by Rack servers as appropriate 2010-02-23 15:37:17 -08:00
Martin Schürrer
6bc24d40d5 Use ActionDispatch::Routing everywhere 2010-02-21 13:43:51 -08:00
José Valim
a7b78e86b3 Add a tests which ensures filtered_parameters does not raise an error for a mixed array [#3928 status:resolved] 2010-02-21 14:40:48 +01:00
José Valim
250c809246 Require persisted? in ActiveModel::Lint and remove new_record? and destroyed? methods. ActionPack does not care if the resource is new or if it was destroyed, it cares only if it's persisted somewhere or not. 2010-02-21 11:12:14 +01:00
snusnu
f81c6bc040 AMo #key is now #to_key and CI is probably happy
Obviously #key is a too common name to be included
in the AMo interface, #to_key fits better and also
relates nicely to #to_param. Thx wycats, koz and
josevalim for the suggestion.

AR's #to_key implementation now takes customized
primary keys into account and there's a testcase
for that too.

The #to_param AMo lint makes no assumptions on how
the method behaves in the presence of composite
primary keys. It leaves the decision wether to
provide a default, or to raise and thus signal to
the user that implementing this method will need
his special attention, up to the implementers. All
AMo cares about is that #to_param is implemented
and returns nil in case of a new_record?.

The default CompliantObject used in lint_test
provides a naive default implementation that just
joins all key attributes with '-'.

The #to_key default implementation in lint_test's
CompliantObject now returns [id] instead of [1].
This was previously causing the (wrong) tests I
added for AR's #to_key implementation to pass. The
#to_key tests added with this patch should be
better.

The CI failure was caused by my lack of knowledge
about the test:isolated task. The tests for the
record_identifier code in action_controller are
using fake non AR models and I forgot to stub the
#to_key method over there. This issue didn't come
up when running the test task, only test:isolated
revealed it. This patch fixes that.

All tests pass isolated or not, well, apart from
one previously unpended test in action_controller
that is unrelated to my patch.
2010-02-20 20:17:29 -08:00
snusnu
9acd686753 Adds #key and #to_param to the AMo interface
This commit introduces two new methods that every
AMo compliant object must implement. Below are the
default implementations along with the implied
interface contract.

  # Returns an Enumerable of all (primary) key
  # attributes or nil if new_record? is true
  def key
    new_record? ? nil : [1]
  end

  # Returns a string representing the object's key
  # suitable for use in URLs, or nil if new_record?
  # is true
  def to_param
    key ? key.first.to_s : nil
  end

1) The #key method

Previously rails' record_identifier code, which is
used in the #dom_id helper, relied on calling #id
on the record to provide a reasonable DOM id. Now
with rails3 being all ORM agnostic, it's not safe
anymore to assume that every record ever will have
an #id as its primary key attribute.

Having a #key method available on every AMo object
means that #dom_id can be implemented using

  record.to_model.key # instead of
  record.id

Using this we're able to take composite primary
keys into account (e.g. available in datamapper)
by implementing #dom_id using a newly added

  record_key_for_dom_id(record)

method. The user can overwrite this method to
provide customized versions of the object's key
used in #dom_id.

Also, dealing with more complex keys that can
contain arbitrary strings, means that we need to
make sure that we only provide DOM ids that are
valid according to the spec. For this reason, this
patch sends the key provided through a newly added

  sanitize_dom_id(candidate_id)

method, that makes sure we only produce valid HTML

The reason to not just add #dom_id to the AMo
interface was that it feels like providing a DOM
id should not be a model concern. Adding #dom_id
to the AMo interface would force these concern on
the model, while it's better left to be implemented
in a helper.

Now one could say the same is true for #to_param,
and actually I think that it doesn't really fit
into the model either, but it's used in AR and it's
a main part of integrating into the rails router.

This is different from #dom_id which is only used
in view helpers and can be implemented on top of a
semantically more meaningful method like #key.

2) The #to_param method

Since the rails router relies on #to_param to be
present, AR::Base implements it and returns the
id by default, allowing the user to overwrite the
method if desired.

Now with different ORMs integrating into rails,
every ORM railtie needs to implement it's own
#to_param implementation while already providing
code to be AMo compliant. Since the whole point of
AMo compliance seems to be to integrate any ORM
seamlessly into rails, it seems fair that all we
really need to do as another ORM, is to be AMo
compliant. By including #to_param into the official
interface, we can make sure that this code can be
centralized in the various AMo compliance layers,
and not be added separately by every ORM railtie.

3) All specs pass
2010-02-19 23:31:25 -08:00
Carlhuda
a3c6ad7d5e Fix a bunch of pending tests by providing an introspection mode for the Response object that does up-front parsing of the headers to populate things like @etag 2010-02-19 19:19:20 -08:00
Yehuda Katz
bf8898b49b Revert "i18n translate with arrays issue solved"
This reverts commit e7055e5b08.
2010-02-19 15:05:46 -08:00
Santiago Pastorino
e7055e5b08 i18n translate with arrays issue solved 2010-02-19 13:59:15 -08:00
Joshua Peek
7d7f9ccfdf Reinstate pending tests that were supposed to be fixed before the
beta.

Shout louder this time so they actually get fixed.
2010-02-19 09:34:22 -06:00
Santiago Pastorino
af05420d6b i18n translate with arrays issue solved
Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
2010-02-18 16:41:00 -08:00
José Valim
3f948a0e29 Merge master. 2010-02-17 00:48:04 +01:00
José Valim
e8ef12e39d Make Railties tests green again. 2010-02-17 00:14:49 +01:00
José Valim
b1edd09662 Ensure render :text => resource first tries to invoke :to_text on it 2010-02-16 23:26:29 +01:00
José Valim
19787e6259 Should allow symbols in :only and :except in routes. 2010-02-16 22:39:08 +01:00
Prem Sichanugrist
f0523f72b4 Rename Rails::Subscriber to Rails::LogSubscriber 2010-02-16 22:36:15 +01:00
Joshua Peek
eec2d301d4 Fix test load paths for those not using bundler 2010-02-15 10:20:11 -06:00
Bruno Michel
f86421fb28 content_tag should escape its input
Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
2010-02-14 12:03:28 -08:00
David Heinemeier Hansson
d68f8ba5c3 simple_format returns a safe buffer escaping unsafe input [Santiago Pastorino] 2010-02-12 17:24:04 -08:00
Gabriel Mansour
b235af702a Fix pluralization for numbers formatted like '1.00'
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-07 12:12:09 -08:00
José Valim
de69c798db Fix nested attributes with specified collection. 2010-02-07 13:45:47 +01:00
José Valim
22c0390085 Add a test which ensures namespaced roots. 2010-02-06 11:52:28 +01:00
Yehuda Katz
5384df5589 Updates subscriber test for new output 2010-02-05 22:48:13 -08:00
Jeremy Kemper
31f8a59c16 Test that csrf meta content is html-escaped, too 2010-02-04 18:03:06 -08:00
Jeremy Kemper
6bf79f02be Revert dumb test 2010-02-04 17:49:23 -08:00