tzispa_rig 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b1464a9fd319fa56702a54567f45ff6a0d00275
-  data.tar.gz: 969265c272c7eee232fcbfd4c5f224db95419362
+  metadata.gz: facbd14f4e528f79d4860a11db426c6b31e748b1
+  data.tar.gz: ce92598b9f554bc0f6d6d3aba9e8500aabd15fe6
 SHA512:
-  metadata.gz: 2a4391839a2537d75c974374b292c4b952285f8c64ca0312f149d59a5a5e90c177a5a1e0d93fbf382c0b698998cf073007d54f4b47736b510b8b5cc4bb6d61f7
-  data.tar.gz: c5c030ed0ee930be9ddeadc8ad1613d6011d574041fbac399553ed12c8a2cba61410f8a2ef0c1786bcbff0bfee70875a2efd37aba01dd18d6fa7d14704b9898d
+  metadata.gz: 6b8b5e8cac668248500ef5010fab8a271c7a09e869ef9c39479706456115ed82ffbbce2ab5aed3cbbc62b5e68f21514e382a2cfa39f3d803e56afa6990b07c97
+  data.tar.gz: 9293bc6aeba603f6ef05c35dafe9a0b96ca512f13442fc2f8e98160ed686459e23273d67f93df955fb62a3d8511d0b3ee0ec552ebc48af0faf8e688b3f66110a

data/CHANGELOG.md

@@ -2,8 +2,11 @@ Tzispa Rig
 
 Rig templates implementation
 
+## 0.3.2
+- Fix error bad format parameter when engine template cache is disabled
+
 ## 0.3.1
-- Fix error in engine template cache that was losing template params when a template was recovered form cache
+- Fix error in engine template cache that was losing template params when a template was recovered from cache
 
 ## 0.3.0
 - Separate engine class into independant ruby file

data/lib/tzispa/rig/engine.rb

@@ -32,28 +32,26 @@ module Tzispa
       def rig_template(name, type, tpl_format, params, parent)
         if @cache
           if @mutex.owned?
-            cache_template(name, type, tpl_format, parent, params)
+            cache_template(name, type, tpl_format, params, parent)
           else
             @mutex.synchronize {
-              cache_template(name, type, tpl_format, parent, params)
+              cache_template(name, type, tpl_format, params, parent)
             }
           end
         else
-          Template.new(name: name, type: type, format: format, domain: @app.domain, params: params, parent: parent, engine: self).load!.parse!
+          Template.new(name: name, type: type, format: tpl_format, domain: @app.domain, params: params, parent: parent, engine: self).load!.parse!
         end
       end
 
       private
 
-      def cache_template(name, type, tpl_format, parent, params)
+      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?
-          @cache[ktpl] = tpl.load!.parse!
-        else
-          tpl
+          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|
            ctpl.params = params if params

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
     GEM_NAME = 'tzispa_rig'
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_rig
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Juan Antonio Piñero