Commit Graph

13187 Commits

Author SHA1 Message Date
Jeremy Kemper
763f32ab47 metaclass deprecated in 2.3.6 2010-02-25 11:12:27 -08:00
Jeremy Kemper
ffc45f3e71 Fix dangling klass reference 2010-02-25 11:01:15 -08:00
Jeremy Kemper
0b87d114bd Missed singleton_class 2010-02-25 10:57:29 -08:00
Jeremy Kemper
c7f9e8c06c Fix test on 1.8.8. Broken by inherited hook now running before Class.new block. 2010-02-25 10:46:29 -08:00
Thomas R. Koll
45ceacd6de load_path is expecting a String in the application.rb generator
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-25 10:45:34 -08:00
Jeremy Kemper
f7b0a857e9 Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice. 2010-02-25 09:32:29 -08:00
Jeremy Kemper
6b12d74026 Commented metaprogramming turned out to be noisier not clearer 2010-02-25 09:28:18 -08:00
David Heinemeier Hansson
bf0f14579a let the rails command recurse upwards looking for script/rails, and exec ruby on it for better portability [Xavier Noria] (Closes #4008) 2010-02-25 08:32:37 -08:00
David Heinemeier Hansson
a524d42acc Merge branch 'master' of github.com:rails/rails 2010-02-25 08:31:49 -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
Santiago Pastorino
529d0f5812 add time_separator for minutes only if minutes aren't hidden
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-24 18:40:44 -08:00
José Valim
df85ab41c1 Renamed LocalizedCache to DetailsCache. 2010-02-24 22:17:26 +01:00
José Valim
9d7d6cd7ba Use render instead render_to_body. 2010-02-24 22:17:25 +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
Carl Lerche
ba57575e03 Remove references to ActionDispatch::Routing::Routes in favor of Rails.appication.routes. 2010-02-24 10:52:16 -08:00
José Valim
60ca754b97 Remove the renderer option from the hash. 2010-02-24 15:45:33 +01: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
47498a7f59 Woops, forgot to actually add active_support/core_ext/file/path.rb 2010-02-23 17:42:26 -08:00
Carlhuda
24ab5665b2 Revert "Fix test load paths for those not using bundler"
This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818.

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
a73f682e43 Make AD::Response correctly handle bodies that respond_to?(:to_path) as per the Rack spec 2010-02-23 16:29:29 -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
Santiago Pastorino
ee541049fd avoid @lock_value not initialized warning 2010-02-22 14:08:07 -08:00
Santiago Pastorino
2b43021499 avoid @transaction_joinable not initialized warning 2010-02-22 14:07:53 -08:00
Santiago Pastorino
ca92e92ba1 avoid active not initialized warning 2010-02-22 14:07:44 -08:00
José Valim
35e0975af8 Rename erubis_implementation to erb_implementation. 2010-02-22 13:58:29 +01:00
José Valim
d92e855492 Include missing modules. 2010-02-22 13:13:26 +01:00
Mikel Lindsaar
cefc136ec3 Adding options to register observers and interceptors through ActionMailer::Base.register_observer and ActionMailer::Base.register_interceptor. These hook into Mail.register_interceptor and Mail.register_observer. Also bumped Mail requirement to 2.1.3
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-22 09:15:48 +01:00
David Chelimsky
a6684eeb78 don't set @expected.date in generated mailer test
Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com>
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-22 09:15:27 +01:00
José Valim
6fa2bbfd10 Fix AMo isolated tests. 2010-02-22 08:45:41 +01:00
Martin Schürrer
6bc24d40d5 Use ActionDispatch::Routing everywhere 2010-02-21 13:43:51 -08:00
Martin Schürrer
4cdfe98d92 Typo 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
55ae903c3f Store compiled parameter filters so we don't have to compile them in each request. 2010-02-21 14:29:40 +01:00
José Valim
87a011df6f Make install appear on rake -T. 2010-02-21 14:18:40 +01:00
José Valim
4477bccda6 Also check if application is a valid constant in rake rails:update. 2010-02-21 13:44:08 +01:00
José Valim
7fe4ca3253 Add a test for default_url_options in AM. 2010-02-21 13:19:21 +01:00
Prem Sichanugrist
8f97e9d19a Add validators reflection so you can do 'Person.validators' and 'Person.validators_on(:name)'.
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-21 12:37:46 +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
José Valim
9dd67fce25 Add to_key and to_param methods to ActiveModel::Conversion. 2010-02-21 09:08:59 +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
José Valim
fed72b5842 Rename engines_load_path to railties_load_path. 2010-02-20 15:46:55 +01: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 e7055e5b084f5e29e9cf8dab8d56943da65ccb43.
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
Santiago Pastorino
e4b910f6a3 require publicize_conversion_method to ensure to_date and to_datetime became public before redefining them (avoid warnings) 2010-02-19 13:36:34 -08:00
Dirkjan Bussink
a0a01d0c98 Remove empty line and trailing hash, breaks documentation generation
Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
2010-02-19 13:10:01 -08:00
Santiago Pastorino
7ad2c5c06f warning: instance variable @_const_missing not initialized fixed 2010-02-19 11:35:03 -08:00