activemodel 3.0.3 → 3.0.4.rc1

data/lib/active_model/attribute_methods.rb

@@ -46,8 +46,8 @@ module ActiveModel
   #     end
   #   end
   #
-  # Notice that whenever you include ActiveModel::AttributeMethods in your class,
-  # it requires you to implement a <tt>attributes</tt> methods which returns a hash
+  # Note that whenever you include ActiveModel::AttributeMethods in your class,
+  # it requires you to implement an <tt>attributes</tt> method which returns a hash
   # with each attribute name in your model as hash key and the attribute value as
   # hash value.
   #

data/lib/active_model/errors.rb

@@ -149,7 +149,7 @@ module ActiveModel
     def empty?
       all? { |k, v| v && v.empty? }
     end
-
+    alias_method :blank?, :empty?
     # Returns an xml formatted representation of the Errors hash.
     #
     #   p.errors.add(:name, "can't be blank")
@@ -167,7 +167,13 @@ module ActiveModel
 
     # Returns an ActiveSupport::OrderedHash that can be used as the JSON representation for this object.
     def as_json(options=nil)
-      self
+      to_hash
+    end
+
+    def to_hash
+      hash = ActiveSupport::OrderedHash.new
+      each { |k, v| (hash[k] ||= []) << v }
+      hash
     end
 
     # Adds +message+ to the error messages on +attribute+, which will be returned on a call to

data/lib/active_model/lint.rb

@@ -1,19 +1,19 @@
-# == Active Model Lint Tests
-#
-# You can test whether an object is compliant with the Active Model API by
-# including <tt>ActiveModel::Lint::Tests</tt> in your TestCase. It will include
-# tests that tell you whether your object is fully compliant, or if not,
-# which aspects of the API are not implemented.
-#
-# These tests do not attempt to determine the semantic correctness of the
-# returned values. For instance, you could implement valid? to always
-# return true, and the tests would pass. It is up to you to ensure that
-# the values are semantically meaningful.
-#
-# Objects you pass in are expected to return a compliant object from a
-# call to to_model. It is perfectly fine for to_model to return self.
 module ActiveModel
   module Lint
+    # == Active Model Lint Tests
+    #
+    # You can test whether an object is compliant with the Active Model API by
+    # including <tt>ActiveModel::Lint::Tests</tt> in your TestCase. It will include
+    # tests that tell you whether your object is fully compliant, or if not,
+    # which aspects of the API are not implemented.
+    #
+    # These tests do not attempt to determine the semantic correctness of the
+    # returned values. For instance, you could implement valid? to always
+    # return true, and the tests would pass. It is up to you to ensure that
+    # the values are semantically meaningful.
+    #
+    # Objects you pass in are expected to return a compliant object from a
+    # call to to_model. It is perfectly fine for to_model to return self.
     module Tests
 
       # == Responds to <tt>to_key</tt>

data/lib/active_model/serializers/xml.rb

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

data/lib/active_model/validations/validates.rb

@@ -103,8 +103,10 @@ module ActiveModel
           { :with => options }
         when Range, Array
           { :in => options }
+        else
+          raise ArgumentError, "#{options.inspect} is an invalid option. Expecting true, Hash, Regexp, Range, or Array"
         end
       end
     end
   end
-end
+end

data/lib/active_model/version.rb

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

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 977940590
+  prerelease: true
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 4
+  - rc1
+  version: 3.0.4.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -06:00
+date: 2011-01-31 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +27,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 977940590
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 4
+        - rc1
+        version: 3.0.4.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -134,12 +136,14 @@ 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: activemodel