rabl 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0f39e37962add4e967db96ddb7970e8b5567180494024c83ab1cd0f40b215789
-  data.tar.gz: f61f64c38bb2baf81ce33885feb2fb7a9fc3a9e3587a8767f08d29cacb88a455
+SHA1:
+  metadata.gz: 3278a66ba6ca1b6bbbba630f618972311efa3ffa
+  data.tar.gz: 8b01a9837edb00add1cc9ba51a4fbd81c5b0cd15
 SHA512:
-  metadata.gz: fffcd3104d9a52f11ea39205040858112b12199df5062ad7e3bce56d5ef12f02c97718974bb11765cc2afbde585a8190d0aa93630e655b588d76d66a503854f2
-  data.tar.gz: 8a780a5d5dc6ca50da1183a71d2292bee13be1abbaffa8f7c7972854c009265c32543710a8879f8de1cbc1d7186cfd48b5d2528907e184a918832b07675f6d50
+  metadata.gz: 6b7e34e9c1f6b7ee7f5660147805671bf6ee54252be2199cd7cecf5f78ce4b3ff876884fe072bb2b1633288542e5e9cc8db79990b139086bb718b2ee4eb483da
+  data.tar.gz: 735b6dc4e773a9ea3613aada27e2ee57afe987a5defd8c5260962ac690191b05fce69722765793d6858083910b685d4b9cde8eaaa5aaadbbd91cae235f15f995

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # CHANGELOG
 
-## 0.14.0 (October 31st, 2018)
+## 0.14.1 (April 28th, 2019)
 
-* Compatibility with Rails 5 API mode
+* Many adjustments and various non-breaking fixes
+* Improvements to caching (@zenspider)
+* Fix tests for Rails 5 (@robertoz)
 
 ## 0.13.1 (October 21st, 2016)
 

data/CONTRIBUTING.md

@@ -3,7 +3,7 @@ We love pull requests. Here's a quick guide:
 1. Fork the repo.
 
 2. Run the tests. We only take pull requests with passing tests, and it's great
-to know that you have a clean slate: `bundle && rake test`
+to know that you have a clean slate: `bundle && bundle exec rake test`
 
 3. Add a test for your change. Only refactoring and documentation changes
 require no new tests. If you are adding functionality or fixing a bug, we need
@@ -34,4 +34,4 @@ Syntax:
 
 And in case we didn't emphasize it enough: we love tests!
 
-NOTE: Adapted from https://raw.github.com/thoughtbot/factory_girl_rails/master/CONTRIBUTING.md
+NOTE: Adapted from https://raw.github.com/thoughtbot/factory_girl_rails/master/CONTRIBUTING.md

data/Gemfile

@@ -21,6 +21,7 @@ group :test do
   gem 'sqlite3'
   gem 'sinatra', '>= 1.2.0'
   gem 'hashie'
+  gem 'riot'
 end
 
 group :development, :test do

data/lib/rabl/builder.rb

@@ -137,7 +137,10 @@ module Rabl
       # attribute :foo, :as => "bar"
       # attribute :foo, :as => "bar", :if => lambda { |m| m.foo }
       def attribute(name, options = {})
-        return unless @_object && attribute_present?(name) && resolve_condition(options)
+        return unless
+          @_object &&
+          attribute_present?(name) &&
+          resolve_condition(options)
 
         attribute = data_object_attribute(name)
         name = create_key(options[:as] || name)
@@ -200,10 +203,11 @@ module Rabl
 
       # 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.is_a?(Proc) || condition.is_a?(Symbol)
-        # Else we send directly the object
-        condition
+        case condition
+        when Proc   then condition.call(object)
+        when Symbol then condition.to_proc.call(object)
+        else             condition
+        end
       end
 
       # resolve_condition(:if => true) => true
@@ -213,8 +217,10 @@ module Rabl
       # resolve_condition(:unless => lambda { |m| false }, :if => proc { true}) => true
       def resolve_condition(options)
         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 &&=  call_condition_proc(options[:if], @_object)     if
+          options.key?(:if)
+        result &&= !call_condition_proc(options[:unless], @_object) if
+          options.key?(:unless)
         result
       end
 
@@ -222,13 +228,9 @@ module Rabl
       # Checks if an attribute is present. If not, check if the configuration specifies that this is an error
       # attribute_present?(created_at) => true
       def attribute_present?(name)
-        if @_object.respond_to?(name)
-          true
-        elsif Rabl.configuration.raise_on_missing_attribute
-          raise "Failed to render missing attribute #{name}"
-        else
-          false
-        end
+        @_object.respond_to?(name) ||
+          (Rabl.configuration.raise_on_missing_attribute &&
+           raise("Failed to render missing attribute #{name}"))
       end
 
       # Returns a guess at the format in this context_scope

data/lib/rabl/cache_engine.rb

@@ -5,8 +5,35 @@
 #     config.cache_engine = AdvancedCacheEngine.new
 #
 
+class LRU < Hash
+  attr_accessor :max_size
+
+  def initialize
+    super
+    self.max_size = 100_000
+  end
+
+  def []= k,v
+    r = super
+    limit_size
+    r
+  end
+
+  def limit_size
+    if size > max_size then
+      delete keys.shift while size > max_size
+    end
+  end
+end
+
 module Rabl
   class CacheEngine
+    def initialize
+      unless defined?(Rails)
+        @cache = LRU.new
+      end
+    end
+
 
     # Fetch given a key and options and a fallback block attempts to find the key in the cache
     # and stores the block result in there if no key is found.
@@ -17,13 +44,15 @@ module Rabl
       if defined?(Rails)
         Rails.cache.fetch(key, cache_options, &block)
       else
-        yield
+        @cache[key] ||= yield
       end
     end
 
     def write(key, value, options = {})
       if defined?(Rails)
         Rails.cache.write(key, value, options)
+      else
+        @cache[key] = yield
       end
     end
 

data/lib/rabl/engine.rb

@@ -60,7 +60,7 @@ module Rabl
         if digestor_available? && respond_to?(:lookup_context) && lookup_context
           template = @_options[:template] || @virtual_path
 
-          digest = \
+          digest =
             if Gem::Version.new(Rails.version) >= Gem::Version.new('4.1')
               Digestor.digest(:name => template, :finder => lookup_context)
             else
@@ -83,7 +83,7 @@ module Rabl
 
       options[:root_name] = determine_object_root(data, root_name, options[:root])
 
-      result = \
+      result =
         if is_object?(data) || !data # object @user
           Builder.new(data, @_settings, options).to_hash
         elsif is_collection?(data) # collection @users
@@ -167,6 +167,7 @@ module Rabl
       @_root_name_data = @_root_name_data.values.first if @_root_name_data.is_a?(Hash)
 
       # If we turn this around, `@_root_name_date ==` may trigger data to be loaded unnecessarily.
+      # TODO: is nil a different semantic? otherwise don't use `false ==`, use !
       if false == @_root_name_data
         @_object_root_name = false
         @_collection_name = false
@@ -409,15 +410,21 @@ module Rabl
       end
 
       def eval_source(locals, &block)
-        # Note: locals and block may be used by the eval'ed source
-
         return unless @_source.present?
 
-        if @_options[:source_location]
-          instance_eval(@_source, @_options[:source_location])
-        else
-          instance_eval(@_source)
+        msg = "cached_source_#{@_source.hash.abs}"
+
+        unless self.respond_to? msg then
+          src = "def #{msg} locals, &block\n#{@_source}\nend"
+
+          if @_options[:source_location]
+            self.class.class_eval(src, @_options[:source_location])
+          else
+            self.class.class_eval(src)
+          end
         end
+
+        send msg, locals, &block
       end
   end
 end

data/lib/rabl/helpers.rb

@@ -14,7 +14,9 @@ module Rabl
     # data_object_attribute(data) => @_object.send(data)
     def data_object_attribute(data)
       attribute = @_object.__send__(data)
-      attribute = attribute.as_json if is_collection?(attribute, false) && attribute.respond_to?(:as_json)
+      attribute = attribute.as_json if
+        is_collection?(attribute, false) &&
+        attribute.respond_to?(:as_json)
       attribute
     end
 
@@ -81,8 +83,10 @@ module Rabl
     # is_collection?([]) => true
     def is_collection?(obj, follow_symbols = true)
       data_obj = follow_symbols ? data_object(obj) : obj
-      data_obj && data_obj.respond_to?(:map) && data_obj.respond_to?(:each) &&
-        !(data_obj.is_a?(Struct) || defined?(Hashie::Mash) && data_obj.is_a?(Hashie::Mash))
+      data_obj &&
+        data_obj.is_a?(Enumerable) &&
+        !(data_obj.is_a?(Struct) ||
+          defined?(Hashie::Mash) && data_obj.is_a?(Hashie::Mash))
     end
 
     # Returns the context_scope wrapping this engine, used for retrieving data, invoking methods, etc

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.14.0"
+  VERSION = "0.14.1"
 end

data/test/silence.rb

@@ -3,6 +3,15 @@ module Kernel
     with_warnings(nil) { yield }
   end
 
+  def with_warnings(flag)
+    old_verbose, $VERBOSE = $VERBOSE, flag
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
+end unless Kernel.respond_to? :silence_warnings
+
+module Kernel
   def silence_stream(stream)
     old_stream = stream.dup
     stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
@@ -11,11 +20,4 @@ module Kernel
   ensure
     stream.reopen(old_stream)
   end
-
-  def with_warnings(flag)
-    old_verbose, $VERBOSE = $VERBOSE, flag
-    yield
-  ensure
-    $VERBOSE = old_verbose
-  end
-end unless Kernel.respond_to? :silence_warnings
+end unless Kernel.respond_to? :silence_stream

data/test/teststrap.rb

@@ -22,7 +22,12 @@ silence_warnings do
   require File.expand_path('../models/user', __FILE__)
 end
 
-Riot.pretty_dots
+if $stdout.tty? then
+  Riot.pretty_dots
+else
+  Riot.dots
+  Riot.plain!
+end
 
 class Riot::Situation
   def char_split(str)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -631,7 +631,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rabl
-rubygems_version: 2.7.7
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: General ruby templating with json, bson, xml and msgpack support