rabl 0.8.4 → 0.8.5

data/.travis.yml

@@ -12,4 +12,5 @@ notifications:
     - databyte@gmail.com
 matrix:
   allow_failures:
+    - rvm: 1.8.7
     - rvm: 2.0.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.8.5
+
+ * FIX #386 Support disabling root on child calls (Thanks @digger69)
+
 ## 0.8.4
 
  * NEW #411 Add "replace nil values with empty strings" option (Thanks @manuelmeurer)

data/Gemfile

@@ -8,6 +8,7 @@ gem 'i18n', '~> 0.6'
 
 platforms :mri_18 do
   gem 'SystemTimer'
+  gem 'json'
 end
 
 group :test do

data/Gemfile.ci

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rabl.gemspec
 gemspec
@@ -8,6 +8,7 @@ gem "i18n", '~> 0.6'
 
 platforms :mri_18 do
   gem 'SystemTimer'
+  gem 'json'
 end
 
 gem 'activesupport', :require => 'active_support'

data/lib/rabl/builder.rb

@@ -100,7 +100,7 @@ module Rabl
     def child(data, options={}, &block)
       return false unless data.present? && resolve_condition(options)
       name, object = data_name(data), data_object(data)
-      include_root = is_collection?(object) && @options[:child_root] # child @users
+      include_root = is_collection?(object) && options.fetch(:object_root, @options[:child_root]) # child @users
       engine_options = @options.slice(:child_root).merge(:root => include_root)
       object = { object => name } if data.respond_to?(:each_pair) && object # child :users => :people
       @_result[name] = self.object_to_hash(object, engine_options, &block)

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/test/engine_test.rb

@@ -280,6 +280,31 @@ context "Rabl::Engine" do
         scope.instance_variable_set :@user, User.new(:name => 'leo')
         template.render(scope)
       end.equals "{\"user\":{\"person\":{\"name\":\"leo\"}}}"
+
+      asserts "it sets root node for child collection" do
+        template = rabl %{
+          object @user
+          attribute :name
+          child(@users) { attribute :city }
+        }
+        scope = Object.new
+        scope.instance_variable_set :@user, User.new(:name => 'leo', :city => 'LA')
+        scope.instance_variable_set :@users, [User.new(:name => 'one', :city => 'UNO'), User.new(:name => 'two', :city => 'DOS')]
+        template.render(scope)
+      end.equals "{\"user\":{\"name\":\"leo\",\"users\":[{\"user\":{\"city\":\"UNO\"}},{\"user\":{\"city\":\"DOS\"}}]}}"
+
+      asserts "it allows suppression of root node for child collection" do
+        template = rabl %{
+          object @user
+          attribute :name
+          child(@users, :object_root => false) { attribute :city }
+        }
+        scope = Object.new
+        scope.instance_variable_set :@user, User.new(:name => 'leo', :city => 'LA')
+        scope.instance_variable_set :@users, [User.new(:name => 'one', :city => 'UNO'), User.new(:name => 'two', :city => 'DOS')]
+        template.render(scope)
+      end.equals "{\"user\":{\"name\":\"leo\",\"users\":[{\"city\":\"UNO\"},{\"city\":\"DOS\"}]}}"
+
     end
 
     context "#glue" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -421,7 +421,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 501966820991429896
+      hash: -2073633213331132502
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 501966820991429896
+      hash: -2073633213331132502
 requirements: []
 rubyforge_project: rabl
 rubygems_version: 1.8.25