bldr 0.5.2 → 0.5.3

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 0.5.3
+
+* Add ability to use `attribute` method at the root-level in a bldr template
+* Fix for when partials return nil (#19)
+
 ## 0.5.0 (2012-02-08)
 * Add support "partials" (@ihunter)
 

data/lib/bldr/node.rb

@@ -156,6 +156,7 @@ module Bldr
         raise(ArgumentError, "You may only pass one argument to #attribute when using the block syntax.") if args.size > 1
         raise(ArgumentError, "You cannot use a block of arity > 0 if current_object is not present.") if block.arity > 0 and current_object.nil?
         merge_result!(args.first, (block.arity == 1) ? block.call(current_object) : current_object.instance_eval(&block))
+        self
       else
         case args.size
         when 1 # inferred object
@@ -186,7 +187,10 @@ module Bldr
     #   end
     def template(template,options={})
       locals = options[:locals] || options['locals']
-      merge_result! nil, Bldr::Template.new(find_template(template)).render(self, locals).result
+
+      if tpl = Bldr::Template.new(find_template(template)).render(self, locals)
+        merge_result! nil, tpl.result
+      end
     end
 
     private

data/lib/bldr/version.rb

@@ -1,4 +1,4 @@
 
 module Bldr
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/spec/functional/tilt_template_spec.rb

@@ -13,6 +13,15 @@ describe "evaluating a tilt template" do
     tpl.render(Bldr::Node.new, :alex => alex).result.should == {:person => {:name => 'alex'}}
   end
 
+  it "allows attribute to be used at the root-level" do
+    tpl = Bldr::Template.new {
+      <<-RUBY
+        attribute(:foo) { "bar" }
+      RUBY
+    }
+    tpl.render(Bldr::Node.new(nil)).result.should == {:foo => 'bar'}
+  end
+
   it "works when render two top-level objects" do
     alex = Person.new('alex')
     john = Person.new('john')

data/spec/unit/node_spec.rb

@@ -17,7 +17,6 @@ describe "Node#object" do
     end
 
     describe "#attribute" do
-
       it "errors on a single argument" do
         expect {
           node_wrap {
@@ -27,6 +26,7 @@ describe "Node#object" do
           }
         }.to raise_error(ArgumentError, ERROR_MESSAGES[:attribute_lambda_one_argument])
       end
+
       it "errors on 3 arguments" do
         expect {
           node_wrap {
@@ -34,6 +34,7 @@ describe "Node#object" do
           }
         }.to raise_error(ArgumentError, ERROR_MESSAGES[:attribute_more_than_two_arg])
       end
+
       it "errors on 2 arguments and a lambda" do
         expect {
           node_wrap {
@@ -43,6 +44,7 @@ describe "Node#object" do
           }
         }.to raise_error(ArgumentError, ERROR_MESSAGES[:attribute_lambda_one_argument])
       end
+
       it "errors on 1 argument since there is no inferred object" do
         expect {
           node_wrap {
@@ -50,10 +52,12 @@ describe "Node#object" do
           }
         }.to raise_error(ArgumentError, ERROR_MESSAGES[:attribute_inferred_missing_one_argument])
       end
+
       it "renders 2 arguments statically" do
         node = wrap { attribute(:name, "alex") }
         node.result.should == {:name => 'alex'}
       end
+
       it "renders 1 argument and one lambda with zero arity" do
         node = wrap {
           attribute(:name) do
@@ -62,6 +66,7 @@ describe "Node#object" do
         }
         node.result.should == {:name => 'alex'}
       end
+
       it "errors on 1 argument and one lambda with arity 1" do
         expect {
           node_wrap {
@@ -71,15 +76,14 @@ describe "Node#object" do
           }
         }.to raise_error(ArgumentError, ERROR_MESSAGES[:attribute_inferred_missing_arity_too_large])
       end
+
       it "should render null attributes to null, not 'null'" do
         node = wrap { attribute(:name, nil) }
         node.result.should == {:name => nil}
       end
-
     end
 
     describe "#attributes" do
-
       it "errors since current_object is nil" do
         expect {
           node_wrap {
@@ -87,9 +91,7 @@ describe "Node#object" do
           }
         }.to raise_error(ArgumentError, ERROR_MESSAGES[:attributes_inferred_missing])
       end
-
     end
-
   end
 
   context "a single arg root object node" do
@@ -181,6 +183,11 @@ describe "Node#object" do
     end
 
     describe "#attribute" do
+      it "works at the root level" do
+        node_wrap {
+          attribute(:foo) { "bar" }
+        }.result.should == {:foo => 'bar'}
+      end
 
       it "errors on 3 arguments" do
         expect {
@@ -520,7 +527,7 @@ describe "Node#collection" do
 
 end
 
-describe "Node#partial" do
+describe "Node#template" do
   it "includes the partial as a top level" do
     nodes = node_wrap do
       template "spec/fixtures/partial.json.bldr"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bldr
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70126171949220 !ruby/object:Gem::Requirement
+  requirement: &70338454067680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70126171949220
+  version_requirements: *70338454067680
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70126171948780 !ruby/object:Gem::Requirement
+  requirement: &70338454067260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126171948780
+  version_requirements: *70338454067260
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70126171948200 !ruby/object:Gem::Requirement
+  requirement: &70338454066640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *70126171948200
+  version_requirements: *70338454066640
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70126171947660 !ruby/object:Gem::Requirement
+  requirement: &70338454065940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70126171947660
+  version_requirements: *70338454065940
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70126171947160 !ruby/object:Gem::Requirement
+  requirement: &70338454065240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70126171947160
+  version_requirements: *70338454065240
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70126171946680 !ruby/object:Gem::Requirement
+  requirement: &70338454080880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70126171946680
+  version_requirements: *70338454080880
 description: Provides a simple and intuitive templating DSL for serializing objects
   to JSON.
 email: