rabl 0.5.0 → 0.5.1

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # CHANGELOG
 
-## 0.5.1 (Unreleased)
+## 0.5.2 (Unreleased)
+
+## 0.5.1
+
+ * Use respond\_to? instead of checking Enumerable for is\_object
+ * Performance optimization (thanks Eric Allen)
 
 ## 0.5.0
 

data/lib/rabl/engine.rb

@@ -34,8 +34,12 @@ module Rabl
       if is_object?(data) || !data # object @user
         Rabl::Builder.new(@_data, options).to_hash(options)
       elsif is_collection?(data) # collection @users
-        object_name = data_name(@_data).to_s.singularize # @users => :users
-        data.map { |object| Rabl::Builder.new({ object => object_name }, options).to_hash(options) }
+        if options[:root] # only calculate root name if needed
+          object_name = data_name(@_data).to_s.singularize # @users => :users
+          data.map { |object| Rabl::Builder.new({ object => object_name }, options).to_hash(options) }
+        else
+          data.map { |object| Rabl::Builder.new(object, options).to_hash(options) }
+        end
       end
     end
 

data/lib/rabl/helpers.rb

@@ -63,12 +63,12 @@ module Rabl
     # is_object?([]) => false
     # is_object?({}) => false
     def is_object?(obj)
-      obj && !data_object(obj).is_a?(Enumerable)
+      obj && !data_object(obj).respond_to?(:each)
     end
 
     # Returns true if the obj is a collection of items
     def is_collection?(obj)
-      obj && data_object(obj).is_a?(Enumerable)
+      obj && data_object(obj).respond_to?(:each)
     end
 
     # Returns source for a given relative file

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/engine_test.rb

@@ -159,6 +159,21 @@ context "Rabl::Engine" do
         template.render(scope).split('').sort
       end.equals "[{\"user\":{\"name\":\"a\"}},{\"user\":{\"name\":\"b\"}}]".split('').sort
 
+      asserts "that it can merge the result on a child node given no name" do
+        template = rabl %{
+          object @user
+          attribute :name
+          child(@user) do
+            code do |user|
+              {:city => user.city}
+            end
+          end
+        }
+        scope = Object.new
+        scope.instance_variable_set :@user, User.new(:name => 'leo', :city => 'LA')
+        template.render(scope).split('').sort
+      end.equals "{\"user\":{\"name\":\"leo\",\"user\":{\"city\":\"LA\"}}}".split('').sort
+
     end
 
     context "#child" do

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 Z
+date: 2011-11-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json