tzispa_rig 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708d90bb94a81f1397c06164861b26975526e3ef
-  data.tar.gz: 57f5d6f6f9d76deac46e8290450d317f695c7746
+  metadata.gz: 1b1464a9fd319fa56702a54567f45ff6a0d00275
+  data.tar.gz: 969265c272c7eee232fcbfd4c5f224db95419362
 SHA512:
-  metadata.gz: c141e157fb0cd26f877c63c9ad08558456e4186dabac95fa97beb947ed7cecbf7933c0645f2f13805265d15b8b236ec5b2e386b8ede161cb9afff78d96d6d542
-  data.tar.gz: cc85b3bb9a08de8cc34397ce0bf138ed9e9e9339c9ec1676ecfc9a9a7e55b12876ecdb735bea5c97e8e677fd1d22fb9586fe840f9c59668455d3ea84efd5d3cc
+  metadata.gz: 2a4391839a2537d75c974374b292c4b952285f8c64ca0312f149d59a5a5e90c177a5a1e0d93fbf382c0b698998cf073007d54f4b47736b510b8b5cc4bb6d61f7
+  data.tar.gz: c5c030ed0ee930be9ddeadc8ad1613d6011d574041fbac399553ed12c8a2cba61410f8a2ef0c1786bcbff0bfee70875a2efd37aba01dd18d6fa7d14704b9898d

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Tzispa Rig
 
 Rig templates implementation
 
+## 0.3.1
+- Fix error in engine template cache that was losing template params when a template was recovered form cache
+
 ## 0.3.0
 - Separate engine class into independant ruby file
 - Move rig url builder tags into independant parser category

data/lib/tzispa/rig/engine.rb

@@ -31,9 +31,13 @@ module Tzispa
 
       def rig_template(name, type, tpl_format, params, parent)
         if @cache
-          @mutex.owned? ?
-            cache_template(name, type, tpl_format, params, parent) :
-            @mutex.synchronize { cache_template(name, type, tpl_format, params, parent)  }
+          if @mutex.owned?
+            cache_template(name, type, tpl_format, parent, params)
+          else
+            @mutex.synchronize {
+              cache_template(name, type, tpl_format, parent, params)
+            }
+          end
         else
           Template.new(name: name, type: type, format: format, domain: @app.domain, params: params, parent: parent, engine: self).load!.parse!
         end
@@ -41,16 +45,19 @@ module Tzispa
 
       private
 
-      def cache_template(name, type, tpl_format, params, parent)
+      def cache_template(name, type, tpl_format, parent, params)
         ktpl = "#{type}__#{name}".to_sym
         tpl = @cache.getset(ktpl) {
-          Template.new(name: name, type: type, format: tpl_format, domain: @app.domain, params: params, parent: parent, engine: self).load!.parse!
+          Template.new(name: name, type: type, format: tpl_format, domain: @app.domain, parent: parent, engine: self).load!.parse!
         }
         if tpl.modified?
           @cache[ktpl] = tpl.load!.parse!
         else
           tpl
         end
+        tpl.dup.tap { |ctpl|
+           ctpl.params = params if params
+         }
       end
 
     end

data/lib/tzispa/rig/syntax.rb

@@ -15,7 +15,7 @@ module Tzispa
         :purl => /<purl:(\w+(?:\.\w+)?)(\[(\w+=[^,\]]+(,\w+=[^,\]]+)*?)\])?\/>/,
         :url  => /<url:(\w+(?:\.\w+)?)(\[(\w+=[^,\]]+(,\w+=[^,\]]+)*?)\])?\/>/,
         :api  => /<api:([^:\.]+(?:\.[^:]+)?):([^:\/]+)(?::([^:\/]+))?(?::([^\/]+))?\/>/
-      }
+      }.freeze
 
       RIG_STATEMENTS = /(<(loop):(\w+)>(.*?)<\/loop:\3>)|(<(ife):(\w+)>(.*?)(<else:\7\/>(.*?))?<\/ife:\7>)/m
 

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
     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.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_helpers