rabl-rails 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de487a654a879918209db30bfb6d384b26e8bc0e
-  data.tar.gz: 54e73001a009a25491238d246da5e0a09b79d66f
+  metadata.gz: 3ecb1329a32490a735d1554c309c4d22b7a4eecf
+  data.tar.gz: 19958bd42ebd7ef7ff2e3f6d961c034c9409f17d
 SHA512:
-  metadata.gz: 21fdf8c8e8f80b1d6807dc0f082e3db64b29c24329010c63f4979245bbe10752c8122f527728311113befde3f766a2e981639473d879d7888d584e53dc70a24c
-  data.tar.gz: 26511a368b88f055e7c9f8a63253239be920714f1d19740ac82cc060899f5aa8686fbf51062be76c1c8819d8ac7139350809a76f5c2e09b83718c7e8ba37220a
+  metadata.gz: 981a64007d589ba27a1b2ce4f85cd63763dc6335fc9d96ddd5df71178002c3648a44f6cbff7a0d7ad4fc1639b478278263898829f940ee002a645099c45ef3c3
+  data.tar.gz: ab7d0fd23fe2fcce56ac0ad149629e89d2125e3ee55f8fa0e97e0fda435012f728a73c63cdf0c156913eefa1d8a82fbe3cd0b030c83238d04cf4ca9a5ee9ee0d

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.5.1
+  * Fix bug when trying to compile partials with caching enabled 
+
 ## 0.5.0
   * Add requirement ruby >= 2.2
   * Drop support for Rails < 4.2

data/lib/rabl-rails/library.rb

@@ -1,5 +1,5 @@
 require 'singleton'
-require 'concurrent/map'
+require 'monitor'
 
 module RablRails
   class Library
@@ -15,11 +15,12 @@ module RablRails
     }.freeze
 
     def initialize
-      @cached_templates = Concurrent::Map.new
+      @cached_templates = {}
+      @monitor = Monitor.new
     end
 
     def reset_cache!
-      @cached_templates = Concurrent::Map.new
+      @cached_templates = {}
     end
 
     def get_rendered_template(source, view, locals = nil)
@@ -50,9 +51,14 @@ module RablRails
     private
 
     def synchronized_compile(path, source, view)
-      @cached_templates.compute_if_absent(path) do
-        source ||= fetch_source(path, view)
-        compile(source, view)
+      @cached_templates[path] || @monitor.synchronize do
+        # Any thread holding this lock will be compiling the template needed
+        # by the threads waiting. So re-check the template presence to avoid
+        # re-compilation
+        @cached_templates.fetch(path) do
+          source ||= fetch_source(path, view)
+          @cached_templates[path] = compile(source, view)
+        end
       end
     end
 

data/lib/rabl-rails/version.rb

@@ -1,3 +1,3 @@
 module RablRails
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/test/test_library.rb

@@ -68,6 +68,17 @@ class TestLibrary < Minitest::Test
 
         assert_empty @library.cached_templates
       end
+
+      it 'caches multiple templates in one compilation' do
+        @context.virtual_path = 'users/show'
+        with_configuration :cache_templates, true do
+          @library.stub :fetch_source, 'attributes :id' do
+            @library.compile_template_from_source("child(:account, partial: 'users/_account')", @context)
+          end
+        end
+
+        assert_equal 2, @library.cached_templates.size
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Christopher Cocchi-Perrier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Fast Rails 4+ templating system with JSON, XML and PList support