Commit Graph

260 Commits

Author SHA1 Message Date
Pratik Naik
e68bfaf1fe Merge remote branch 'mainstream/master'
Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb
2010-03-12 16:00:01 +00:00
Stefan Penner
4bc2cbc3cf Load RAILS_VERSION relative to the gemspec file. 2010-03-06 21:33:28 -08:00
Bryan Helmkamp
deb00bcb8c Read Rails version from a file instead of modifying the load path and doing requires
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-03-04 21:25:52 -08:00
Jeremy Kemper
5c40c2691d Stray line. Typo. 2010-03-02 10:44:40 -08:00
Jeremy Kemper
56ea20605a Wordsmith gem descriptions 2010-03-02 10:43:41 -08:00
Bryan Helmkamp
f221a6f19f Leverage VERSION constants from gemspecs to avoid tedious updates when releasing 2010-03-02 00:32:53 -05:00
Bryan Helmkamp
a4111bbca0 Update versions of all components to normalize them to new format 2010-03-02 00:32:48 -05:00
Bryan Helmkamp
11db694e0b Remove cruft in the gem packaging and release code 2010-03-01 19:00:19 -08:00
Joshua Peek
4377deed35 ensure activemodel lib is setup correctly 2010-02-28 18:27:00 -06:00
Joshua Peek
1a2fba1b6b don't expand test path 2010-02-28 18:26:00 -06:00
José Valim
ae8070e21b Add missing information about attributes method. 2010-02-28 11:43:13 +01:00
José Valim
32afcdcb88 ActiveModel::Lint should not require our models to respond to id. 2010-02-28 11:39:39 +01:00
Jeremy Kemper
2ba6049506 Accept array of attributes as arg also, like 2.3 2010-02-25 13:07:48 -08:00
Jeremy Kemper
f7b0a857e9 Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice. 2010-02-25 09:32:29 -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
José Valim
6fa2bbfd10 Fix AMo isolated tests. 2010-02-22 08:45:41 +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
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
Joshua Peek
eec2d301d4 Fix test load paths for those not using bundler 2010-02-15 10:20:11 -06:00
Pratik Naik
6f3c5f6787 Merge remote branch 'mainstream/master'
Conflicts:
	railties/README
	railties/guides/source/active_support_core_extensions.textile
	railties/guides/source/getting_started.textile
	railties/lib/generators/rails/app/templates/README
2010-02-14 19:28:05 +00:00
Xavier Noria
9fd9e5d4f7 fixes doc generation
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-10 14:37:56 -08: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
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
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
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
Pratik Naik
8260f0b40f Merge remote branch 'mainstream/master'
Conflicts:
	railties/guides/source/3_0_release_notes.textile
2010-02-04 13:14:44 +00:00
David Heinemeier Hansson
79817aa9e7 Move to 3.0.0.beta 2010-02-03 17:29:51 -08:00
Mikel Lindsaar
12681c2a71 Merge branch 'master' of git://github.com/rails/rails
Conflicts:
	activemodel/README
	activemodel/lib/active_model/errors.rb
	activemodel/lib/active_model/serialization.rb
	railties/guides/source/3_0_release_notes.textile
2010-02-02 14:04:23 +11:00
Mikel Lindsaar
d1eed079e1 Merge branch 'master' of git://github.com/rails/rails 2010-02-02 10:51:19 +11:00
Pratik Naik
fdcf4d6c51 Merge remote branch 'mainstream/master' 2010-02-01 23:42:38 +00:00
Carl Lerche
9f01dff9c2 Get rails tests running on bundler 0.9 2010-01-31 19:13:43 -08:00
Mikel Lindsaar
65ad16568c Updating copyright dates on all licenses 2010-02-01 10:10:53 +11:00
Mikel Lindsaar
a07d0f8786 Full update on ActiveModel documentation 2010-02-01 10:08:20 +11:00
Pratik Naik
ed60021f39 Merge remote branch 'mainstream/master'
Conflicts:
	activemodel/lib/active_model/state_machine.rb
2010-01-31 14:32:26 +00: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
José Valim
d6e2f5013c Drop AR I18n deprecation and simple use errors.messages as fallback. 2010-01-30 13:12:12 +01:00
Pratik Naik
efd0bd3b73 Merge remote branch 'mainstream/master' 2010-01-24 01:33:18 +05:30
Yehuda Katz
1a50d2e66a Stop overriding LoadError.new to return a MissingSourceError (and sometimes nil!) 2010-01-19 22:35:26 -08:00
Pratik Naik
c71120e29c Merge remote branch 'mainstream/master' 2010-01-19 13:40:26 +05:30
Mikel Lindsaar
3cb0283fb6 Documentation cleanup and linkage for validator 2010-01-19 11:29:01 +11:00
Mikel Lindsaar
9aee365924 Adding ActiveModel::Validations documentation 2010-01-18 18:29:33 +11:00
Mikel Lindsaar
91c38403be Adding documentation for ActiveModel::Translation 2010-01-18 18:13:49 +11:00
Mikel Lindsaar
71328a9856 Fixing up state machine docs 2010-01-18 17:20:25 +11:00
Gavin Stark
6e45bf53fb Fixing documentation on ActiveModel::Observer#observed_classes 2010-01-18 00:21:45 -05:00
Nestor Ovroy
aa8cbb79dc Partial Documentation for ActiveModel::StateMachine 2010-01-18 14:54:02 +10:00