[DRE-commits] [ruby-activeresource-3.2] 01/04: New upstream version 3.2.16

[Ondrej Sury]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository ruby-activeresource-3.2.

commit 49d264d53dc88ef3d60d83e3aeb56059834c364a
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Dec 4 17:38:48 2013 +0100

    New upstream version 3.2.16
---
 CHANGELOG.md                   |  14 +++++++++++---
 checksums.yaml.gz              | Bin 268 -> 269 bytes
 lib/active_resource/base.rb    |   2 +-
 lib/active_resource/version.rb |   2 +-
 metadata.yml                   |  21 +++++++++++----------
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 245b000..c1f0fa3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,20 @@
-## unreleased ##
+## Rails 3.2.15 (Oct 16, 2013) ##
 
-*   No changes.
+* No changes.
+
+## Rails 3.2.14 (Jul 22, 2013) ##
+
+*   Fixes an issue that ActiveResource models ignores ActiveResource::Base.include_root_in_json.
+    Backported from the now separate repo rails/activeresouce.
 
+    *Xinjiang Lu*
 
-## Rails 3.2.13 (Feb 17, 2013) ##
+
+## Rails 3.2.13 (Mar 18, 2013) ##
 
 *   No changes.
 
+
 ## Rails 3.2.12 (Feb 11, 2013) ##
 
 *   No changes.
diff --git a/checksums.yaml.gz b/checksums.yaml.gz
index 658c01d..c3de098 100644
Binary files a/checksums.yaml.gz and b/checksums.yaml.gz differ
diff --git a/lib/active_resource/base.rb b/lib/active_resource/base.rb
index 032a245..f9cc7d0 100644
--- a/lib/active_resource/base.rb
+++ b/lib/active_resource/base.rb
@@ -1336,7 +1336,7 @@ module ActiveResource
     end
 
     def to_json(options={})
-      super({ :root => self.class.element_name }.merge(options))
+      super(include_root_in_json ? { :root => self.class.element_name }.merge(options) : options)
     end
 
     def to_xml(options={})
diff --git a/lib/active_resource/version.rb b/lib/active_resource/version.rb
index 6c3ee00..4efb6f0 100644
--- a/lib/active_resource/version.rb
+++ b/lib/active_resource/version.rb
@@ -2,7 +2,7 @@ module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
+    TINY  = 16
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
diff --git a/metadata.yml b/metadata.yml
index 600da05..cf6d1f4 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeresource
 version: !ruby/object:Gem::Version
-  version: 3.2.13
+  version: 3.2.16
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.16
 description: REST on Rails. Wrap your RESTful web app with Ruby classes and work with
   them like Active Record models.
 email: david at loudthinking.com
@@ -66,22 +66,23 @@ files:
 - lib/active_resource/version.rb
 - lib/active_resource.rb
 homepage: http://www.rubyonrails.org
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 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'
 requirements: []

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-activeresource-3.2.git