tzispa_rig 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47caf9d29bcf57c26262b3cbde5513060b677f23
-  data.tar.gz: cc3036e2437a2eadcdda3a6c0c2ef3fc5c97279b
+  metadata.gz: 34c29a6d0cb71518ba08bf0c7c3274ac6a1cad35
+  data.tar.gz: 23a5a9a18a5d22e871a51b5085d730b47f4676ff
 SHA512:
-  metadata.gz: 2a773cca4ef477089298ec6b70856303429869bfcae2412a058cbd257fdc37a25e87521c5ba1b052706d9477653bfd419ece1d2f6fecfcd244b34a34034f23d1
-  data.tar.gz: f80a648340d0a6a06c76d700956e6de301f8fa3d80e73e911dcfb0b6d46adcafb4f76d265b4f427f449565b5d9fd3f440a4adae3ecb0a098e172b49944f711e9
+  metadata.gz: 2780edabd2cbf6d049860a10eb04363c094a9b851a5ec95fd3b394cb34389b483cb4613418f7430bc791f942c9b3d55143d73853cd985402207be25e5deceb59
+  data.tar.gz: 8bbffe98a3a17c8a33d646980bc95f1ce3e7828f8779d323230c95b51d1897b335b3b5c2b67c5fc18b525085f94770ea0778b8c6def762b34028df2e88d71914

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Tzispa Rig
 
 Rig templates implementation
 
+## 0.3.4
+- fix template cache returning empty template sometimes
+
 ## 0.3.3
 - Raise a custom exception when a binder tag does not exists in the template
 - Raise custom exception when there are duplicated loops in binder

data/lib/tzispa/rig/engine.rb

@@ -13,8 +13,7 @@ module Tzispa
 
       def initialize(app, cache_enabled, cache_size)
         @app = app
-        @cache = LruRedux::Cache.new(cache_size) if cache_enabled
-        @mutex = Mutex.new
+        @cache = LruRedux::ThreadSafeCache.new(cache_size) if cache_enabled
       end
 
       def layout(name:, format:nil, params:nil)
@@ -31,13 +30,7 @@ module Tzispa
 
       def rig_template(name, type, tpl_format, params, parent)
         if @cache
-          if @mutex.owned?
-            cache_template(name, type, tpl_format, params, parent)
-          else
-            @mutex.synchronize {
-              cache_template(name, type, tpl_format, params, parent)
-            }
-          end
+          cache_template(name, type, tpl_format, params, parent)
         else
           Template.new(name: name, type: type, format: tpl_format, domain: @app.domain, params: params, parent: parent, engine: self).load!.parse!
         end
@@ -46,18 +39,25 @@ module Tzispa
       private
 
       def cache_template(name, type, tpl_format, params, parent)
-        ktpl = "#{type}__#{name}".to_sym
-        tpl = @cache.getset(ktpl) {
-          Template.new(name: name, type: type, format: tpl_format, domain: @app.domain, parent: parent, engine: self).load!.parse!
-        }
-        if tpl.modified?
-          tpl = @cache[ktpl] = Template.new(name: name, type: type, format: tpl_format, domain: @app.domain, parent: parent, engine: self).load!.parse!
-        end
-        tpl.dup.tap { |ctpl|
+        key = "#{type}__#{name}".to_sym
+        (get_template(key, name, type, tpl_format, parent) || set_template(key, name, type, tpl_format, parent)).dup.tap { |ctpl|
            ctpl.params = params if params
          }
       end
 
+      def get_template(key, name, type, tpl_format, parent)
+        if @cache.key?(key) && (@cache[key].modified? || !@cache[key].valid?)
+          set_template(key, name, type, tpl_format, parent)
+        else
+          @cache[key]
+        end
+      end
+
+
+      def set_template(key, name, type, tpl_format, parent)
+        @cache[key] = Template.new(name: name, type: type, format: tpl_format, domain: @app.domain, parent: parent, engine: self).load!.parse!
+      end
+
     end
 
   end

data/lib/tzispa/rig/parsernext.rb

@@ -349,6 +349,10 @@ module Tzispa
         @the_parsed = Array.new
       end
 
+      def empty?
+        @the_parsed.empty?
+      end
+
       def parse!
         @tags = nil
         parse_flags

data/lib/tzispa/rig/template.rb

@@ -101,6 +101,10 @@ module Tzispa
         })
       end
 
+      def valid?
+        !content.empty? && !parser.empty?
+      end
+
       def render(context)
         parse! unless @parser
         binder = TemplateBinder.for self, context

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
     GEM_NAME = 'tzispa_rig'
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_rig
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_helpers