diff options
| author | rick <technoweenie@gmail.com> | 2008-06-29 12:13:58 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-06-29 12:13:58 -0700 |
| commit | 01db5ded54b0e3a2ea80d28e4841d40fcec23cdf (patch) | |
| tree | 9d30b4c51da7e8f0fb0fc77126450f63fd08e8fa /activesupport | |
| parent | 4cf93935b2478201863c01569e894c9dcf7e9074 (diff) | |
| parent | c9e366e997c6f3a383cfaa6351fa847e92de7fe4 (diff) | |
| download | rails-01db5ded54b0e3a2ea80d28e4841d40fcec23cdf.tar.gz rails-01db5ded54b0e3a2ea80d28e4841d40fcec23cdf.tar.bz2 rails-01db5ded54b0e3a2ea80d28e4841d40fcec23cdf.zip | |
Merge branch 'state_machine'
Some big changes:
* Added some redundant requires so active_support/inflecto can be loaded
without the rest of ActiveSupport.
* Disabled callbacks and validations until they are added and tested.
* Converted specs back to tests, using ActiveSupport::TestCase and the new
#test helper.
* As an experiment, I imported Scott Barron's awesome AASM gem into
ActiveModel. I added multiple state machine support and vastly improved
the API (no more aasm_* prefixes). All the old tests pass. If this bothers
people, I have no problems removing this and contributing the changes back to
AASM. I just feel like AMo is a better spot for all these 'modelish' features.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/inflector.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb index 47bd6e1767..8d55ad27ac 100644 --- a/activesupport/lib/active_support/inflector.rb +++ b/activesupport/lib/active_support/inflector.rb @@ -307,4 +307,9 @@ module ActiveSupport end end +# in case active_support/inflector is required without the rest of active_support require 'active_support/inflections' +require 'active_support/core_ext/string/inflections' +unless String.included_modules.include?(ActiveSupport::CoreExtensions::String::Inflections) + String.send :include, ActiveSupport::CoreExtensions::String::Inflections +end
\ No newline at end of file |