activemodel 3.2.12 → 3.2.13.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04067c15edf41a8d5ce689e6cbb9310fe1732138
-  data.tar.gz: dd07c473867f7a3429a7dca2c8943921c93c0ad8
+  metadata.gz: 2b907e70385a1124a2c906d59029d211ca60f209
+  data.tar.gz: 5f3d8bd4b43df2da1dec4a3faeafa569a7c4106a
 SHA512:
-  metadata.gz: afe4a7e0d27d0aa1329e377ab123dd17dc4e5525c9f6d82f58b1c3fe927fa929545c1a1ab473dab2b16e8e05d616194815a32e3ac90f2bb1ad89eb0a1dd404a0
-  data.tar.gz: ddab958f8295fd1dd685856f533c9d854b9240d3c227ecd244688d286579c8f13852f704e6defc02da8207661b05a1a3ca82d2d156a1741bec3bdf1ccac323f4
+  metadata.gz: be225f8c803bb17a646e1caba79dc68a49d9b0585f16a7198a920bce7c6e6a23705c41d2e9f93893f25e2e4b8c47a128a94ddf1db809337c981e87dd6b05a890
+  data.tar.gz: da0d2a760f9cdc58c4c6a6ac42060f622c71d0311461fc2dd28b5cf17156a56ff6551ffbe7a908398f597a591561b6252dcfe3a5ff2737b09b5b9a6f24861f7e

data/CHANGELOG.md

@@ -1,4 +1,30 @@
-## Rails 3.2.10 ##
+## unreleased ##
+
+*   No changes.
+
+
+## Rails 3.2.13 (Feb 17, 2013) ##
+
+*   Specify type of singular association during serialization *Steve Klabnik*
+
+
+## Rails 3.2.12 (Feb 11, 2013) ##
+
+*   Fix issue with `attr_protected` where malformed input could circumvent protection.
+    CVE-2013-0276
+
+    *joernchen*
+
+
+## Rails 3.2.11 (Jan 8, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.10 (Jan 2, 2013) ##
+
+*   No changes.
+
 
 ## Rails 3.2.9 (Nov 12, 2012) ##
 
@@ -13,24 +39,29 @@
 
     *Carlos Antonio da Silva*
 
+
 ## Rails 3.2.8 (Aug 9, 2012) ##
 
 *   No changes.
 
+
 ## Rails 3.2.7 (Jul 26, 2012) ##
 
 * `validates_inclusion_of` and `validates_exclusion_of` now accept `:within` option as alias of `:in` as documented.
 
 * Fix the the backport of the object dup with the ruby 1.9.3p194.
 
+
 ## Rails 3.2.6 (Jun 12, 2012) ##
 
 *   No changes.
 
+
 ## Rails 3.2.4 (May 31, 2012) ##
 
 *   No changes.
 
+
 ## Rails 3.2.3 (March 30, 2012) ##
 
 *   No changes.

data/lib/active_model/errors.rb

@@ -84,7 +84,7 @@ module ActiveModel
     end
 
     # Backport dup from 1.9 so that #initialize_dup gets called
-    unless Object.respond_to?(:initialize_dup)
+    unless Object.respond_to?(:initialize_dup, true)
       def dup # :nodoc:
         copy = super
         copy.initialize_dup(self)

data/lib/active_model/serializers/xml.rb

@@ -144,7 +144,12 @@ module ActiveModel
             end
           else
             merged_options[:root] = association.to_s
-            records.to_xml(merged_options)
+
+            unless records.class.to_s.underscore == association.to_s
+              merged_options[:type] = records.class.name
+            end
+
+            records.to_xml merged_options
           end
         end
 

data/lib/active_model/validations.rb

@@ -173,7 +173,7 @@ module ActiveModel
     end
 
     # Backport dup from 1.9 so that #initialize_dup gets called
-    unless Object.respond_to?(:initialize_dup)
+    unless Object.respond_to?(:initialize_dup, true)
       def dup # :nodoc:
         copy = super
         copy.initialize_dup(self)

data/lib/active_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 3.2.12
+  version: 3.2.13.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13.rc1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: A toolkit for building modeling frameworks like Active Record and Active
@@ -93,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).