activemodel 3.0.1 → 3.0.2

data/CHANGELOG

@@ -1,6 +1,12 @@
+*Rails 3.0.2 (November 15, 2010)*
+
+* No changes
+
+
 *Rails 3.0.1 (October 15, 2010)*
 
-* No Changes, just a version bump.
+* No changes
+
 
 *Rails 3.0.0 (August 29, 2010)*
 

data/lib/active_model.rb

@@ -24,7 +24,7 @@
 activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
 $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
 require 'active_support'
-
+require 'active_model/version'
 
 module ActiveModel
   extend ActiveSupport::Autoload
@@ -46,7 +46,6 @@ module ActiveModel
   autoload :Serialization
   autoload :TestCase
   autoload :Translation
-  autoload :VERSION
   autoload :Validations
   autoload :Validator
 

data/lib/active_model/errors.rb

@@ -289,8 +289,8 @@ module ActiveModel
       end
 
       defaults = @base.class.lookup_ancestors.map do |klass|
-        [ :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.underscore}.attributes.#{attribute}.#{type}",
-          :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.underscore}.#{type}" ]
+        [ :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.i18n_key}.attributes.#{attribute}.#{type}",
+          :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.i18n_key}.#{type}" ]
       end
 
       defaults << options.delete(:message)

data/lib/active_model/naming.rb

@@ -2,7 +2,7 @@ require 'active_support/inflector'
 
 module ActiveModel
   class Name < String
-    attr_reader :singular, :plural, :element, :collection, :partial_path
+    attr_reader :singular, :plural, :element, :collection, :partial_path, :i18n_key
     alias_method :cache_key, :collection
 
     def initialize(klass)
@@ -14,6 +14,7 @@ module ActiveModel
       @human = ActiveSupport::Inflector.humanize(@element).freeze
       @collection = ActiveSupport::Inflector.tableize(self).freeze
       @partial_path = "#{@collection}/#{@element}".freeze
+      @i18n_key = ActiveSupport::Inflector.underscore(self).tr('/', '.').to_sym
     end
 
     # Transform the model name into a more humane format, using I18n. By default,
@@ -27,7 +28,7 @@ module ActiveModel
                            @klass.respond_to?(:i18n_scope)
 
       defaults = @klass.lookup_ancestors.map do |klass|
-        klass.model_name.underscore.to_sym
+        klass.model_name.i18n_key
       end
 
       defaults << options.delete(:default) if options[:default]
@@ -51,6 +52,9 @@ module ActiveModel
   #   BookCover.model_name        # => "BookCover"
   #   BookCover.model_name.human  # => "Book cover"
   #
+  #   BookCover.model_name.i18n_key              # => "book_cover"
+  #   BookModule::BookCover.model_name.i18n_key  # => "book_module.book_cover"
+  #
   # Providing the functionality that ActiveModel::Naming provides in your object
   # is required to pass the Active Model Lint test.  So either extending the provided
   # method below, or rolling your own is required..

data/lib/active_model/serialization.rb

@@ -54,11 +54,13 @@ module ActiveModel
   #
   #   person = Person.new
   #   person.serializable_hash   # => {"name"=>nil}
+  #   person.as_json             # => {"name"=>nil}
   #   person.to_json             # => "{\"name\":null}"
   #   person.to_xml              # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
   #
   #   person.name = "Bob"
   #   person.serializable_hash   # => {"name"=>"Bob"}
+  #   person.as_json             # => {"name"=>"Bob"}
   #   person.to_json             # => "{\"name\":\"Bob\"}"
   #   person.to_xml              # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
   #
@@ -67,14 +69,14 @@ module ActiveModel
     def serializable_hash(options = nil)
       options ||= {}
 
-      options[:only]   = Array.wrap(options[:only]).map { |n| n.to_s }
-      options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }
+      only   = Array.wrap(options[:only]).map(&:to_s)
+      except = Array.wrap(options[:except]).map(&:to_s)
 
       attribute_names = attributes.keys.sort
-      if options[:only].any?
-        attribute_names &= options[:only]
-      elsif options[:except].any?
-        attribute_names -= options[:except]
+      if only.any?
+        attribute_names &= only
+      elsif except.any?
+        attribute_names -= except
       end
 
       method_names = Array.wrap(options[:methods]).inject([]) do |methods, name|

data/lib/active_model/serializers/json.rb

@@ -79,18 +79,16 @@ module ActiveModel
       #                    "title": "Welcome to the weblog"},
       #                   {"comments": [{"body": "Don't think too hard"}],
       #                    "title": "So I was thinking"}]}
-      def encode_json(encoder)
-        hash = serializable_hash(encoder.options)
+
+      def as_json(options = nil)
+        hash = serializable_hash(options)
+
         if include_root_in_json
-          custom_root = encoder.options && encoder.options[:root]
+          custom_root = options && options[:root]
           hash = { custom_root || self.class.model_name.element => hash }
         end
 
-        ActiveSupport::JSON.encode(hash)
-      end
-
-      def as_json(options = nil)
-        self
+        hash
       end
 
       def from_json(json)

data/lib/active_model/serializers/xml.rb

@@ -17,7 +17,7 @@ module ActiveModel
 
           def initialize(name, serializable, raw_value=nil)
             @name, @serializable = name, serializable
-            @value = value || @serializable.send(name)
+            @value = raw_value || @serializable.send(name)
             @type  = compute_type
           end
 

data/lib/active_model/translation.rb

@@ -44,7 +44,7 @@ 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.underscore}.#{attribute}"
+        :"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}"
       end
 
       defaults << :"attributes.#{attribute}"

data/lib/active_model/validations.rb

@@ -100,7 +100,7 @@ module ActiveModel
       #     validate :must_be_friends
       #
       #     def must_be_friends
-      #       errors.add_to_base("Must be friends to leave a comment") unless commenter.friend_of?(commentee)
+      #       errors.add(:base, "Must be friends to leave a comment") unless commenter.friend_of?(commentee)
       #     end
       #   end
       #
@@ -114,7 +114,7 @@ module ActiveModel
       #     end
       #
       #     def must_be_friends
-      #       errors.add_to_base("Must be friends to leave a comment") unless commenter.friend_of?(commentee)
+      #       errors.add(:base, ("Must be friends to leave a comment") unless commenter.friend_of?(commentee)
       #     end
       #   end
       #

data/lib/active_model/validator.rb

@@ -7,7 +7,7 @@ module ActiveModel #:nodoc:
   # == Active Model Validator
   #
   # A simple base class that can be used along with
-  # +ActiveModel::Validations::ClassMethods.validates_with+
+  # ActiveModel::Validations::ClassMethods.validates_with
   #
   #   class Person
   #     include ActiveModel::Validations
@@ -42,7 +42,7 @@ module ActiveModel #:nodoc:
   #     end
   #   end
   #
-  # To cause a validation error, you must add to the <tt>record<tt>'s errors directly
+  # To cause a validation error, you must add to the <tt>record</tt>'s errors directly
   # from within the validators message
   #
   #   class MyValidator < ActiveModel::Validator

data/lib/active_model/version.rb

@@ -2,8 +2,8 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 1
-
+    TINY  = 2
+        
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +13:00
+date: 2010-11-15 00:00:00 -06: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: 3
         segments: 
         - 3
         - 0
-        - 1
-        version: 3.0.1
+        - 2
+        version: 3.0.2
   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: 15
         segments: 
         - 2
         - 1
@@ -49,9 +54,11 @@ dependencies:
   name: i18n
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 4
@@ -115,25 +122,29 @@ 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: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: activemodel
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A toolkit for building modeling frameworks (part of Rails).