bldr 0.5.3 → 0.5.4

data/.travis.yml

@@ -1,6 +1,5 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 1.9.3
   - ree
   - ruby-head
   - rbx

data/HISTORY.md

@@ -1,5 +1,8 @@
-## 0.5.3
+## 0.5.4 (2012-04-24)
+* Fix bug to allow using `template` method at the root of a bldr template
+* Add `locals` reader method to allow access to locals passed into a bldr template
 
+## 0.5.3
 * Add ability to use `attribute` method at the root-level in a bldr template
 * Fix for when partials return nil (#19)
 
@@ -10,5 +13,4 @@
 * Add new `attribute` inferred object syntax (@ihunter)
 
 ## 0.1.2 (2011-09-08)
-
 * Return an empty collection when a nil value is passed to `collection` method

data/bldr.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'multi_json', '~> 1.0.3'
+  s.add_dependency 'multi_json'
 
   s.add_development_dependency 'json_pure'
   s.add_development_dependency 'sinatra',   '~>1.2.6'

data/lib/bldr.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.dirname(File.expand_path(__FILE__)))
-
 begin
   require 'tilt'
 rescue LoadError

data/lib/bldr/node.rb

@@ -3,7 +3,7 @@ module Bldr
 
   class Node
 
-    attr_reader :current_object, :result, :parent, :opts, :views
+    attr_reader :current_object, :result, :parent, :opts, :views, :locals
 
     # Initialize a new Node instance.
     #
@@ -22,6 +22,7 @@ module Bldr
       @opts           = opts
       @parent         = opts[:parent]
       @views          = opts[:views]
+      @locals         = opts[:locals]
       # Storage hash for all descendant nodes
       @result  = {}
 
@@ -60,8 +61,7 @@ module Bldr
     #   and the object to serialize.
     # @param [Proc] block the code block to evaluate
     #
-    # @return [String] returns a json-encoded string of itself and all
-    #   descendant nodes.
+    # @return [Bldr::Node] returns self
     def object(base = nil, &block)
       if base.kind_of? Hash
         key   = base.keys.first
@@ -78,6 +78,7 @@ module Bldr
       self
     end
 
+    # @return [Bldr::Node] returns self
     def collection(items, &block)
 
       if items.respond_to?('keys')
@@ -185,12 +186,16 @@ module Bldr
     #   object :person => dude do
     #     template "path/to/template", :locals => {:foo => 'bar'}
     #   end
-    def template(template,options={})
+    #
+    # @return [Bldr::Node] returns self
+    def template(template, options={})
       locals = options[:locals] || options['locals']
 
       if tpl = Bldr::Template.new(find_template(template)).render(self, locals)
         merge_result! nil, tpl.result
       end
+
+      self
     end
 
     private

data/lib/bldr/version.rb

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

data/lib/sinatra/bldr.rb

@@ -23,10 +23,9 @@ module Sinatra
       #
       # @param [Hash] opts a hash of options
       # @option opts [Hash] :locals a hash of local variables to be used in the template
-      # @option
       def bldr(template, opts = {}, &block)
-        opts[:scope] = ::Bldr::Node.new(nil,opts.merge(:views => (settings.views || "./views")))
-        locals = opts.delete(:locals)
+        opts[:scope] = ::Bldr::Node.new(nil, opts.merge(:views => (settings.views || "./views")))
+        locals       = opts.delete(:locals)
         MultiJson.encode render(:bldr, template, opts, locals, &block).result    
         # @todo add support for alternate formats, like plist
       end

data/spec/fixtures/root_partial.bldr

@@ -0,0 +1 @@
+template 'fixtures/partial.json.bldr'

data/spec/functional/tilt_template_spec.rb

@@ -147,3 +147,10 @@ describe "evaluating a tilt template" do
 
   end
 end
+
+describe "using a partial template at the root of another template" do
+  it "works as expected" do
+    template = Bldr::Template.new('./spec/fixtures/root_partial.bldr')
+    template.render(Bldr::Node.new(nil, :views => './spec')).result.should == {:foo => 'bar'}
+  end
+end

data/spec/integration/sinatra_spec.rb

@@ -8,6 +8,8 @@ describe "Using Bldr with a sinatra app" do
     register Sinatra::Bldr
 
     set :views, File.expand_path(__FILE__ + '/../..')
+    disable :show_exceptions
+    enable  :raise_errors
 
     get '/' do
       alex =  Person.new("alex", 25)
@@ -49,6 +51,15 @@ describe "Using Bldr with a sinatra app" do
 
       bldr :'fixtures/root_template.json', :locals => {:name => name, :age => age}
     end
+
+    get '/root_partial' do
+      bldr :'fixtures/root_partial'
+    end
+  end
+
+  it "properly renders a template that only contains a template call" do
+    response = Rack::MockRequest.new(TestApp).get('/root_partial')
+    MultiJson.decode(response.body).should == {'foo' => 'bar'}
   end
 
   it "returns json for a simple single-level template" do
@@ -86,3 +97,25 @@ describe "Using Bldr with a sinatra app" do
     parse_json(response.body).should == {'name' => 'john doe', 'age' => 26}
   end
 end
+
+describe "access to the locals hash inside sinatra bldr templates" do
+  class Locals < BaseTestApp
+    disable :show_exceptions
+    enable  :raise_errors
+
+    get '/' do
+      tpl = <<-RUBY
+        object(:locals) do
+          attribute(:key) { locals[:key] }
+        end
+      RUBY
+
+      bldr tpl, :locals => {:key => 'val'}
+    end
+  end
+
+  it "provides access to the locals hash in the template" do
+    response = Rack::MockRequest.new(Locals).get('/')
+    MultiJson.decode(response.body)['locals']['key'].should == 'val'
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'rspec'
 
 require 'yajl'
 require 'tilt'
+require 'sinatra/base'
 
 $:.unshift(File.dirname(File.expand_path(__FILE__)))
 
@@ -10,6 +11,16 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "..", "lib", "bldr")
 
 Dir['spec/models/*'].each { |f| require File.expand_path(f) }
 
+require 'sinatra/bldr'
+
+class BaseTestApp < Sinatra::Base
+  register Sinatra::Bldr
+
+  set :views, File.expand_path(__FILE__ + '/../..')
+  disable :show_exceptions
+  enable  :raise_errors
+end
+
 RSpec.configure do |c|
   def node_wrap(*args, &block)
     Bldr::Node.new(*args, &block)
@@ -35,6 +46,4 @@ RSpec.configure do |c|
   c.after do
     Bldr.handlers.clear
   end
-
-
 end

data/spec/unit/bldr_spec.rb

@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe "the json encoding library" do
   it "uses yajl by default" do
-    MultiJson.engine.should == MultiJson::Engines::Yajl
+    MultiJson.engine.should == MultiJson::Adapters::Yajl
   end
 
   it "allows changing the json encoder to json pure" do
     Bldr.json_encoder = :json_pure
-    MultiJson.engine.should == MultiJson::Engines::JsonPure
+    MultiJson.engine.should == MultiJson::Adapters::JsonPure
   end
 
   it "allows changing the json encoder to the json gem" do
     Bldr.json_encoder = :json_gem
-    MultiJson.engine.should == MultiJson::Engines::JsonGem
+    MultiJson.engine.should == MultiJson::Adapters::JsonGem
   end
 
 end

data/spec/unit/node_spec.rb

@@ -622,4 +622,11 @@ describe "Node#template" do
       end
     end
   end
+end
+
+describe "Node#locals" do
+  let(:node) { Bldr::Node.new({:foo => 'bar'}, :locals => {:key => 'val'})}
+  subject { node.locals }
+
+  it { should == {:key => 'val'} }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bldr
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70338454067680 !ruby/object:Gem::Requirement
+  requirement: &70282606563340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70338454067680
+  version_requirements: *70282606563340
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70338454067260 !ruby/object:Gem::Requirement
+  requirement: &70282606562140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338454067260
+  version_requirements: *70282606562140
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70338454066640 !ruby/object:Gem::Requirement
+  requirement: &70282606560360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *70338454066640
+  version_requirements: *70282606560360
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70338454065940 !ruby/object:Gem::Requirement
+  requirement: &70282606558200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70338454065940
+  version_requirements: *70282606558200
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70338454065240 !ruby/object:Gem::Requirement
+  requirement: &70282606557500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70338454065240
+  version_requirements: *70282606557500
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70338454080880 !ruby/object:Gem::Requirement
+  requirement: &70282606573160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70338454080880
+  version_requirements: *70282606573160
 description: Provides a simple and intuitive templating DSL for serializing objects
   to JSON.
 email:
@@ -105,6 +105,7 @@ files:
 - spec/fixtures/nested_objects.json.bldr
 - spec/fixtures/partial.json.bldr
 - spec/fixtures/partial_with_locals.json.bldr
+- spec/fixtures/root_partial.bldr
 - spec/fixtures/root_template.json.bldr
 - spec/fixtures/some/include.json.bldr
 - spec/functional/handlers_spec.rb
@@ -144,6 +145,7 @@ test_files:
 - spec/fixtures/nested_objects.json.bldr
 - spec/fixtures/partial.json.bldr
 - spec/fixtures/partial_with_locals.json.bldr
+- spec/fixtures/root_partial.bldr
 - spec/fixtures/root_template.json.bldr
 - spec/fixtures/some/include.json.bldr
 - spec/functional/handlers_spec.rb