Commit Graph

3536 Commits

Author SHA1 Message Date
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
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
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
José Valim
3f948a0e29 Merge master. 2010-02-17 00:48:04 +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
Pratik Naik
dc3cc6c608 Move batch finders to Relation 2010-02-12 22:31:03 +00:00
Mikel Lindsaar
5fe3dc4bf5 Adding ruby version spec to all gemspec files to at least 1.8.7
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-08 09:42:12 +01:00
David Heinemeier Hansson
28fe0c330a Silenced "SHOW FIELDS" and "SET SQL_AUTO_IS_NULL=0" statements from the MySQL driver to improve log signal to noise ration in development [DHH] 2010-02-06 13:20:47 -08:00
RomD
f44a0b1d52 fix usage examples and more to use new invocations
Signed-off-by: Carl Lerche <carllerche@mac.com>
2010-02-06 09:51:53 -08:00
Prem Sichanugrist
1d9d9d2d89 Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' will be run correctly [#3879 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-06 15:51:44 +01:00
Santiago Pastorino
44c46558a4 test_validates_acceptance_of_as_database_column fixed
[#3826 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-05 16:08:08 -08:00
Jeremy Kemper
c548e21365 Bump git versions to 3.0.0.beta1 since we've released 2010-02-05 09:24:12 -08:00
Jeremy Kemper
a81a2a29ab Bump arel dep 2010-02-05 09:21:45 -08:00
Jeremy Kemper
459ecaf95d Submarine the rake-gemcutter dep in Rakefiles 2010-02-05 00:03:03 -08:00
Jeremy Kemper
7b81f5981f Fix task defines 2010-02-04 18:44:32 -08:00
Jeremy Kemper
c1785f3282 Release using gemcutter gem:push tasks 2010-02-04 18:28:45 -08:00
Jeremy Kemper
23ad1eff0d Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always uses AS. 2010-02-04 10:08:06 -08:00
David Heinemeier Hansson
031139bb71 Homogenize gemspecs and remove the deprecated autorequire 2010-02-03 17:59:49 -08:00
David Heinemeier Hansson
dd13874ff6 Merge 2010-02-03 17:31:35 -08:00
David Heinemeier Hansson
79817aa9e7 Move to 3.0.0.beta 2010-02-03 17:29:51 -08:00
Jeremy Kemper
9b033d14b2 Merge remote branch 'mikel/master' 2010-02-03 17:03:21 -08:00
SubbaRao Pasupuleti
639e044298 removing , from ,= statement in WrappedDatabaseException constructor
[#3830 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-03 17:02:40 -08:00
Mikel Lindsaar
02ef8d20a1 Adding guard to make sure test database declarations exist before trying to auto create 2010-02-04 11:57:13 +11:00
Mikel Lindsaar
9d65390805 Added encoding qery support for SQLite3 to make rake db:charset work on all databases shipping with Rails 3 2010-02-03 18:06:38 +11:00
Mikel Lindsaar
fbdef7aafe Made rake db:create also create the test database if you are in development mode 2010-02-03 16:39:04 +11:00
Szymon Nowak
17bee0dd2f Change Rails::Generators::Migration protected instance methods to class methods. [#3820 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-02 10:18:48 +01:00
Prem Sichanugrist
ea2cbc86f7 Add test case for unable to run migration if ActiveRecord::Base.logger is nil (#3434)
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-02 10:14:51 +01:00
Corey Johnson
f4e5303bcf fixed migration logger bug [#3434 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-02 10:12:07 +01:00
Mikel Lindsaar
d1eed079e1 Merge branch 'master' of git://github.com/rails/rails 2010-02-02 10:51:19 +11:00
Jeremy Kemper
e5ab4b0d07 Convert to class_attribute 2010-02-01 02:02:42 -08:00
Carl Lerche
9f01dff9c2 Get rails tests running on bundler 0.9 2010-01-31 19:13:43 -08:00
Jeremy Kemper
9bd0422dd7 Bump arel dependency to 0.2.0 from 0.2.pre 2010-01-31 18:42:41 -08:00
Mikel Lindsaar
65ad16568c Updating copyright dates on all licenses 2010-02-01 10:10:53 +11:00
Joshua Peek
db49c706b6 Axe AM state machine
We're going do it eventually, get it done before 3.0 is final.
2010-01-30 18:38:01 -06:00
Pratik Naik
ec057ada07 Rely on arel to generate the correct sql when an empty array is supplied to IN predicate 2010-01-30 19:34:05 +00:00
José Valim
d6e2f5013c Drop AR I18n deprecation and simple use errors.messages as fallback. 2010-01-30 13:12:12 +01:00
Paul Rosania
766e857bea tsort-based dependency resolution for initializers
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-01-29 19:25:58 -08:00
Carl Lerche
f15bbcf97e Move the ActiveRecord generator settings into the Railtie 2010-01-28 10:45:25 -08:00
Jeremy Kemper
fd0eb3d904 Clear up some ivar warnings 2010-01-27 19:33:03 -08:00
Aaron Patterson
beda2d43d6 future proofing the sqlite3 adapter code
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
2010-01-26 15:09:11 -08:00
Jack Christensen
c5b652f3d2 PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns [#3777 state:resolved] 2010-01-25 20:57:07 -06:00
Carlhuda
64f8c87b1d Fix AR's rake tasks to work with the Rails::Application refactor 2010-01-25 17:55:54 -08:00
José Valim
02908e1142 As first step setup the load path and lazy compare middlewares. 2010-01-25 22:59:08 +01:00
José Valim
3b6f659fb6 Add active_model/railtie back to generated boot.rb, add models back to paths, load active_support/railtie since we need it and ensure default logger is set before config. 2010-01-25 01:12:22 +01:00
José Valim
e548f96b1d Rename plugin_name to railtie_name and engine_name. 2010-01-24 12:23:21 +01:00
José Valim
f915f9e339 Merge branch 'master' into app
Conflicts:
	railties/lib/rails/application.rb
2010-01-23 22:53:26 +01:00