rabl 0.9.0.pre → 0.9.0.pre2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTIxZTEwYWE5ZDNlN2IxOTc1MDZlMjk3NTg1YWQ5OTgxMmE1MmEyZA==
+    NzJmMmM2ZjU0NWFmNGI3YmUzZGRiNmJlODhmYzQ2M2E2NTkwMDNiOA==
   data.tar.gz: !binary |-
-    NDE4MDQwNTA3ZmE1OTk3YTMzYmRlZWFkYjViYjJjZTEwOTM1OGM5MA==
+    YWU5NWU4ZWMyNzc1MmFiNmVjYzNmOGZlOTE0ODk3NDY5YTQ2ODIxMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDE2NTBiNGI1ZGMzMmUzYTYyNzA3YmRjM2M5ZjQyMjM0ZjE2MjA5ZTcxNzA0
-    YTlhZDBjZTI3ZjAzYWMyMzQ2Yjg5MTkwZDc1NDY5YmYzOTA0NzlhN2Q5ZDBj
-    Yjk5OWM3NDAzODYwYThhMDQ0YTE4NmVmOTgxNDBlNDZkMjVhNTY=
+    MzJlM2ZkMmFmNDE3ZTU0YzY4NGQ1NTJkNDQzMDgxODZiNDI0OGRiMGMwZTg1
+    ZTRhY2E3ZTQ2NDU2Yjk5OWRiZWVjZDY4OTA2NDkzODNhYWM3MzdiMTJiNjQw
+    YzM3NzgyMGFiZjIxYjA0MzYyMDRlNjg3OTdjMmViYWFkMzhkZjM=
   data.tar.gz: !binary |-
-    YmU2YWZhNWQ3OGZiNWVjNGU1NDQxOTlmNTU4ZDRlZGQ0ZGU2ZTg3MDMyMmQw
-    ZGQwYjU2ZDcyOWUwMjljNGUxMTA2N2VhYzUzODc2MzBkYjBiODdkNzEyNDJm
-    ZjBmMGZjN2ZjMTY0NDk2YTVlYmIxMWQ2YTU1NTgwZjU2OTVlZTg=
+    Y2RjNDI0NjlkZDU0MjQxOWI4OTg2MGM3MDk3YmRhYTI3YjE3MzA3OGEzYjlh
+    ZWEwNThjMzNmNmVkMGM4ZjhmNzE5MWIwYWFiMDc2ZTEwYzI0ZDk5NmFjODRl
+    MzA1YTJkMjEyMTY1ZmZkZGUzNmNkM2YxNTE3MjRmMTFkMGFlOTM=

data/CHANGELOG.md

@@ -1,11 +1,12 @@
 # CHANGELOG
 
-## 0.9.0.pre (Sept 02 2013)
+## 0.9.0.pre2 (Sept 02 2013)
 
  * FIX #142 Better resource resolution for AR Scopes
  * Adds Rails 4 test fixture   (Thanks @siong1987)
  * Adds Rails 4 cache digestor (Thanks @siong1987)
  * Child now supports `object_root` and `root` arguments like 'collection'
+ * FIX #486 Prioritize to_hash options to allow setting root
 
 ## 0.8.6
 

data/lib/rabl/engine.rb

@@ -42,7 +42,7 @@ module Rabl
     # Returns a hash representation of the data object
     # to_hash(:root => true, :child_root => true)
     def to_hash(options={})
-      options = @_options.merge(options)
+      options = options.merge(@_options)
       data = @_data_object
       builder = Rabl::Builder.new(options)
       options[:root_name] = determine_object_root(@_data_object, @_data_name, options[:root])
@@ -293,11 +293,11 @@ module Rabl
         Digestor.digest(@virtual_path, :rabl, lookup_context, dependencies: view_cache_dependencies)
       ]
     end
-    
+
     def cache_key_simple(key)
       Array(key) + [@_options[:root_name], @_options[:format]]
     end
-    
+
 
   end
 end

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.9.0.pre"
+  VERSION = "0.9.0.pre2"
 end

data/test/engine_test.rb

@@ -293,6 +293,18 @@ context "Rabl::Engine" do
         template.render(scope)
       end.equals "{\"user\":{\"name\":\"leo\",\"users\":[{\"user\":{\"city\":\"UNO\"}},{\"user\":{\"city\":\"DOS\"}}]}}"
 
+      asserts "child chooses name based on symbol if no elements" do
+        template = rabl %{
+          object @bar => :bar
+          child(:foos) { attribute :city }
+        }
+        scope = Object.new
+        bar = Object.new
+        stub(bar).foos { [] }
+        scope.instance_variable_set :@bar, bar
+        template.render(scope)
+      end.equals "{\"bar\":{\"foos\":[]}}"
+
       asserts "it allows suppression of root node for child collection" do
         template = rabl %{
           object @user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre
+  version: 0.9.0.pre2
 platform: ruby
 authors:
 - Nathan Esquenazi