rabl 0.1.4 → 0.1.5

data/README.md

@@ -209,6 +209,7 @@ Thanks to [Miso](http://gomiso.com) for allowing me to create this for our appli
 * [Nathan Esquenazi](https://github.com/nesquena) - Creator of the project
 * [Arthur Chiu](https://github.com/achiu) - Core Maintainer, Riot Testing Guru
 * [Tim Lee](https://github.com/timothy1ee) - RABL is an awesome name and was chosen by the Miso CTO.
+* [Rick Thomas](https://github.com/rickthomasjr) - Added options passing for extends and Sinatra testing
 
 More to come hopefully! Please fork and contribute, any help is appreciated!
 

data/lib/rabl/builder.rb

@@ -3,6 +3,8 @@ module Rabl
     include Rabl::Helpers
 
     # Constructs a new ejs hash based on given object and options
+    # options = { :format => "json", :attributes, :root => true,
+    #   :child_root => true, :code, :child, :glue, :extends }
     def initialize(data, options={}, &block)
       @options    = options
       @_scope     = options[:scope]
@@ -70,7 +72,7 @@ module Rabl
     def child(data, options={}, &block)
       return false unless data.present?
       name, object = data_name(data), data_object(data)
-      include_root = object.respond_to?(:each) # child @users
+      include_root = object.respond_to?(:each) && @options[:child_root] # child @users
       object = { object => name } if data.respond_to?(:each_pair) && object # child :users => :people
       @_result[name] = self.object_to_hash(object, :root => include_root, &block) if resolve_condition(options)
     end

data/lib/rabl/engine.rb

@@ -6,7 +6,7 @@ module Rabl
     # Rabl::Engine.new("...source...", { :format => "xml", :root => true, :view_path => "/path/to/views" })
     def initialize(source, options={})
       @_source = source
-      @_options = options.reverse_merge(:format => "json")
+      @_options = options
     end
 
     # Renders the representation based on source, object, scope and locals
@@ -15,6 +15,7 @@ module Rabl
       @_locals, @_scope = locals, scope
       self.copy_instance_variables_from(@_scope, [:@assigns, :@helpers])
       @_options[:scope] = @_scope
+      @_options[:format] ||= default_format
       @_data = locals[:object] || self.default_object
       instance_eval(@_source) if @_source.present?
       instance_eval(&block) if block_given?
@@ -22,29 +23,30 @@ module Rabl
     end
 
     # Returns a hash representation of the data object
-    # to_hash(:root => true)
+    # to_hash(:root => true, :child_root => true)
     def to_hash(options={})
+      options = options.reverse_merge(@_options)
       data = data_object(@_data)
       if is_record?(data) || !data # object @user
-        Rabl::Builder.new(@_data, @_options).to_hash(options)
+        Rabl::Builder.new(@_data, options).to_hash(options)
       elsif data.respond_to?(:each) # collection @users
         object_name = data_name(@_data).to_s.singularize # @users => :users
-        data.map { |object| Rabl::Builder.new({ object => object_name }, @_options).to_hash(options) }
+        data.map { |object| Rabl::Builder.new({ object => object_name }, options).to_hash(options) }
       end
     end
 
     # Returns a json representation of the data object
     # to_json(:root => true)
     def to_json(options={})
-      options = options.reverse_merge(:root => true)
+      options = options.reverse_merge(:root => true, :child_root => true)
       result = @_collection_name ? { @_collection_name => to_hash(options) } : to_hash(options)
       result.to_json
     end
 
-    # Returns a json representation of the data object
+    # Returns an xml representation of the data object
     # to_xml(:root => true)
     def to_xml(options={})
-      options = options.reverse_merge(:root => false)
+      options = options.reverse_merge(:root => false, :child_root => false)
       to_hash(options).to_xml(:root => data_name(@_data))
     end
 
@@ -124,5 +126,14 @@ module Rabl
         instance_variable_get("@#{@_scope.controller.controller_name}") :
         nil
     end
+
+    # Returns a guess at the format in this scope
+    # default_format => "xml"
+    def default_format
+      format = @_scope.respond_to?(:params) && @_scope.params.has_key?(:format) ?
+        @_scope.params[:format] :
+        nil
+      format || "json"
+    end
   end
 end

data/lib/rabl/helpers.rb

@@ -29,7 +29,7 @@ module Rabl
     # Renders a partial hash based on another rabl template
     # partial("users/show", :object => @user)
     def partial(file, options={}, &block)
-      source = self.fetch_source(file)
+      source = self.fetch_source(file, options)
       self.object_to_hash(options[:object], :source => source, &block)
     end
 

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/builder_test.rb

@@ -128,14 +128,23 @@ context "Rabl::Builder" do
       get_result(b)
     end.equivalent_to({ :user => 'xyz'})
 
-    asserts "that it generates with an collection" do
-      b = builder @user, {}
+    asserts "that it generates with an collection and child_root" do
+      b = builder @user, { :child_root => true }
       mock(b).data_name(@users) { :users }
       mock(b).object_to_hash(@users,{ :root => true }).returns('xyz').subject
 
       b.child(@users) { attribute :name }
       get_result(b)
     end.equivalent_to({ :users => 'xyz'})
+
+    asserts "that it generates with an collection and no child root" do
+      b = builder @user, { :child_root => false }
+      mock(b).data_name(@users) { :users }
+      mock(b).object_to_hash(@users,{ :root => false }).returns('xyz').subject
+
+      b.child(@users) { attribute :name }
+      get_result(b)
+    end.equivalent_to({ :users => 'xyz'})
   end
 
   context "#glue" do

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -07:00
+date: 2011-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rabl
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: General ruby templating for json or xml