activemodel 3.1.0.rc2 → 3.1.0.rc3

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

data/lib/active_model/translation.rb

@@ -44,8 +44,9 @@ 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}"
-      end
+        [:"#{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
 
       defaults << :"attributes.#{attribute}"
       defaults << options.delete(:default) if options[:default]

data/lib/active_model/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
-  hash: 15424097
+  hash: 15424099
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - rc
-  - 2
-  version: 3.1.0.rc2
+  - 3
+  version: 3.1.0.rc3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 Z
+date: 2011-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -27,14 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424097
+        hash: 15424099
         segments: 
         - 3
         - 1
         - 0
         - rc
-        - 2
-        version: 3.1.0.rc2
+        - 3
+        version: 3.1.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency