bldr 1.0.0 → 1.0.1

data/HISTORY.md

@@ -1,3 +1,10 @@
+## 1.0.1
+* #32 Improved `object` syntax
+
+## 1.0.0
+* Full Rails 3 support
+* #31 BREAKING: Properly handle nil objects
+
 ## 0.7.0 (2013-02-24)
 * Full support for instance variables
 * Breaking change: Node#attribute block syntax no longer inherits

data/lib/bldr/node.rb

@@ -109,6 +109,11 @@ module Bldr
     #     object :hobbies => hobbies
     #   end
     #
+    # @example Setting current object
+    #   object @person do
+    #     attributes :id, :name
+    #   end # => {'id' => 1, 'name' => 'john doe'}
+    #
     # @param [Hash, Nil] hash a key/value pair indicating the output key name
     #   and the object to serialize.
     # @param [Proc] block the code block to evaluate
@@ -119,15 +124,22 @@ module Bldr
         if keyed_object?(base)
           key   = base.keys.first
           value = base.values.first
-        else
-          key = base
-          value = nil
-        end
 
-        # handle nil objects
-        if value.nil? && keyed_object?(base)
-          merge_result!(key, nil)
-          return self
+          # handle nil objects
+          if value.nil?
+            merge_result!(key, nil)
+            return self
+          end
+        else
+          # e.g. set the keyspace for an object
+          if base.is_a?(Symbol) || base.is_a?(String)
+            key = base
+            value = nil
+          else
+            # e.g. set current object
+            value = base
+            key = nil
+          end
         end
 
         node  = Node.new(value, opts.merge(:parent => self), &block)

data/lib/bldr/version.rb

@@ -1,4 +1,4 @@
 
 module Bldr
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/functional/set_current_object_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'setting the current object in an object block' do
+  it 'sets the object' do
+    klass = Struct.new(:name)
+    person = klass.new('alex')
+    Bldr::Node.new(nil, locals: {person: person}) do
+      object person do
+        attributes(:name)
+      end
+    end.result.should == {name: 'alex'}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bldr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -147,6 +147,7 @@ files:
 - spec/functional/handlers_spec.rb
 - spec/functional/helpers_spec.rb
 - spec/functional/params_spec.rb
+- spec/functional/set_current_object_spec.rb
 - spec/functional/tilt_template_spec.rb
 - spec/integration/rails_32_spec.rb
 - spec/integration/sinatra_spec.rb
@@ -195,6 +196,7 @@ test_files:
 - spec/functional/handlers_spec.rb
 - spec/functional/helpers_spec.rb
 - spec/functional/params_spec.rb
+- spec/functional/set_current_object_spec.rb
 - spec/functional/tilt_template_spec.rb
 - spec/integration/rails_32_spec.rb
 - spec/integration/sinatra_spec.rb