rabl 0.11.3 → 0.11.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzdjNWZkZTE2ZWVkZTI2N2NkMzgxZjI3OWQxMDdiYTQ5NWY4NjQwNA==
-  data.tar.gz: !binary |-
-    NGYyZDRjY2NjMDdjYWExOGYyM2RlMDlkMzI5MTMzNjY3NmYyN2Y1Nw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YWIzNmM2ZTY2OTVjNjgwYjZmMzc0OWZlZTIzZjZmZTcyZWExOTkyYjdiMjMw
-    N2MwMWRkOTY0OGQ0MDUzMTIwYTQ4YTVkZmUzYzNhYzZiZmMzZDI3MDliN2Nj
-    MTczMTA3MTRhNmQ3ZDZhNzg3YTY2MzU3M2UzZmNlOTM2Y2Q1NzI=
-  data.tar.gz: !binary |-
-    OWI5MzE3OTM5ZWQ4YTBkZTM3MGUwYWFmNmIyYmZhY2VmYmY2YjI1NTIyYzVm
-    YWQwMjYxZmNlMzJhODM2YzRiY2Q3Y2U4MDI5NzVkNzc3MGEyOGRhN2VlM2Qy
-    OWNiZmFmMjYxNGUyNzY1NDZiMWUwNzRiNmRhMjI2YWExZDJmMzY=
+SHA1:
+  metadata.gz: 653e59826616815f5be896620c6e11bfde575596
+  data.tar.gz: e3cf65575ec7aa5698a24119e761c0959433aefb
+SHA512:
+  metadata.gz: 6ff1aa2e4f4b7f7f91d70210d8faec3063dabe58a06d9d313e9c9ab195177296ee40ffbd0e8873ff65258fca4f4f32d9132d0ce74424a3f6c7a036ff411037e3
+  data.tar.gz: e3112ccd7ff15031956053833d59c49bacf908db0998352015fe975d500570b2f5395c9f972cca25b52864c3e1d5170ef97f0c6ce45c3bdafe56196bc4befc97

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.11.4 (November 7th)
+
+* FIX Get MultiBuilder to behave properly around nil engines (@DouweM)
+
 ## 0.11.3 (November 3rd)
 
 * FIX error when attempting to cache empty child collections (@DouweM)

data/lib/rabl/builder.rb

@@ -117,20 +117,13 @@ module Rabl
 
       def merge_engines_into_result
         engines.each do |engine|
-          # engine was stored in the form { name => #<Engine> }
-          if engine.is_a?(Hash)
+          case engine
+          when Hash
+            # engine was stored in the form { name => #<Engine> }
             engine.each do |key, value|
-              if value.is_a?(Engine)
-                value = value.render
-
-                if value
-                  engine[key] = value
-                else
-                  engine.delete(key)
-                end
-              end
+              engine[key] = value.render if value.is_a?(Engine)
             end
-          elsif engine.is_a?(Engine)
+          when Engine
             engine = engine.render
           end
 

data/lib/rabl/multi_builder.rb

@@ -60,17 +60,19 @@ module Rabl
     end
 
     def disable_cache_read_on_render(engine)
-      if engine.is_a?(Hash)
+      case engine
+      when Hash
         disable_cache_read_on_render(engine.values.first)
-      else
+      when Engine
         engine.cache_read_on_render = false
       end
     end
 
     def cache_key_for(engine)
-      if engine.is_a?(Hash)
+      case engine
+      when Hash
         cache_key_for(engine.values.first)
-      else
+      when Engine
         engine.cache_key
       end
     end

data/lib/rabl/renderer.rb

@@ -1,8 +1,8 @@
 module Rabl
   class Renderer
     # Defines class method rendering in supported formats
-    # Rabl::Renderer.json('posts/show', @post)
-    # Rabl::Renderer.xml('posts/show', @post)
+    # Rabl::Renderer.json(@post, 'posts/show')
+    # Rabl::Renderer.xml(@post, 'posts/show')
     Rabl::Engine::FORMATS.each do |fmt|
       instance_eval <<-CODE
       def #{fmt}(object, source, options = {})

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.11.3"
+  VERSION = "0.11.4"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
 - !ruby/object:Gem::Dependency
@@ -56,42 +56,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,14 +126,14 @@ dependencies:
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: General ruby templating with json, bson, xml and msgpack support
@@ -458,17 +458,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rabl
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: General ruby templating with json, bson, xml and msgpack support
@@ -496,3 +496,4 @@ test_files:
 - test/template_test.rb
 - test/teststrap.rb
 - test/xml_test.rb
+has_rdoc: