rabl 0.9.2 → 0.9.3.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmMxOGI3M2JkYjU2OWVjNjRlNTI2NjlkYTY0Y2Q4ZWI0ZjgxODI4MA==
+    NDI2NGZlZGFhNDhmN2U5M2VhMDI1YjIyNzJiNDllMjIxNjk0YzA2Zg==
   data.tar.gz: !binary |-
-    MjE2YmIxNjQxMTllODk5NTcxNzgzNTUxOGUyZWFmNmIxM2VlOGYwZg==
+    NzE0NTBkZjVhMTJiNDZjOGNiYzhhODFiY2NjNGZiYmYyOWZiYWI0Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTU1YTdmZjc4MjBiMGYxMmJhODQxNTNlNDM4YmEzMTkzYjdmNzY1NTgzZWY1
-    N2Y3Zjk4NTAyNTcyOTM5ZGQzZmFhZTcwM2VmNTIzYTEwM2Q1ZGYzNzViNTE2
-    YTE1MjZhMTcxYjg0ZjYxZTlkYzA5ZWY3NGI3ODM0ZmQ1NjQxOTg=
+    NTZiMDRhYTdjOWQ3YTYyZTc5YWEyYWM4MTBiZjAxYzMxMmY2ZjZhZmM4NWMw
+    MGU3YWIxZjA3YjgxN2EyMTk5M2M3M2Y4ZTM1Mjc0ZWNhYzI3OGZkNzIxZTk2
+    OTg0ODNiYWYzZDg2NTRiZTMyZjJlYzUxMjVlZjI4YzU2MmNjNGE=
   data.tar.gz: !binary |-
-    MGFmZmVhYThiOTY0NWM5OWViY2E3YTk5YjQ1YzRlZDZjNTEyNzUxNTIxZGFi
-    MGE2Zjk5NzFmYzQ4M2E5MWYwZTFmYmVkNzJiNDNlNWNmZGQ1NTAxMTM1MjUx
-    MzEzYjlmNzc2Y2MyMjg1MDM0ZTUzNzYyNmQ5ZWMzNmIxMTM2MTk=
+    OGQwMmY4NTJhMDQ5OTQ4Y2EyNmI4MzYyZmY2N2U3NGM1Y2MyNjg2NmZkMzcx
+    OGY5MGM0YTJjOThlMjMyNjk1ZWI3ZDhiZjc0NzE0NWM4NDlhZmY2MGM1ZGVj
+    MDlkZjA3ZjNhZDU3ZDUyOGJkNzFhYjYxMmIyNzc3ODU0Yzk1ZTQ=

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.9.3.pre1 (December 5th)
+
+* FIX Send engine options through from render call (Thanks @bhicks)
+* FIX Cleanup compile_hash method through refactoring complexity (Thanks @bhicks)
+* FIX #503 handling render case with no lookup_context in Rails 4
+* FIX #502 fix regression in render when object is nil with explicit root name
+
 ## 0.9.2 (November 21 2013)
 
 * FIX #508 by avoiding new proc syntax breaking 1.8.7

data/lib/rabl/builder.rb

@@ -2,6 +2,13 @@ module Rabl
   class Builder
     include Rabl::Partials
 
+    SETTING_TYPES = {
+      :extends => :file,
+      :node    => :name,
+      :child   => :data,
+      :glue    => :data
+    } unless const_defined? :SETTING_TYPES
+
     # Constructs a new rabl hash based on given object and options
     # options = { :format => "json", :root => true, :child_root => true,
     #   :attributes, :node, :child, :glue, :extends }
@@ -29,44 +36,46 @@ module Rabl
     # compile_hash(:root_name => "user")
     def compile_hash(options={})
       @_result = {}
-      # Extends
-      @options[:extends].each do |settings|
-        extends(settings[:file], settings[:options], &settings[:block])
-      end if @options.has_key?(:extends)
-      # Attributes
-      @options[:attributes].each_pair do |attribute, settings|
-        attribute(attribute, settings)
-      end if @options.has_key?(:attributes)
-      # Node
-      @options[:node].each do |settings|
-        node(settings[:name], settings[:options], &settings[:block])
-      end if @options.has_key?(:node)
-      # Children
-      @options[:child].each do |settings|
-        child(settings[:data], settings[:options], &settings[:block])
-      end if @options.has_key?(:child)
-      # Glues
-      @options[:glue].each do |settings|
-        glue(settings[:data], settings[:options], &settings[:block])
-      end if @options.has_key?(:glue)
-
-      # Wrap result in root
-      if options[:root_name].present?
-        @_root_name = options[:root_name]
+      update_settings(:extends)
+      update_attributes
+      update_settings(:node)
+      update_settings(:child)
+      update_settings(:glue)
+
+      wrap_result(options[:root_name])
+
+      replace_nil_values if Rabl.configuration.replace_nil_values_with_empty_strings
+
+      # Return Results
+      @_root_name ? { @_root_name => @_result } : @_result
+    end
+
+    def replace_nil_values
+      @_result = @_result.inject({}) do |hash, (k, v)|
+        hash[k] = v.nil? ? '' : v
+        hash
+      end
+    end
+
+    def wrap_result(root_name)
+      if root_name.present?
+        @_root_name = root_name
       else # no root
         @_root_name = nil
       end
+    end
 
-      # Replace nil values with empty strings if configured
-      if Rabl.configuration.replace_nil_values_with_empty_strings
-        @_result = @_result.inject({}) do |hash, (k, v)|
-          hash[k] = v.nil? ? '' : v
-          hash
-        end
-      end
+    def update_settings(type)
+      settings_type = SETTING_TYPES[type]
+      @options[type].each do |settings|
+        send(type, settings[settings_type], settings[:options], &settings[:block])
+      end if @options.has_key?(type)
+    end
 
-      # Return Results
-      @_root_name ? { @_root_name => @_result } : @_result
+    def update_attributes
+      @options[:attributes].each_pair do |attribute, settings|
+        attribute(attribute, settings)
+      end if @options.has_key?(:attributes)
     end
 
     # Indicates an attribute or method should be included in the json output

data/lib/rabl/engine.rb

@@ -36,7 +36,7 @@ module Rabl
         instance_eval(@_source) if @_source.present?
       end
       instance_exec(@_data_object, &block) if block_given?
-      cache_results { self.send("to_" + @_options[:format].to_s) }
+      cache_results { self.send("to_" + @_options[:format].to_s, @_options) }
     end
 
     # Returns a hash representation of the data object
@@ -293,7 +293,10 @@ module Rabl
         @_options[:format],
         Digestor.digest(template, :rabl, lookup_context)
       ]
-    end
+    rescue NameError => e # Handle case where lookup_context doesn't exist
+      raise e unless e.message =~ /lookup_context/
+      cache_key_simple(cache_key)
+    end # cache_key_with_digest
 
     def cache_key_simple(key)
       Array(key) + [@_options[:root_name], @_options[:format]]

data/lib/rabl/helpers.rb

@@ -49,7 +49,7 @@ module Rabl
     def determine_object_root(data_token, data_name=nil, include_root=true)
       return if object_root_name == false
       root_name = data_name.to_s if include_root
-      if is_object?(data_token)
+      if is_object?(data_token) || data_token.nil?
         root_name
       elsif is_collection?(data_token)
         object_root_name || (root_name.singularize if root_name)

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.9.2"
+  VERSION = "0.9.3.pre1"
 end

data/test/engine_test.rb

@@ -99,6 +99,15 @@ context "Rabl::Engine" do
         template.render(scope)
       end.equals "{\"person\":{}}"
 
+      asserts "that it can set root node with a nil object and explicit name" do
+        template = rabl %q{
+          object @user => :person
+        }
+        scope = Object.new
+        scope.instance_variable_set :@user, nil
+        template.render(scope)
+      end.equals "{\"person\":{}}"
+
       asserts "that it can use non-ORM objects" do
         template = rabl %q{
           object @other
@@ -433,6 +442,16 @@ context "Rabl::Engine" do
         scope.instance_variable_set :@user, User.new
         template.render(scope)
       end.equals "{}"
+
+      asserts "that it can set root node with a nil object and explicit name" do
+        template = rabl %q{
+          object @user => :person
+          attributes :name
+        }
+        scope = Object.new
+        scope.instance_variable_set :@user, nil
+        template.render(scope)
+      end.equals "{}"
     end
 
     context "#collection" do

data/test/helpers_test.rb

@@ -12,6 +12,28 @@ context "Rabl::Helpers" do
     @user = User.new
   end
 
+  # determine_object_root(@user, :user, true) => "user"
+  # determine_object_root(@user, :person) => "person"
+  # determine_object_root([@user, @user]) => "user"
+  # def determine_object_root(data_token, data_name=nil, include_root=true)
+  context "for determine_object_root method" do
+    asserts "returns nil if include_root is false" do
+      @helper_class.determine_object_root(@user, :user, false)
+    end.equals(nil)
+
+    asserts "returns user root name if include_root is true" do
+      @helper_class.determine_object_root(@user, :user, true)
+    end.equals("user")
+
+    asserts "returns explicit alias if specified" do
+      @helper_class.determine_object_root(@user, :person)
+    end.equals("person")
+
+    asserts "returns explicit alias if object is nil" do
+      @helper_class.determine_object_root(nil, :person)
+    end.equals("person")
+  end
+
   context "for data_name method" do
     asserts "returns nil if no data" do
       @helper_class.data_name(nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3.pre1
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -461,9 +461,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rabl
 rubygems_version: 2.0.7