rabl 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e537c7beaab5536e66f93405989bf5cee8eb01c
-  data.tar.gz: ba40dd0c56d79991be8348f316012fe7d0642653
+  metadata.gz: 852d10093718c0d837774cbb5503b64cd7474305
+  data.tar.gz: 39d7b1d6c51be9b181431d127b8e19456bcda4a3
 SHA512:
-  metadata.gz: 9120f78fa8c6c01522b56df715e95fa5fdf23851f0d6ce485a797c43a82d182b9141fa5bbd58884a484dce88619bc591e4d3ea9a25d41df5b184b84aa58671e5
-  data.tar.gz: 7b8cae3fed1ef957e4ef39b6b4af16366e4444eb2d591a8bb1320426cabf4af16d3beda7344600efa53abd8929ab54989602e8a25326fcc75a379bb0419a5432
+  metadata.gz: 46aaee2c97be7740ec16880d9fa59fec495cc136e11854a9685137e593c06c8325e3fd4e9a07e929fe0d2c3b22b1aa8ab6a8319c90048f8882474779316d380f
+  data.tar.gz: a574e74f6489c8bbb40ce57c1d6ad8738d1d634f9fe9bc793eabf5a0dea6421329ad94a0f1ff22927ba6b31c69bb9499c087ba7eef12457627717fe7a100277f

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2
 gemfile: Gemfile.ci
 notifications:
   recipients:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.11.6 (January 26th)
+
+* Fix resolve_condition and simplify call_condition_proc (@vmeyet)
+* Respect eagerly loaded collections by not always calling #to_ary (@DouweM)
+* Move creation of options and engine in tilt template to avoid threading issues (@jseriff)
+
 ## 0.11.5 (December 5th)
 
 * Check if context_scope includes ".settings.views" for Sinatra (@LTe)

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rabl.gemspec
 gemspec
 
-gem 'rake', :require => false
 gem 'i18n', '~> 0.6'
 
 platforms :mri_18 do
@@ -12,7 +11,7 @@ platforms :mri_18 do
 end
 
 group :test do
-  # RABL TEST  
+  # RABL TEST
   gem 'builder'
 
   # FIXTURES

data/fixtures/rails4/Gemfile

@@ -46,4 +46,4 @@ gem 'jquery-rails'
 # gem 'capistrano', group: :development
 
 # Use debugger
-gem 'debugger', group: [:development, :test]
+gem 'byebug', group: [:development, :test]

data/lib/rabl/builder.rb

@@ -45,7 +45,7 @@ module Rabl
       @_object = object           if object
       @options.merge!(options)    if options
       @settings.merge!(settings)  if settings
-      
+
       cache_results do
         @_result = {}
 
@@ -196,37 +196,23 @@ module Rabl
         engines << partial_as_engine(file, options, &block)
       end
 
-      # Evaluate conditions given a symbol to evaluate
-      def call_condition_proc(condition, object, &block)
-        block = lambda { |v| v } unless block_given?
-
-        if condition.respond_to?(:call)
-          # condition is a block to pass to the block
-          block.call(condition.call(object))
-        elsif condition.is_a?(Symbol) && object.respond_to?(condition)
-          # condition is a property of the object
-          block.call(object.send(condition))
-        else
-          false
-        end
+      # Evaluate conditions given a symbol/proc/lambda/variable to evaluate
+      def call_condition_proc(condition, object)
+        # This will evaluate lambda, proc & symbol and call it with 1 argument
+        return condition.to_proc.call(object) if condition.respond_to?(:to_proc)
+        # Else we send directly the object
+        condition
       end
 
       # resolve_condition(:if => true) => true
+      # resolve_condition(:if => 'Im truthy') => true
       # resolve_condition(:if => lambda { |m| false }) => false
-      # resolve_condition(:unless => lambda { |m| true }) => true
+      # resolve_condition(:unless => lambda { |m| false }) => true
+      # resolve_condition(:unless => lambda { |m| false }, :if => proc { true}) => true
       def resolve_condition(options)
-        return true if options[:if].nil? && options[:unless].nil?
-
-        result = nil
-        if options.has_key?(:if)
-          result = options[:if] == true || call_condition_proc(options[:if], @_object)
-        end
-
-        if options.has_key?(:unless)
-          inverse_proc = lambda { |r| !r }
-          result = options[:unless] == false || call_condition_proc(options[:unless], @_object, &inverse_proc)
-        end
-
+        result = true
+        result &&= call_condition_proc(options[:if], @_object) if options.key?(:if)
+        result &&= !call_condition_proc(options[:unless], @_object) if options.key?(:unless)
         result
       end
 

data/lib/rabl/engine.rb

@@ -163,9 +163,11 @@ module Rabl
     def object(template_data)
       current_data  = (@_locals[:object].nil? || template_data == false) ? template_data : @_locals[:object]
       @_data_object = data_object(current_data)
-      @_data_name   = data_name(template_data.is_a?(Hash) && !current_data.is_a?(Hash) ? template_data : current_data)
+      @_root_name_data = template_data.is_a?(Hash) && !current_data.is_a?(Hash) ? template_data : current_data
+      @_root_name_data = @_root_name_data.values.first if @_root_name_data.is_a?(Hash)
 
-      if @_data_name == false
+      # If we turn this around, `@_root_name_date ==` may trigger data to be loaded unnecessarily.
+      if false == @_root_name_data
         @_object_root_name = false
         @_collection_name = false
       end
@@ -185,7 +187,7 @@ module Rabl
       return @_data_name if defined?(@_data_name)
 
       @_data_name = @_options[:object_root_name] || begin
-        data = @_locals[:object].nil? ? root_object : @_locals[:object]
+        data = defined?(@_root_name_data) ? @_root_name_data : (@_locals[:object].nil? ? root_object : @_locals[:object])
         data_name(data)
       end
     end
@@ -201,7 +203,7 @@ module Rabl
 
       @_object_root_name = options[:object_root] if options.has_key?(:object_root)
 
-      object(Array(data_object(data)))
+      object(data_object(data) || [])
     end
 
     # Sets the cache key to be used by ActiveSupport::Cache.expand_cache_key

data/lib/rabl/helpers.rb

@@ -35,7 +35,8 @@ module Rabl
       data = data_object(data_token)
 
       if is_collection?(data) # data is a collection
-        object_name = data.table_name if data.respond_to?(:table_name)
+        object_name = collection_root_name if collection_root_name
+        object_name ||= data.table_name if data.respond_to?(:table_name)
 
         if object_name.nil? && data.respond_to?(:first)
           first = data.first

data/lib/rabl/template.rb

@@ -7,12 +7,12 @@ if defined?(Tilt)
     end
 
     def prepare
-      options = @options.merge(:format => @options[:format], :source_location => file)
-      @engine = ::Rabl::Engine.new(data, options)
+      #left empty so each invocation has a new hash of options and new rabl engine for thread safety
     end
 
     def evaluate(context_scope, locals, &block)
-      @engine.apply(context_scope, locals, &block).render
+      options = @options.merge(:source_location => file)
+      ::Rabl::Engine.new(data, options).apply(context_scope, locals, &block).render
     end
   end
 

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.11.5"
+  VERSION = "0.11.6"
 end

data/test/builder_test.rb

@@ -299,9 +299,59 @@ context "Rabl::Builder" do
       scope.send :resolve_condition, { :unless => :cool? }
     end.equals(true)
 
-    asserts "that it can use symbols as unmless condition and return false if method returns true" do
+    asserts "that it can use symbols as unless condition and return false if method returns true" do
       scope = Rabl::Builder.new(ArbObj.new)
       scope.send :resolve_condition, { :unless => :smooth? }
     end.equals(false)
+
+    asserts "that it can use :unless and :if at the same time and return true when if is true and unless is false" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send :resolve_condition, { :if => true, :unless => false }
+    end.equals(true)
+
+    asserts "that it can use :unless and :if at the same time and return false when if is false and unless is false" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send :resolve_condition, { :if => false, :unless => false }
+    end.equals(false)
+
+    asserts "that it can use :unless and :if at the same time and return false when if is true and unless is true" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send :resolve_condition, { :if => true, :unless => true }
+    end.equals(false)
+
+    asserts "that it can use :unless and :if at the same time and return false when if is false and unless is true" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send :resolve_condition, { :if => false, :unless => true }
+    end.equals(false)
+
+    asserts "that it can use lambda on if condition and return false if lambda returns false" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send(:resolve_condition, { :if => lambda { |obj| false } })
+    end.equals(false)
+
+    asserts "that it can use lambda on if condition and return true if lambda returns true" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send(:resolve_condition, { :if => lambda { |obj| true } })
+    end.equals(true)
+
+    asserts "that it can use proc on if condition and return false if proc returns false" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send(:resolve_condition, { :if => proc { false } })
+    end.equals(false)
+
+    asserts "that it can use proc on if condition and return true if proc returns true" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send(:resolve_condition, { :if => proc { true } })
+    end.equals(true)
+
+    asserts "that it can use a variable on if condition and return true if variable is truthy" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send(:resolve_condition, { :if => 'Im truthy' })
+    end.equals('Im truthy')
+
+    asserts "that it can use a variable on if condition and return false if variable is falsy" do
+      scope = Rabl::Builder.new(ArbObj.new)
+      scope.send(:resolve_condition, { :if => nil })
+    end.equals(nil)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport