rabl 0.5.1 → 0.5.3

data/README.md

@@ -38,7 +38,8 @@ With Sinatra, or any other tilt-based framework, simply register:
 
     Rabl.register!
 
-and RABL will be initialized and ready for use.
+and RABL will be initialized and ready for use. For usage with Sinatra, check out
+the [Sinatra Usage](https://github.com/nesquena/rabl/wiki/Setup-for-Sinatra) guide.
 
 ## Overview ##
 
@@ -322,6 +323,22 @@ end
 
 Using partials and inheritance can significantly reduce code duplication in your templates.
 
+## Template Scope ##
+
+In RABL, you have access to everything you need to build an API response. Each RABL template has full access to the controllers
+instance variables as well as all view helpers and routing urls.
+
+```ruby
+# app/some/template.rabl
+object @post
+# Access instance variables
+child(@user => :user) { ... }
+# or Rails helpers
+code(:formatted_body) { |post| simple_format(post.body) }
+```
+
+There should be no problem fetching the appropriate data to construct a response.
+
 ### Deep Nesting ###
 
 In APIs, you can often need to construct 2nd or 3rd level nodes. Let's suppose we have a 'quiz' model that has many 'questions'
@@ -343,21 +360,15 @@ end
 This will display the quiz object with nested questions and answers as you would expect with a quiz node, and embedded questions and answers.
 Note that RABL can be nested arbitrarily deep within child nodes to allow for these representations to be defined.
 
-## Template Scope ##
+### Advanced Usage ###
 
-In RABL, you have access to everything you need to build an API response. Each RABL template has full access to the controllers
-instance variables as well as all view helpers and routing urls.
+ * Rendering JSON for a tree structure using RABL: https://github.com/nesquena/rabl/issues/70
+ * Layouts (erb, haml and rabl) in RABL: https://github.com/nesquena/rabl/wiki/Using-Layouts
+ * Backbone or [Ember.js](http://www.emberjs.com) Integration: https://github.com/nesquena/rabl/wiki/Backbone-Integration
 
-```ruby
-# app/some/template.rabl
-object @post
-# Access instance variables
-child(@user => :user) { ... }
-# or Rails helpers
-code(:formatted_body) { |post| simple_format(post.body) }
-```
+### Troubleshooting ###
 
-There should be no problem fetching the appropriate data to construct a response.
+ * Redundant calls for a collection: https://github.com/nesquena/rabl/issues/142#issuecomment-2969107
 
 ## Issues ##
 

data/lib/rabl/builder.rb

@@ -76,12 +76,12 @@ module Rabl
     # child(@user => :person) { ... }
     # child(@users => :people) { ... }
     def child(data, options={}, &block)
-      return false unless data.present?
+      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
       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) if resolve_condition(options)
+      @_result[name] = self.object_to_hash(object, engine_options, &block) 
     end
 
     # Glues data from a child node to the json_output

data/lib/rabl/engine.rb

@@ -7,6 +7,7 @@ module Rabl
     def initialize(source, options={})
       @_source = source
       @_options = options
+      @_compiled = false
     end
 
     # Renders the representation based on source, object, scope and locals
@@ -14,6 +15,7 @@ module Rabl
     def render(scope, locals, &block)
       @_locals, @_scope = locals, scope
       self.copy_instance_variables_from(@_scope, [:@assigns, :@helpers])
+      clear_compile_state
       @_options[:scope] = @_scope
       @_options[:format] ||= self.request_format
       @_data = locals[:object] || self.default_object
@@ -29,7 +31,7 @@ module Rabl
     # Returns a hash representation of the data object
     # to_hash(:root => true, :child_root => true)
     def to_hash(options={})
-      options = options.reverse_merge(@_options)
+      options = @_options.merge(options)
       data = data_object(@_data)
       if is_object?(data) || !data # object @user
         Rabl::Builder.new(@_data, options).to_hash(options)
@@ -187,5 +189,14 @@ module Rabl
       vars = object.instance_variables.map(&:to_s) - exclude.map(&:to_s)
       vars.each { |name| instance_variable_set(name, object.instance_variable_get(name)) }
     end
+
+    private
+    def clear_compile_state
+      @_options.delete(:extends)
+      @_options.delete(:attributes)
+      @_options.delete(:code)
+      @_options.delete(:child)
+      @_options.delete(:glue)
+    end
   end
 end

data/lib/rabl/version.rb

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

data/test/engine_test.rb

@@ -350,6 +350,20 @@ context "Rabl::Engine" do
         template.render(scope).split('').sort
 
       end.equals "{\"name\":\"leo\",\"person\":{\"city\":\"LA\"}}".split('').sort
+
+
+      asserts "that it can be passed conditionals" do
+        template = rabl %{
+          object @user
+          attribute :name
+          child({:children => :children}, {:if => lambda { |user| user.respond_to?('children') }}) { attribute :test }
+        }
+        scope = Object.new
+        scope.instance_variable_set :@user, User.new(:name => 'leo', :city => 'LA')
+        template.render(scope).split('').sort
+
+      end.equals "{\"name\":\"leo\"}".split('').sort
+
     end
 
     context "#glue" do

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 Z
+date: 2011-12-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rabl
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: General ruby templating for json or xml