activemodel 3.1.0.rc4 → 3.1.0.rc5

data/CHANGELOG

@@ -1,5 +1,8 @@
 *Rails 3.1.0 (unreleased)*
 
+* Alternate I18n namespace lookup is no longer supported.
+  Instead of "activerecord.models.admins.post", do "activerecord.models.admins/post" instead [José Valim]
+
 * attr_accessible and friends now accepts :as as option to specify a role [Josh Kalderimis]
 
 * Add support for proc or lambda as an option for InclusionValidator,

data/README.rdoc

@@ -182,3 +182,30 @@ modules:
    p.valid?                  # =>  true
 
   {Learn more}[link:classes/ActiveModel/Validator.html]
+  
+
+== Download and installation
+
+The latest version of Active Model can be installed with Rubygems:
+
+  % [sudo] gem install activemodel
+
+Source code can be downloaded as part of the Rails project on GitHub
+
+* https://github.com/rails/rails/tree/master/activemodel/
+
+
+== License
+
+Active Model is released under the MIT license.
+
+
+== Support
+
+API documentation is at
+
+* http://api.rubyonrails.org
+
+Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
+
+* https://github.com/rails/rails/issues

data/lib/active_model/dirty.rb

@@ -29,7 +29,7 @@ module ActiveModel
   #
   #     include ActiveModel::Dirty
   #
-  #     define_attribute_methods [:name]
+  #     define_attribute_methods = [:name]
   #
   #     def name
   #       @name

data/lib/active_model/mass_assignment_security.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/class/attribute.rb'
+require 'active_support/core_ext/array/wrap'
 require 'active_model/mass_assignment_security/permission_set'
 
 module ActiveModel
@@ -95,8 +96,11 @@ module ActiveModel
         options = args.extract_options!
         role = options[:as] || :default
 
-        self._protected_attributes        = protected_attributes_configs.dup
-        self._protected_attributes[role] = self.protected_attributes(role) + args
+        self._protected_attributes = protected_attributes_configs.dup
+
+        Array.wrap(role).each do |name|
+          self._protected_attributes[name] = self.protected_attributes(name) + args
+        end
 
         self._active_authorizer = self._protected_attributes
       end
@@ -154,8 +158,11 @@ module ActiveModel
         options = args.extract_options!
         role = options[:as] || :default
 
-        self._accessible_attributes        = accessible_attributes_configs.dup
-        self._accessible_attributes[role] = self.accessible_attributes(role) + args
+        self._accessible_attributes = accessible_attributes_configs.dup
+
+        Array.wrap(role).each do |name|
+          self._accessible_attributes[name] = self.accessible_attributes(name) + args
+        end
 
         self._active_authorizer = self._accessible_attributes
       end

data/lib/active_model/naming.rb

@@ -21,7 +21,7 @@ module ActiveModel
       @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.tr('/', '.').to_sym
+      @i18n_key = self.underscore.to_sym
     end
 
     # Transform the model name into a more humane format, using I18n. By default,
@@ -35,9 +35,8 @@ module ActiveModel
                            @klass.respond_to?(:i18n_scope)
 
       defaults = @klass.lookup_ancestors.map do |klass|
-        [klass.model_name.i18n_key,
-         klass.model_name.i18n_key.to_s.tr('.', '/').to_sym]
-      end.flatten
+        klass.model_name.i18n_key
+      end
 
       defaults << options[:default] if options[:default]
       defaults << @human

data/lib/active_model/translation.rb

@@ -44,9 +44,8 @@ module ActiveModel
     # Specify +options+ with additional translating options.
     def human_attribute_name(attribute, options = {})
       defaults = lookup_ancestors.map do |klass|
-        [:"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}",
-         :"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key.to_s.tr('.', '/')}.#{attribute}"]
-      end.flatten
+        :"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}"
+      end
 
       defaults << :"attributes.#{attribute}"
       defaults << options.delete(:default) if options[:default]

data/lib/active_model/validations/with.rb

@@ -101,7 +101,7 @@ module ActiveModel
     #   class Person
     #     include ActiveModel::Validations
     #
-    #     validates :instance_validations
+    #     validate :instance_validations
     #
     #     def instance_validations
     #       validates_with MyValidator
@@ -116,7 +116,7 @@ module ActiveModel
     #   class Person
     #     include ActiveModel::Validations
     #
-    #     validates :instance_validations, :on => :create
+    #     validate :instance_validations, :on => :create
     #
     #     def instance_validations
     #       validates_with MyValidator, MyOtherValidator

data/lib/active_model/version.rb

@@ -3,7 +3,7 @@ module ActiveModel
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc4"
+    PRE   = "rc5"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
-  hash: 15424109
-  prerelease: 6
+  prerelease: true
   segments: 
   - 3
   - 1
   - 0
-  - rc
-  - 4
-  version: 3.1.0.rc4
+  - rc5
+  version: 3.1.0.rc5
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,35 +15,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-07-25 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424109
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        - 4
-        version: 3.1.0.rc4
+        - rc5
+        version: 3.1.0.rc5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -57,11 +51,9 @@ dependencies:
   name: i18n
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
@@ -72,11 +64,9 @@ dependencies:
   name: bcrypt-ruby
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 1
@@ -131,6 +121,7 @@ files:
 - lib/active_model/validator.rb
 - lib/active_model/version.rb
 - lib/active_model.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -140,22 +131,18 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3
@@ -164,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A toolkit for building modeling frameworks (part of Rails).