rabl 0.7.3 → 0.7.4

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
-## 0.7.4 (unreleased)
+## 0.7.5 (unreleased)
+
+## 0.7.4
+
+  * Fix issue #347 with extends failing for custom object templates
 
 ## 0.7.3
 

data/README.md

@@ -514,6 +514,7 @@ the [RABL Wiki](https://github.com/nesquena/rabl/wiki) for other usages.
 Tutorials can always be helpful when first getting started:
 
  * [Railscasts #322](http://railscasts.com/episodes/322-rabl)
+ * [Creating an API with RABL and Padrino](http://blog.crowdint.com/2012/10/22/rabl-with-padrino.html)
  * http://blog.joshsoftware.com/2011/12/23/designing-rails-api-using-rabl-and-devise/
  * http://engineering.gomiso.com/2011/06/27/building-a-platform-api-on-rails/
  * http://blog.lawrencenorton.com/better-json-requests-with-rabl

data/lib/rabl/partials.rb

@@ -21,7 +21,6 @@ module Rabl
     # 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.reverse_merge(:format => "hash", :view_path => @_view_path, :root => (options[:root] || false))
       Rabl::Engine.new(options[:source], engine_options).render(@_scope, :object => object, &block)

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/test/models/user.rb

@@ -1,17 +1,19 @@
 unless defined?(User)
   class User
-    attr_accessor :age, :city, :name, :first
+    attr_accessor :age, :city, :name, :first, :float
 
     DEFAULT_AGE   = 24
     DEFAULT_CITY  = 'irvine'
     DEFAULT_NAME  = 'rabl'
     DEFAULT_FIRST = 'bob'
+    DEFAULT_FLOAT = 1234.56
 
     def initialize(attributes={})
       self.age   = attributes[:age]   || DEFAULT_AGE
       self.city  = attributes[:city]  || DEFAULT_CITY
       self.name  = attributes[:name]  || DEFAULT_NAME
       self.first = attributes[:first] || DEFAULT_FIRST
+      self.float = attributes[:float] || DEFAULT_FLOAT
     end
   end
 end

data/test/renderer_test.rb

@@ -122,6 +122,44 @@ context "Rabl::Renderer" do
       JSON.parse(renderer.render)
     end.equals JSON.parse("{\"user\":{\"age\":24,\"name\":\"irvine\"}}")
 
+    asserts 'handles extends with custom node and object set false' do
+      File.open(tmp_path + "test.json.rabl", "w") do |f|
+        f.puts %q{
+          node(:foo) { 'baz' }
+        }
+      end
+
+      File.open(tmp_path + "user.json.rabl", "w") do |f|
+        f.puts %(
+          object false
+          node(:baz) { "bar" }
+          extends 'test'
+        )
+      end
+
+      renderer = Rabl::Renderer.new('user', false, :view_path => tmp_path)
+      JSON.parse(renderer.render)
+    end.equals(JSON.parse(%Q^{"foo":"baz", "baz":"bar" }^))
+
+    asserts 'handles extends with attributes and object set false' do
+      File.open(tmp_path + "test.json.rabl", "w") do |f|
+        f.puts %q{
+          attributes :foo, :bar, :baz
+          node(:test) { |bar| bar.demo if bar }
+        }
+      end
+
+      File.open(tmp_path + "user.json.rabl", "w") do |f|
+        f.puts %(
+          object false
+          extends 'test'
+        )
+      end
+
+      renderer = Rabl::Renderer.new('user', false, :view_path => tmp_path)
+      JSON.parse(renderer.render)
+    end.equals(JSON.parse(%Q^{"test": null}^))
+
     # FIXME template is found and rendered but not included in final results
     # asserts 'handles paths for partial' do
     #   File.open(tmp_path + "test.json.rabl", "w") do |f|
@@ -218,13 +256,13 @@ context "Rabl::Renderer" do
       File.open(tmp_path + "test.rabl", "w") do |f|
         f.puts %q{
           object @user
-          attributes :age, :name
+          attributes :age, :name, :float
         }
       end
 
       user = User.new(:name => 'ivan')
       JSON.parse(Rabl::Renderer.json(user, 'test', :view_path => tmp_path))
-    end.equals JSON.parse("{\"user\":{\"age\":24,\"name\":\"ivan\"}}")
+    end.equals JSON.parse("{\"user\":{\"age\":24,\"name\":\"ivan\",\"float\":1234.56}}")
   end
 
   context '.msgpack' do
@@ -232,13 +270,13 @@ context "Rabl::Renderer" do
       File.open(tmp_path + "test.rabl", "w") do |f|
         f.puts %q{
           object @user
-          attributes :age, :name
+          attributes :age, :name, :float
         }
       end
 
       user = User.new(:name => 'ivan')
       Rabl::Renderer.msgpack(user, 'test', :view_path => tmp_path)
-    end.equals "\x81\xA4user\x82\xA3age\x18\xA4name\xA4ivan"
+    end.equals "\x81\xA4user\x83\xA3age\x18\xA4name\xA4ivan\xA5float\xCB@\x93J=p\xA3\xD7\n"
   end
 
   context '.plist' do
@@ -246,12 +284,12 @@ context "Rabl::Renderer" do
       File.open(tmp_path + "test.rabl", "w") do |f|
         f.puts %q{
           object @user
-          attributes :age, :name
+          attributes :age, :name, :float
         }
       end
 
       user = User.new(:name => 'ivan')
       Rabl::Renderer.plist(user, 'test', :view_path => tmp_path)
-    end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>age</key>\n\t\t<integer>24</integer>\n\t\t<key>name</key>\n\t\t<string>ivan</string>\n\t</dict>\n</dict>\n</plist>\n"
+    end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>age</key>\n\t\t<integer>24</integer>\n\t\t<key>float</key>\n\t\t<real>1234.56</real>\n\t\t<key>name</key>\n\t\t<string>ivan</string>\n\t</dict>\n</dict>\n</plist>\n"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport