rabl 0.5.5.h → 0.5.5.i

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # CHANGELOG
 
-## 0.5.5.a-h
+## 0.5.5.a-i
 
  * Change engine to only instantiate one builder when rendering a collection
  * Alias to\_msgpack to to\_mpac
@@ -10,6 +10,8 @@
  * Adds a 'object_root' option to collection (thanks @blakewatters)
  * Adds a 'root_name' option to collection
  * Adds PList format support (thanks @alzeih)
+ * Fixes infinite recursion in edge case calculating object root name
+ * Fixes issue with nameless node that has an array result
 
 ## 0.5.4
 

data/README.md

@@ -1,6 +1,6 @@
 # RABL #
 
-RABL (Ruby API Builder Language) is a Rails and [Padrino](http://padrinorb.com) ruby templating system for generating JSON, XML, MessagePack and BSON. When using the ActiveRecord 'to_json' method, I tend to quickly find myself wanting a more expressive and powerful solution for generating APIs.
+RABL (Ruby API Builder Language) is a Rails and [Padrino](http://padrinorb.com) ruby templating system for generating JSON, XML, MessagePack, PList and BSON. When using the ActiveRecord 'to_json' method, I tend to quickly find myself wanting a more expressive and powerful solution for generating APIs.
 This is especially frustrating when the JSON representation is complex or doesn't match the exact schema defined in the database.
 
 I wanted a simple and flexible system for generating my APIs. In particular, I wanted to easily:

data/lib/rabl/builder.rb

@@ -73,8 +73,8 @@ module Rabl
       result = block.call(@_object)
       if name.present?
         @_result[name] = result
-      else
-        @_result.merge!(result) if result
+      elsif result.respond_to?(:each_pair) # merge hash into root hash
+        @_result.merge!(result)
       end
     end
     alias_method :code, :node

data/lib/rabl/helpers.rb

@@ -14,15 +14,15 @@ module Rabl
     # data_name(data) => "user"
     # data_name(@user => :person) => :person
     # data_name(@users) => :user
-    # data_name([@user]) => "user"
+    # data_name([@user]) => "users"
     # data_name([]) => "array"
     def data_name(data)
       return nil unless data # nil or false
       return data.values.first if data.is_a?(Hash) # @user => :user
       data = @_object.send(data) if data.is_a?(Symbol) && @_object # :address
-      if data.respond_to?(:first)
+      if is_collection?(data) && data.respond_to?(:first) # data collection
         data_name(data.first).to_s.pluralize if data.first.present?
-      else # actual data object
+      elsif is_object?(data) # actual data object
         object_name = object_root_name if object_root_name
         object_name ||= collection_root_name.to_s.singularize if collection_root_name
         object_name ||= data.class.respond_to?(:model_name) ? data.class.model_name.element : data.class.to_s.downcase

data/lib/rabl/partials.rb

@@ -9,7 +9,6 @@ module Rabl
     def partial(file, options={}, &block)
       raise ArgumentError, "Must provide an :object option to render a partial" unless options.has_key?(:object)
       object, view_path = options.delete(:object), options.delete(:view_path)
-      return if object.blank?
       source, location = self.fetch_source(file, :view_path => view_path)
       engine_options = options.merge(:source => source, :source_location => location)
       self.object_to_hash(object, engine_options, &block)
@@ -18,10 +17,12 @@ module Rabl
     # Returns a hash based representation of any data object given ejs template block
     # object_to_hash(@user) { attribute :full_name } => { ... }
     # object_to_hash(@user, :source => "...") { attribute :full_name } => { ... }
+    # object_to_hash([@user], :source => "...") { attribute :full_name } => { ... }
     # options must have :source (rabl file contents)
     # options can have :source_location (source filename)
     def object_to_hash(object, options={}, &block)
       return object unless is_object?(object) || is_collection?(object)
+      return [] if is_collection?(object) && object.blank? # empty collection
       engine_options = options.merge(:format => "hash", :root => (options[:root] || false))
       Rabl::Engine.new(options[:source], engine_options).render(@_scope, :object => object, &block)
     end

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.5.5.h"
+  VERSION = "0.5.5.i"
 end

data/test/helpers_test.rb

@@ -2,10 +2,31 @@ require 'tmpdir'
 require 'pathname'
 require File.expand_path('../../lib/rabl', __FILE__)
 
-class TestPartial
+class TestHelperMethods
   include Rabl::Helpers
 end
 
 context "Rabl::Helpers" do
-  # TODO needs tests
-end
+  setup do
+    @helper_class = TestHelperMethods.new
+    @user = User.new
+  end
+
+  context "for data_name method" do
+    asserts "returns nil if no data" do
+      @helper_class.data_name(nil)
+    end.equals(nil)
+
+    asserts "returns alias if hash with symbol is passed" do
+      @helper_class.data_name(@user => :user)
+    end.equals(:user)
+
+    asserts "returns name of first object of a collection" do
+      @helper_class.data_name([@user, @user])
+    end.equals('users')
+
+    asserts "returns name of an object" do
+      @helper_class.data_name(@user)
+    end.equals('user')
+  end
+end

data/test/models/user.rb

@@ -1,14 +1,16 @@
 class User
-  attr_accessor :age, :city, :name
+  attr_accessor :age, :city, :name, :first
 
-  DEFAULT_AGE  = 24
-  DEFAULT_CITY = 'irvine'
-  DEFAULT_NAME = 'rabl'
+  DEFAULT_AGE   = 24
+  DEFAULT_CITY  = 'irvine'
+  DEFAULT_NAME  = 'rabl'
+  DEFAULT_FIRST = 'bob'
 
   def initialize(attributes={})
-    self.age  = attributes[:age]  || DEFAULT_AGE
-    self.city = attributes[:city] || DEFAULT_CITY
-    self.name = attributes[:name] || DEFAULT_NAME
+    self.age   = attributes[:age]   || DEFAULT_AGE
+    self.city  = attributes[:city]  || DEFAULT_CITY
+    self.name  = attributes[:name]  || DEFAULT_NAME
+    self.first = attributes[:first] || DEFAULT_FIRST
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.5.5.h
+  version: 0.5.5.i
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-16 00:00:00 Z
+date: 2012-02-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rabl
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: General ruby templating with json, bson, xml and msgpack support