mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,375 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

505 Commits

Author SHA1 Message Date
Santiago Pastorino 460c4efd71 Merge CHANGELOGs from 3-0-stable 2010-10-18 12:24:41 -02:00
wycats cc8e386d08 Always pull in version for frameworks (standardize autoload / require / none) 2010-10-10 16:12:04 -07:00
Xavier Noria db520042b3 Merge branch 'master' of git://github.com/lifo/docrails 2010-10-06 23:16:13 +02:00
José Valim 232e56ce87 No need to pass self as parameter here. 2010-10-04 22:32:29 +02:00
Ernie Miller 21cb1d40b9 Test to_model being called in ActiveModel::Naming helpers 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-10-04 21:26:42 +02:00
Ernie Miller 33aaa15f62 Convert to model before calling model_name on a record in ActiveModel::Naming 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-10-04 21:26:41 +02:00
fastred 4ea9a8d9ad Fix syntax error in ActiveModel::Validations .validate example 2010-10-01 18:32:46 +02:00
Neeraj Singh 72c1e19c33 after_create in ActiveModel should in the order specified 
[#5650 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-27 23:11:31 +02:00
José Valim fe0251e408 Merge remote branch 'miloops/warnings' 
Conflicts:
	actionpack/lib/action_controller/metal/url_for.rb
 2010-09-27 21:00:54 +02:00
thedarkone 9c57bd8578 Fix Namind#model_name. 2010-09-27 17:46:00 +02:00
Emilio Tagua be9883b09d Don't redefine existing attributes accessors. 2010-09-27 11:19:19 -03:00
John Firebaugh 75a960ca6e Don't act destructively on ActiveModel::Name#human options hash. [#5366 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-25 10:59:54 +02:00
Rodrigo Rosenfeld Rosas 8d30193b08 Properly interpolate i18n keys in modules [#5572 state:resolved] 2010-09-24 20:41:12 +02:00
Obie Fernandez 275f922a23 Better shortcut options for custom validators [#5672 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-24 12:49:16 +02:00
Xavier Noria 8c0c815ba7 resolves rdoc conflict 2010-09-23 22:35:08 +02:00
Emilio Tagua dc2f26ca38 Perf: refactor methods using inject when not need in activemodel. 
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-09-22 18:08:03 -03:00
Neeraj Singh 8ae913664f remove irrelevant comments 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-18 20:33:40 +02:00
Alexey Mahotkin dfebdb1b03 Tiny fixes to rdoc 2010-09-16 17:10:36 +04:00
Mikel Lindsaar bca9b84a4a Fixing documentation to reflect deprecated add_to_base 2010-09-12 14:19:38 +10:00
Jeremy Kemper d79b1aa0ba Fewer object allocations 2010-09-09 14:37:58 -07:00
Jeremy Kemper cb67d16629 Cheaper attribute_method_matchers 2010-09-09 14:37:58 -07:00
Jeremy Kemper 82ea5db030 Fix require for class_attribute 2010-09-09 14:34:29 -07:00
Jakub Suder 2524cf404c fixed some issues with JSON encoding 
- as_json in ActiveModel should return a hash
  and handle :only/:except/:methods options
- Array and Hash should call as_json on their elements
- json methods should not modify options argument

[#5374 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-09-07 11:33:10 -07:00
Carlos Antonio da Silva 69a4c67a3f Fix docs related to param_key in ActiveModel::Naming 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-05 18:14:37 +02:00
Piotr Sarnacki bf1ac82cec Add some documantation on new route_key and param_key in ActiveModel::Naming 2010-09-03 22:59:15 +02:00
Piotr Sarnacki 6e5aed057f Prepared ActiveModel::Naming to handle cases for namespaced isolated engines 2010-09-03 22:59:15 +02:00
José Valim 599e46bf24 Revert "Setup explicit requires for files with exceptions. Removed them from autoloading." 
Booting a new Rails application does not work after this commit [#5359 state:open]

This reverts commit 38a421b34d.
 2010-09-02 21:11:03 +02:00
Andreas Garnæs 1503e45e2e ActiveModel#to_xml fix (renamed parameter). 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-02 12:55:45 +02:00
Łukasz Strzałkowski 38a421b34d Setup explicit requires for files with exceptions. Removed them from autoloading. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-02 11:54:04 +02:00
Subba Rao Pasupuleti 0ae81a2124 Refactoring conditional logic 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-01 14:00:26 +02:00
Subba Rao Pasupuleti 2d74ed49f4 reader method eliminates defined? checks 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-01 13:59:53 +02:00
Neeraj Singh 8402488568 adding new test for ActiveModel::Serialization 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-31 17:45:03 +02:00
José Valim d37a65307d Merge josevalim/deprecations branch. 
I maintained on purpose the DeprecatedUrlOptions in ActionMailer and the Deprecated configuration in Railties because they were already addressed by Piotr in his RSoC work.
 2010-08-30 15:55:10 -03:00
Jeremy Kemper b861942691 Update CHANGELOGs for 3.0 release and upcoming 3.1 2010-08-29 22:06:48 -07:00
José Valim f0ee4a6002 Remove deprecations in ActiveModel. 2010-08-29 20:45:34 -03:00
Xavier Noria a302a333f8 revises a deprecation message 2010-08-29 22:47:18 +02:00
Jeremy Kemper 0d0c46abd1 Clean up CHANGELOGs 2010-08-28 15:45:14 -07:00
Jaime Iniesta 5430f5bd06 lifecycle should be two words, life cycle 2010-08-26 14:23:58 +02:00
James Miller 4b07bc8475 to_json => as_json 2010-08-25 15:23:21 -07:00
David Heinemeier Hansson 21b1f29720 Master is now targeting 3.1.0.beta 2010-08-23 21:44:57 -05:00
Santiago Pastorino 9992a1a4bf type fixed 2010-08-22 19:59:36 -03:00
Neeraj Singh 2ffa50f5a9 after_validation should be called irrespective of the result of validation. 
I confirmed that this is the behavior on 2.3.x .

[5419 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-20 11:24:43 -03:00
Xavier Noria 43291469cb deletes the rdoc task of each component, they are no longer published separately 2010-08-20 13:30:31 +02:00
Santiago Pastorino cad8bef5ea Bump up rdoc to 2.5.10 2010-08-18 11:44:12 -03:00
Xavier Noria a0ca3d1067 Merge remote branch 'docrails/master' 2010-08-18 00:25:32 +02:00
Xavier Noria ea2ad26a8d you rarely want ^ or $ in validations, use \A when you mean \A 2010-08-18 00:15:01 +02:00
Trey Bean bee414748c Missing object for comparison in ActiveModel::EachValidator example code. 2010-08-17 12:51:13 -06:00
Xavier Noria fb6b805620 code gardening: we have assert_(nil|blank|present), more concise, with better default failure messages - let's use them 2010-08-17 03:32:11 +02:00
José Valim d0cf212cb5 to_key should return all exists keys (if any exists), regardless if the object is persisted or not. If you need it to reflect persistance, you should use to_param. 2010-08-15 11:29:15 -03:00
Subba Rao Pasupuleti e516378410 Adding missing required statement 
[#5056 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-08-14 13:17:32 +02:00
Santiago Pastorino b95d6e84b0 Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;) 2010-08-14 13:17:32 +02:00
Subba Rao Pasupuleti f8f437191f no callbacks should be created for empty array [#5289 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-14 13:17:30 +02:00
Subba Rao Pasupuleti b61ff257e9 tidy up validations length code [#5297 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-14 13:17:29 +02:00
Greg Campbell 1577eafe77 Add missing ActiveModel::Validations require 
[#5311 state: resolved]

ActiveModel::Validations uses Hash#except, but does not require it from
ActiveSupport.  (This wasn't showing up in the tests, because it was
required in the helper, and was also required in
ActiveModel::Serialization).

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-14 13:17:29 +02:00
Subba Rao Pasupuleti b7fdc937fa Adding missing required statement 
[#5056 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-08-14 06:27:15 -03:00
Santiago Pastorino b451de0d6d Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;) 2010-08-14 04:12:33 -03:00
Subba Rao Pasupuleti ef0da581e9 no callbacks should be created for empty array [#5289 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-12 13:12:26 -03:00
Subba Rao Pasupuleti e82b38cd57 tidy up validations length code [#5297 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-12 13:12:03 -03:00
Greg Campbell 90a7915ab2 Add missing ActiveModel::Validations require 
[#5311 state: resolved]

ActiveModel::Validations uses Hash#except, but does not require it from
ActiveSupport.  (This wasn't showing up in the tests, because it was
required in the helper, and was also required in
ActiveModel::Serialization).

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-12 13:11:48 -03:00
Xavier Noria 4134d7db34 Merge remote branch 'docrails/master' 2010-08-12 17:36:09 +02:00
Paco Guzman 8a2b69b727 applied guidelines to "# =>" 2010-08-12 17:09:58 +02:00
Santiago Pastorino a6c6cbfb55 ActiveModel::Base doesn't exist, include_root_in_json is a class_attribute for the classes which includes this module 2010-08-10 11:53:58 -03:00
Xavier Noria fff917e37d fixes a typo reported by rymai 2010-08-10 15:34:54 +02:00
Adam Meehan 9a43640ed1 typo in AM 2010-08-09 13:44:04 +10:00
Xavier Noria 3e678240f4 edit pass to AMo::Serializers::JSON 2010-08-06 13:56:38 +02:00
Xavier Noria 3cbe111439 Merge remote branch 'docrails/master' 2010-08-05 01:15:57 +02:00
Neeraj Singh 589e6977d7 adding documentation to ActiveSupport::Concern ht:strictly typed for an awesome example 
some minor documentation changes
 2010-08-04 17:03:03 -04:00
Subba Rao Pasupuleti 8d9d8bc93c Tidy up error.rb code 
[#5288 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-08-03 14:54:13 -03:00
José Valim 84081fcc54 Freeze options so we raise an error when people modify it in place. 2010-08-03 15:36:23 +02:00
José Valim f23bc8444b validates_length_of should not change the options hash in place. [#5283 state:resolved] 2010-08-03 15:22:54 +02:00
rohit 621246f997 Failing test for validates_length_of, when both too_short and too_long messages are set [#5283 state:open] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-03 15:11:51 +02:00
Tore Darell 2c8a4a53a8 Remove or fix non-working examples and add a few tests to Dirty [#5185 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-03 10:47:30 +02:00
Neeraj Singh fb2b8fec24 adding test cases for ActiveModel::Errors 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-03 10:46:16 +02:00
Neeraj Singh 74f7e172c7 fixing documentation 2010-08-03 04:14:14 -04:00
Alex Le aeaab06c79 ActiveModel::Errors json serialization to work as Rails 3b4 [#5254 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-02 16:26:32 +02:00
Xavier Noria ccd45618ed Merge remote branch 'rails/master' 2010-07-30 02:35:24 +02:00
Xavier Noria 755af49755 edit pass to apply API guideline wrt the use of "# =>" in example code 2010-07-30 02:30:04 +02:00
Neeraj Singh 1a6d76223b expanding on the will_change! method in documentation 2010-07-29 09:18:29 -04:00
David Heinemeier Hansson 856fc4bbc3 Prep for RC 2010-07-26 12:53:25 -05:00
Xavier Noria 6aa1253588 Merge remote branch 'docrails/master' 2010-07-26 00:23:57 +02:00
Aaron Patterson b50635a59f update Rakefiles for RDoc 2.5 2010-07-23 21:11:29 +02:00
Santiago Pastorino b378b19430 Makes Rakefile activate rdoc >= 2.5.9 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-07-23 00:04:06 +02:00
Mislav Marohnić 3e196db6ad improve Active Model README 
- fix indentation problems
 - revised introductory text to state right away what the library is
 - improved examples: reduce heavy usage of ellipsis,
   don't mark paragraphs of text as code
 2010-07-22 10:03:55 +02:00
Neeraj Singh aa2235be7b replacing around with for in the comments for callbacks 2010-07-22 01:28:30 +02:00
Santiago Pastorino d16c5cc99b Change some missing README -> README.rdoc 2010-07-22 01:47:06 +08:00
José Valim 53310614d7 Reuse already existing classes for ActiveModel tests. 2010-07-21 13:00:56 +02:00
José Valim 508fba9e07 Add .rdoc extension to README files. 2010-07-21 12:51:14 +02:00
Piotr Sarnacki 6807b08099 Moved a few methods from RecordIdentifier to ActiveModel::Naming 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-21 11:29:58 +02:00
José Valim b22c11fa53 Add missing entries and tidy up CHANGELOG. 2010-07-19 15:14:26 +02:00
Neeraj Singh c9630d9d87 adding proper markup to comment 2010-07-16 09:58:01 -04:00
Santiago Pastorino 060ca6abce Add missing require to use Set 2010-07-11 02:55:47 -03:00
Santiago Pastorino 16c14f7465 Avoid interpreted as grouped expression warnings 2010-07-11 02:55:38 -03:00
José Valim 87f64ef05e Improve a bit the code in latest commits. 2010-07-08 22:59:41 +02:00
Łukasz Strzałkowski 4a26a292a0 Removing method before redefining it. It was causing warnings. [#5072 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-08 22:29:08 +02:00
José Valim c285f07a92 Change documentation for ActiveModel::MassAssignmentSecurity a bit and make debug always be called since some people may overwrite warn! to add extra behavior even if logger is not available. 2010-07-08 19:02:34 +02:00
Josh Kalderimis 4b66aab00f mass_assignment_security moved from AR to AMo, and minor test cleanup 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-08 18:28:45 +02:00
Santiago Pastorino 075f8b7241 Add a missing require to allow the usage of Array#to_xml 2010-07-03 09:59:51 -03:00
Jeremy Kemper d15256af6c Missing BigDecimal dependency 2010-06-27 16:28:04 -07:00
Santiago Pastorino 51be8dbded Move constantize from conversions to inflections. 
This removes ActiveModel dependency on TZInfo.

[#4979 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-26 20:49:30 +02:00
José Valim 7bd85a8fc2 Work around the fact the JSON gem was overwriting to_json implementation for all Ruby core classes. 
This is required because the JSON gem is incompatible with Rails behavior and was not allowing ActiveModel::Errors to be serialized.
So we need to ensure Rails implementation is the one triggered. [#4890 state:resolved]
 2010-06-26 12:01:13 +02:00