rabl 0.8.5 → 0.8.6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.8.6
+
+ * FIX #142 #467 Do not use a collection as the default object. (Thanks @mrbrdo)
+ * NEW Options hash for glue function added (Thanks @sassysolutions)
+ * FIX #470 Better template lookups when Padrino is defined (Thanks @LTe)
+
 ## 0.8.5
 
  * FIX #386 Support disabling root on child calls (Thanks @digger69)

data/README.md

@@ -298,6 +298,13 @@ child :address do
 end
 ```
 
+You can also disable object root for child node:
+```ruby
+child :posts, :object_root => false do
+  attributes :id, :title
+end
+```
+
 You can also add child nodes from an arbitrary data source:
 
 ```ruby
@@ -541,7 +548,7 @@ node(:title) { @custom_title }
 ### Content Type Headers ###
 
 Currently in RABL, the content-type of your response is not set automatically. This is because RABL is intended
-to work for any Rack-based framework and as agostic to format as possible.
+to work for any Rack-based framework and as agnostic to format as possible.
 Check [this issue](https://github.com/nesquena/rabl/issues/185#issuecomment-4501232) for more
 details, and if you have any ideas or patches please let me know.
 

data/lib/rabl/builder.rb

@@ -47,7 +47,7 @@ module Rabl
       end if @options.has_key?(:child)
       # Glues
       @options[:glue].each do |settings|
-        glue(settings[:data], &settings[:block])
+        glue(settings[:data], settings[:options], &settings[:block])
       end if @options.has_key?(:glue)
 
       # Wrap result in root
@@ -108,8 +108,8 @@ module Rabl
 
     # Glues data from a child node to the json_output
     # glue(@user) { attribute :full_name => :user_full_name }
-    def glue(data, &block)
-      return false unless data.present?
+    def glue(data, options={}, &block)
+      return false unless data.present? && resolve_condition(options)
       object = data_object(data)
       glued_attributes = self.object_to_hash(object, :root => false, &block)
       @_result.merge!(glued_attributes) if glued_attributes

data/lib/rabl/engine.rb

@@ -183,8 +183,8 @@ module Rabl
 
     # Glues data from a child node to the json_output
     # glue(@user) { attribute :full_name => :user_full_name }
-    def glue(data, &block)
-      @_options[:glue].push({ :data => data, :block => block })
+    def glue(data, options={}, &block)
+      @_options[:glue].push({ :data => data, :options => options, :block => block })
     end
 
     # Extends an existing rabl template with additional attributes in the block
@@ -209,7 +209,8 @@ module Rabl
       if context_scope.respond_to?(:controller)
         controller_name = context_scope.controller.controller_name
         stripped_name = controller_name.split(%r{::|\/}).last
-        instance_variable_get("@#{stripped_name}")
+        ivar_object = instance_variable_get("@#{stripped_name}")
+        ivar_object if is_object?(ivar_object)
       end
     end
 

data/lib/rabl/partials.rb

@@ -32,7 +32,7 @@ module Rabl
     def fetch_source(file, options={})
       view_paths = Array(options[:view_path]) + Array(Rabl.configuration.view_paths)
       Rabl.source_cache(file, view_paths) do
-        file_path = if defined?(Padrino) && context_scope.respond_to?(:settings)
+        file_path = if defined?(Padrino) && context_scope.respond_to?(:settings) && context_scope.respond_to?(:resolve_template)
           fetch_padrino_source(file, options)
         elsif defined?(Rails) && context_scope.respond_to?(:view_paths)
           _view_paths = view_paths + Array(context_scope.view_paths.to_a)

data/lib/rabl/version.rb

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

data/test/builder_test.rb

@@ -137,18 +137,18 @@ context "Rabl::Builder" do
     end.equals({})
 
     asserts "that it generates the glue attributes" do
-      b = builder :glue => [{ :data => @user, :block => lambda { |u| attribute :name }}]
+      b = builder :glue => [{ :data => @user, :options => {}, :block => lambda { |u| attribute :name }}]
       mock(b).object_to_hash(@user, { :root => false }).returns({:user => 'xyz'}).subject
       b.build(@user)
     end.equivalent_to({ :user => 'xyz' })
 
     asserts "that it appends the glue attributes to result" do
-      b = builder :glue => [{ :data => @user, :block => lambda { |u| attribute :name => :user_name }}]
+      b = builder :glue => [{ :data => @user, :options => {}, :block => lambda { |u| attribute :name => :user_name }}]
       b.build(@user)
     end.equivalent_to({ :user_name => 'rabl' })
 
     asserts "that it does not generate new attributes if no glue attributes are present" do
-      b = builder :glue => [{ :data => @user, :block => lambda { |u| attribute :name }}]
+      b = builder :glue => [{ :data => @user, :options => {}, :block => lambda { |u| attribute :name }}]
       mock(b).object_to_hash(@user,{ :root => false }).returns({}).subject
       b.build(@user)
     end.equals({})

data/test/engine_test.rb

@@ -373,6 +373,14 @@ context "Rabl::Engine" do
         template.render(scope).split
       end.equals "{\"name\":\"rabl\"}".split
 
+      asserts "that it does not set a collection as default object" do
+        template = rabl %{
+          attribute :name
+        }
+        scope = context_scope('user', [])
+        template.render(scope).split
+      end.equals "{}".split
+
       asserts "that it sets data source" do
         template = rabl %q{
           object @user
@@ -624,6 +632,17 @@ context "Rabl::Engine" do
         scope.instance_variable_set :@user, User.new(:name => 'leo', :city => 'LA', :age => 12)
         JSON.parse(template.render(scope))
       end.equals JSON.parse("{\"name\":\"leo\",\"city\":\"LA\",\"age\":12}")
+
+      asserts "that it can be passed conditionals" do
+        template = rabl %{
+          object @user
+          attribute :name
+          glue(@user, {:if => lambda { |i| false }}) { attribute :age  }
+        }
+        scope = Object.new
+        scope.instance_variable_set :@user, User.new(:name => 'leo', :city => 'LA', :age => 12)
+        JSON.parse(template.render(scope))
+      end.equals JSON.parse("{\"name\":\"leo\"}")
     end
 
     teardown do

data/test/partials_test.rb

@@ -89,6 +89,32 @@ context "Rabl::Partials" do
     end
   end
 
+  context "fetch source with custom scope" do
+    context "when Padrino is defined" do
+      helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }
+
+      setup do
+        ::Padrino = stub(Class.new)
+        Rabl.configuration.cache_sources = false
+        @it = TestPartial.new
+
+        def @it.context_scope; @context_scope ||= Object.new; end
+        context_scope = @it.context_scope
+        def context_scope.settings; end
+
+        File.open(tmp_path + "test.json.rabl", "w") { |f| f.puts "content" }
+      end
+
+      asserts('Padrino constant dont break manual lookup') do
+        @it.fetch_source('test', :view_path => tmp_path.to_s)
+      end.equals do
+        ["content\n", (tmp_path + "test.json.rabl").to_s ]
+      end
+
+      teardown { Object.send(:remove_const, :Padrino) }
+    end
+  end
+
   context "fetch source with Rails" do
     context "and :view_path" do
       helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-06-28 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: -2073633213331132502
+      hash: 3931971749616157374
 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: -2073633213331132502
+      hash: 3931971749616157374
 requirements: []
 rubyforge_project: rabl
 rubygems_version: 1.8.25