rabl 0.7.4 → 0.7.5

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
-## 0.7.5 (unreleased)
+## 0.7.6 (unreleased)
+
+## 0.7.5
+
+  * Avoid incorrectly setting implicit objects for 'object false' partials
 
 ## 0.7.4
 

data/lib/rabl/builder.rb

@@ -110,7 +110,7 @@ module Rabl
     def extends(file, options={}, &block)
       options = @options.slice(:child_root).merge(:object => @_object).merge(options)
       result = self.partial(file, options, &block)
-      @_result.merge!(result) if result
+      @_result.merge!(result) if result.is_a?(Hash)
     end
 
     # resolve_condition(:if => true) => true

data/lib/rabl/engine.rb

@@ -26,7 +26,7 @@ module Rabl
       locals.each { |k,v| instance_variable_set(:"@#{k}", v) }
       @_options[:scope] = @_scope
       @_options[:format] ||= self.request_format
-      @_data = locals[:object] || self.default_object
+      @_data = locals[:object].nil? ? self.default_object : locals[:object]
       if @_options[:source_location]
         instance_eval(@_source, @_options[:source_location]) if @_source.present?
       else # without source location

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/test/engine_test.rb

@@ -5,6 +5,13 @@ require File.expand_path('../models/ormless', __FILE__)
 
 context "Rabl::Engine" do
   helper(:rabl) { |t| RablTemplate.new { t } }
+  # context_scope 'users', [@user]
+  helper(:context_scope) { |name, value|
+    scope = Object.new
+    stub(scope).controller { stub(Object).controller_name { name } }
+    scope.instance_variable_set :"@#{name}", value
+    scope
+  }
 
   context "#initialize" do
     setup do
@@ -318,9 +325,7 @@ context "Rabl::Engine" do
         template = rabl %{
           attribute :name
         }
-        scope = Object.new
-        stub(scope).controller { stub(Object).controller_name { "a/b/c::d/user" } }
-        scope.instance_variable_set :@user, User.new
+        scope = context_scope('user', User.new)
         template.render(scope).split
       end.equals "{\"name\":\"rabl\"}".split
 

data/test/renderer_test.rb

@@ -5,6 +5,13 @@ require File.expand_path('../teststrap', __FILE__)
 
 context "Rabl::Renderer" do
   helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }
+  # context_scope 'users', [@user]
+  helper(:context_scope) { |name, value|
+    scope = Object.new
+    stub(scope).controller { stub(Object).controller_name { name } }
+    scope.instance_variable_set :"@#{name}", value
+    scope
+  }
 
   context "#render" do
     asserts 'renders empty array' do
@@ -137,7 +144,8 @@ context "Rabl::Renderer" do
         )
       end
 
-      renderer = Rabl::Renderer.new('user', false, :view_path => tmp_path)
+      scope = context_scope('users', [User.new, User.new, User.new])
+      renderer = Rabl::Renderer.new('user', false, :view_path => tmp_path, :scope => scope)
       JSON.parse(renderer.render)
     end.equals(JSON.parse(%Q^{"foo":"baz", "baz":"bar" }^))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors: