bldr 0.1.0 → 0.1.1

data/Gemfile

@@ -5,6 +5,5 @@ gemspec
 gem "rake"
 
 group :test do
-  gem 'autotest'
   gem "rspec", ">= 2.6.0"
 end

data/README.md

@@ -275,6 +275,10 @@ au BufRead,BufNewFile *.bldr set filetype=ruby
 * [RABL](http://github.com/nesquena/rabl) - Inspiration
 * [Tilt](https://github.com/rtomayko/tilt) - Mega awesome goodness
 
+## Contributors
+
+* Ian Hunter (@ihunter)
+
 ## Copyright
 
 Copyright (c) 2011 Alex Sharp. See the MIT-LICENSE file for full

data/lib/bldr/node.rb

@@ -83,18 +83,16 @@ module Bldr
 
       node  = Node.new(value, :parent => self, &block)
       merge_result!(key, node.render!)
-      node.parent.to_json
+      self.to_json
     end
 
     def collection(items, &block)
       key   = items.keys.first
-      items = items.values.first
+      values = items.values.to_a.first
 
-      merge_result!(key, [])
-      items.each do |item|
-        node = Node.new(item, :parent => self, &block)
-        append_result!(key, node.render!)
-      end
+      merge_result! key, values.map{|item| Node.new(item, :parent => self, &block).render!}
+
+      self.to_json
     end
 
     # Add attributes to the result hash in a variety of ways

data/lib/bldr/version.rb

@@ -1,4 +1,4 @@
 
 module Bldr
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/functional/tilt_template_spec.rb

@@ -30,4 +30,99 @@ describe "evaluating a tilt template" do
       :person_2 => {:name => 'john'}
     })
   end
+
+  describe "root Object nodes" do
+
+    let(:alex) { Person.new('alex', 25) }
+    let(:ian) { Person.new('ian', 32) }
+
+    it "returns json for a blank root object " do
+      tpl  = Bldr::Template.new {
+        <<-RUBY
+          object do
+            attribute(:url) {"http://google.com"}
+          end
+        RUBY
+      }
+      result = tpl.render(Bldr::Node.new)
+      result.should == jsonify({'url' => 'http://google.com'})
+    end
+
+    it "returns json for a root object" do
+      tpl = Bldr::Template.new {
+        <<-RUBY
+          object :person => alex do
+            attributes :name, :age
+          end
+        RUBY
+      }
+      result = tpl.render(Bldr::Node.new, :alex => alex, :ian => ian)
+      parse_json(result).should == {'person' => {'name' => 'alex', 'age' => 25}}
+    end
+
+    it "returns json for root object templates with nested collections" do
+      tpl = Bldr::Template.new {
+        <<-RUBY
+          object :person => alex do
+            attributes :name, :age
+
+            collection :friends => friends do
+              attributes :name, :age
+            end
+          end
+        RUBY
+      }
+      result = tpl.render(Bldr::Node.new, :alex => alex, :friends => [ian])
+      parse_json(result).should == {
+        'person'=> {'name' => 'alex', 'age' => 25, 'friends' => [{'name' => 'ian', 'age' => 32}]}
+      }
+    end
+
+  end
+
+  describe "root Collection nodes" do
+
+    let(:alex) { Person.new('alex', 25, [Person.new('bo',33)]) }
+    let(:ian) { Person.new('ian', 32, [Person.new('eric',34)]) }
+
+    it "returns json for a root collection template" do
+      tpl = Bldr::Template.new {
+        <<-RUBY
+          collection :people => people do
+            attributes :name, :age
+          end
+        RUBY
+      }
+      result = tpl.render(Bldr::Node.new, :people => [alex,ian])
+      parse_json(result).should == {
+        'people'=> [{'name' => 'alex', 'age' => 25},{'name' => 'ian', 'age' => 32}]
+      }
+    end
+
+    it "returns json for a root collection with embedded collection template" do
+      tpl = Bldr::Template.new {
+        <<-RUBY
+          collection :people => people do
+            attributes :name, :age
+            collection :friends => current_object.friends do
+              attributes :name, :age
+            end
+          end
+        RUBY
+      }
+      result = tpl.render(Bldr::Node.new, :people => [alex,ian])
+      parse_json(result).should == {
+        'people'=> [{
+          'name' => 'alex',
+          'age' => 25,
+          "friends" => [{"name" => 'bo', "age" => 33}]
+        },{
+          'name' => 'ian',
+          'age' => 32,
+          "friends" => [{"name" => 'eric', "age" => 34}]
+        }]
+      }
+    end
+
+  end
 end

data/spec/models/person.rb

@@ -1,9 +1,9 @@
 
 class Person
 
-  attr_accessor :name, :age
+  attr_accessor :name, :age, :friends
 
-  def initialize(name = nil, age = nil)
-    @name, @age = name, age
+  def initialize(name = nil, age = nil, friends = nil)
+    @name, @age, @friends = name, age, friends
   end
 end

metadata

@@ -1,83 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bldr
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Alex Sharp
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-04 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153792500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153792500
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &2153792080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153792080
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2153791540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.2.6
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153791540
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &2153791040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153791040
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &2153790660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: Provides a simple and intuitive templating DSL for serializing objects to JSON.
-email: 
+  prerelease: false
+  version_requirements: *2153790660
+description: Provides a simple and intuitive templating DSL for serializing objects
+  to JSON.
+email:
 - ajsharp@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - .travis.yml
@@ -102,35 +98,31 @@ files:
 - spec/spec_helper.rb
 - spec/unit/bldr_spec.rb
 - spec/unit/node_spec.rb
-has_rdoc: true
 homepage: https://github.com/ajsharp/bldr
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: bldr
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Templating library with a simple, minimalist DSL.
-test_files: 
+test_files:
 - spec/fixtures/nested_objects.json.bldr
 - spec/fixtures/root_template.json.bldr
 - spec/functional/tilt_template_spec.rb