activemodel 3.1.3 → 3.1.4.rc1

data/lib/active_model/attribute_methods.rb

@@ -287,7 +287,7 @@ module ActiveModel
           unless instance_method_already_implemented?(matcher.method_name(attr_name))
             generate_method = "define_method_#{matcher.prefix}attribute#{matcher.suffix}"
 
-            if respond_to?(generate_method)
+            if respond_to?(generate_method, true)
               send(generate_method, attr_name)
             else
               method_name = matcher.method_name(attr_name)

data/lib/active_model/callbacks.rb

@@ -41,7 +41,7 @@ module ActiveModel
   # You can choose not to have all three callbacks by passing a hash to the
   # define_model_callbacks method.
   #
-  #   define_model_callbacks :create, :only => :after, :before
+  #   define_model_callbacks :create, :only => [:after, :before]
   #
   # Would only create the after_create and before_create callback methods in your
   # class.

data/lib/active_model/errors.rb

@@ -79,6 +79,19 @@ module ActiveModel
       @messages = ActiveSupport::OrderedHash.new
     end
 
+    def initialize_dup(other)
+      @messages = other.messages.dup
+    end
+
+    # Backport dup from 1.9 so that #initialize_dup gets called
+    unless Object.respond_to?(:initialize_dup)
+      def dup # :nodoc:
+        copy = super
+        copy.initialize_dup(self)
+        copy
+      end
+    end
+
     # Clear the messages
     def clear
       messages.clear
@@ -99,6 +112,11 @@ module ActiveModel
       messages[key] = value
     end
 
+    # Delete messages for +key+
+    def delete(key)
+      messages.delete(key)
+    end
+
     # When passed a symbol or a name of a method, returns an array of errors
     # for the method.
     #
@@ -113,7 +131,7 @@ module ActiveModel
     #   p.errors[:name] = "must be set"
     #   p.errors[:name] # => ['must be set']
     def []=(attribute, error)
-      self[attribute.to_sym] << error
+      self[attribute] << error
     end
 
     # Iterates through each error key, value pair in the error messages hash.

data/lib/active_model/naming.rb

@@ -4,7 +4,9 @@ require 'active_support/core_ext/module/introspection'
 
 module ActiveModel
   class Name < String
-    attr_reader :singular, :plural, :element, :collection, :partial_path, :route_key, :param_key, :i18n_key
+    attr_reader :singular, :plural, :element, :collection, :partial_path,
+      :singular_route_key, :route_key, :param_key, :i18n_key
+
     alias_method :cache_key, :collection
 
     def initialize(klass, namespace = nil, name = nil)
@@ -19,9 +21,13 @@ module ActiveModel
       @human = ActiveSupport::Inflector.humanize(@element).freeze
       @collection = ActiveSupport::Inflector.tableize(self).freeze
       @partial_path = "#{@collection}/#{@element}".freeze
-      @param_key = (namespace ? _singularize(@unnamespaced) : @singular).freeze
-      @route_key = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural).freeze
-      @i18n_key = self.underscore.to_sym
+      @param_key    = (namespace ? _singularize(@unnamespaced) : @singular).freeze
+      @i18n_key     = self.underscore.to_sym
+
+      @route_key          = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural.dup)
+      @singular_route_key = ActiveSupport::Inflector.singularize(@route_key).freeze
+      @route_key << "_index" if @plural == @singular
+      @route_key.freeze
     end
 
     # Transform the model name into a more humane format, using I18n. By default,
@@ -105,6 +111,18 @@ module ActiveModel
       plural(record_or_class) == singular(record_or_class)
     end
 
+    # Returns string to use while generating route names. It differs for
+    # namespaced models regarding whether it's inside isolated engine.
+    #
+    # For isolated engine:
+    # ActiveModel::Naming.route_key(Blog::Post) #=> post
+    #
+    # For shared engine:
+    # ActiveModel::Naming.route_key(Blog::Post) #=> blog_post
+    def self.singular_route_key(record_or_class)
+      model_name_from_record_or_class(record_or_class).singular_route_key
+    end
+
     # Returns string to use while generating route names. It differs for
     # namespaced models regarding whether it's inside isolated engine.
     #
@@ -113,6 +131,9 @@ module ActiveModel
     #
     # For shared engine:
     # ActiveModel::Naming.route_key(Blog::Post) #=> blog_posts
+    #
+    # The route key also considers if the noun is uncountable and, in
+    # such cases, automatically appends _index.
     def self.route_key(record_or_class)
       model_name_from_record_or_class(record_or_class).route_key
     end

data/lib/active_model/version.rb

@@ -2,8 +2,8 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 3
-    PRE   = nil
+    TINY  = 4
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 15424071
+  prerelease: 6
   segments: 
   - 3
   - 1
-  - 3
-  version: 3.1.3
+  - 4
+  - rc
+  - 1
+  version: 3.1.4.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,29 +17,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-20 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15424071
         segments: 
         - 3
         - 1
-        - 3
-        version: 3.1.3
-  requirement: *id001
+        - 4
+        - rc
+        - 1
+        version: 3.1.4.rc1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +51,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id002
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: i18n
-  type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,7 +66,8 @@ dependencies:
         - 0
         - 6
         version: "0.6"
-  requirement: *id003
+  type: :runtime
+  version_requirements: *id003
 description: A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.
 email: david@loudthinking.com
 executables: []
@@ -76,41 +80,41 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.rdoc
-- lib/active_model.rb
-- lib/active_model/mass_assignment_security.rb
-- lib/active_model/locale/en.yml
-- lib/active_model/conversion.rb
 - lib/active_model/attribute_methods.rb
+- lib/active_model/callbacks.rb
+- lib/active_model/conversion.rb
 - lib/active_model/dirty.rb
-- lib/active_model/mass_assignment_security/sanitizer.rb
-- lib/active_model/mass_assignment_security/permission_set.rb
 - lib/active_model/errors.rb
-- lib/active_model/test_case.rb
-- lib/active_model/observer_array.rb
 - lib/active_model/lint.rb
-- lib/active_model/observing.rb
-- lib/active_model/version.rb
-- lib/active_model/serialization.rb
+- lib/active_model/locale/en.yml
+- lib/active_model/mass_assignment_security/permission_set.rb
+- lib/active_model/mass_assignment_security/sanitizer.rb
+- lib/active_model/mass_assignment_security.rb
 - lib/active_model/naming.rb
+- lib/active_model/observer_array.rb
+- lib/active_model/observing.rb
 - lib/active_model/railtie.rb
 - lib/active_model/secure_password.rb
+- lib/active_model/serialization.rb
+- lib/active_model/serializers/json.rb
+- lib/active_model/serializers/xml.rb
+- lib/active_model/test_case.rb
 - lib/active_model/translation.rb
-- lib/active_model/validations.rb
-- lib/active_model/callbacks.rb
-- lib/active_model/validator.rb
-- lib/active_model/validations/validates.rb
-- lib/active_model/validations/exclusion.rb
-- lib/active_model/validations/confirmation.rb
-- lib/active_model/validations/numericality.rb
 - lib/active_model/validations/acceptance.rb
-- lib/active_model/validations/with.rb
-- lib/active_model/validations/format.rb
 - lib/active_model/validations/callbacks.rb
+- lib/active_model/validations/confirmation.rb
+- lib/active_model/validations/exclusion.rb
+- lib/active_model/validations/format.rb
 - lib/active_model/validations/inclusion.rb
 - lib/active_model/validations/length.rb
+- lib/active_model/validations/numericality.rb
 - lib/active_model/validations/presence.rb
-- lib/active_model/serializers/xml.rb
-- lib/active_model/serializers/json.rb
+- lib/active_model/validations/validates.rb
+- lib/active_model/validations/with.rb
+- lib/active_model/validations.rb
+- lib/active_model/validator.rb
+- lib/active_model/version.rb
+- lib/active_model.rb
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -133,16 +137,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: A toolkit for building modeling frameworks (part of Rails).