tzispa_rig 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62efcbc321bef1e276d8e04f3dd501f2712d6b52
-  data.tar.gz: 2715eafd2def915b871b299e3cd6e144f57db9b0
+  metadata.gz: 6afaf56cd198b00340644368828a0727b3da7bb8
+  data.tar.gz: ebb745a0b564a73834c87b51d992c1db2726e818
 SHA512:
-  metadata.gz: 0447145dd8b91ab63e87543aa25d3705fa510dd24e9ede55751762046d944ec7844458279143dcd15384c5c259a54c8eb618dac791a64fa4d19897c0b65eb8ec
-  data.tar.gz: 28c9ca6fee70a0e689a9f6d42f95cd4abf948c4d02dec31396631ef19b2f05286a56f7b79d26df42ccd82720ba374ef0889fe683bf6aa60255f2b7481e3af8ec
+  metadata.gz: 6c702cc00b5efcc7850ee465003c147b87790c13b30b0ed84f1d53254cf97a16544e3bdb3dd41de9b8545faa15c7fb40e92244690fcd3c4dd9c3778e205b0549
+  data.tar.gz: c4b39a521c21fc2ba7e6fba446d079ed207555d76e407f16523c6a831cf1c6f95f07867ff6f0262890c64ee41b18aaaf64032f6ba8b6786085ee9d6ee667ea34

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Tzispa Rig
 
 Rig templates implementation
 
+## v0.2.9
+- Fix bugs in template cache engine causing modified template files are not reloading
+- Replaces Tzispa::Utils::Cache with lru_redex gem
+
 ## v0.2.7
 - Add url template tag to build canonical urls
 

data/lib/tzispa/rig/engine.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'tzispa/rig'
+require 'lru_redux'
+
+
+module Tzispa
+  module Rig
+
+    class Engine
+
+      attr_reader :app
+
+      def initialize(app, cache_enabled, cache_size)
+        @app = app
+        @cache = LruRedux::Cache.new(cache_size) if cache_enabled
+        @mutex = Mutex.new
+      end
+
+      def layout(name:, format:nil, params:nil)
+        rig_template name, :layout, format, params, nil
+      end
+
+      def block(name:, format:nil, params:nil, parent:nil)
+        rig_template name, :block, format, params, parent
+      end
+
+      def static(name:, format:nil, params:nil, parent:nil)
+        rig_template name, :static, format, params, parent
+      end
+
+      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
+        else
+          Template.new(name: name, type: type, format: format, domain: @app.domain, params: params, parent: parent, engine: self).load!.parse!
+        end
+      end
+
+      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, params: params, parent: parent, engine: self).load!.parse!
+        }
+        if tpl.modified?
+          @cache[ktpl] = tpl.load!.parse!
+        else
+          tpl
+        end
+      end
+
+    end
+
+  end
+end

data/lib/tzispa/rig/parsernext.rb

@@ -245,6 +245,7 @@ module Tzispa
 
       def parse!
         @parsed_block = template.engine.block name: @id, parent: template
+        template.childrens << @parsed_block
         self
       end
 
@@ -277,6 +278,8 @@ module Tzispa
       def parse!
         @block_then = template.engine.block name: @id_then, parent: template
         @block_else = template.engine.block name: @id_else, parent: template
+        template.childrens << @block_then
+        template.childrens << @block_else
         self
       end
 
@@ -314,6 +317,7 @@ module Tzispa
 
       def parse!
         @parsed_static = template.engine.static name: @id, parent: template
+        template.childrens << @parsed_static
         self
       end
 

data/lib/tzispa/rig/template.rb

@@ -4,7 +4,6 @@ require 'forwardable'
 require 'fileutils'
 require 'tzispa/utils/string'
 require 'tzispa/utils/indenter'
-require 'tzispa/utils/cache'
 require 'tzispa/rig'
 
 module Tzispa
@@ -68,7 +67,7 @@ module Tzispa
       DEFAULT_FORMAT = 'htm'.freeze
       RIG_EXTENSION  = 'rig'.freeze
 
-      attr_reader :name, :type, :domain, :format, :params, :parser, :engine, :subdomain
+      attr_reader :name, :type, :domain, :format, :params, :parser, :engine, :subdomain, :childrens
       def_delegators :@parser, :attribute_tags
 
       def initialize(name:, type:, domain: nil, parent: nil, format: nil, params: nil, engine: nil)
@@ -76,6 +75,7 @@ module Tzispa
         @subdomain = subdom_name.first if subdom_name.length > 1
         @name = subdom_name.last
         @params = Parameters.new(params)
+        @childrens = Array.new
         send('type=', type)
         if parent
           @engine = engine || parent.engine
@@ -95,6 +95,12 @@ module Tzispa
         self
       end
 
+      def modified?
+        super || (childrens.count > 0 && childrens.index { |tpl|
+          tpl.modified?
+        })
+      end
+
       def render(context)
         parse! unless @parser
         binder = TemplateBinder.for self, context
@@ -188,48 +194,5 @@ module Tzispa
     end
 
 
-    class Engine
-
-      attr_reader :app
-
-      def initialize(app, cache_enabled, cache_size)
-        @app = app
-        @cache = Tzispa::Utils::LRUCache.new(cache_size) if cache_enabled
-        @mutex = Mutex.new
-      end
-
-      def layout(name:, format:nil, params:nil)
-        rig_template name, :layout, format, params, nil
-      end
-
-      def block(name:, format:nil, params:nil, parent:nil)
-        rig_template name, :block, format, params, parent
-      end
-
-      def static(name:, format:nil, params:nil, parent:nil)
-        rig_template name, :static, format, params, parent
-      end
-
-      def rig_template(name, type, format, params, parent)
-        if @cache
-          #todo: a modified template file not reloading if the container template isn't modified too
-          ktpl = "#{type}__#{name}".to_sym
-          if @mutex.owned?
-            tpl = @cache[ktpl] || Template.new(name: name, type: type, format: format, domain: @app.domain, params: params, parent: parent, engine: self)
-            @cache[ktpl] = tpl.loaded? && !tpl.modified? ? tpl : tpl.load!.parse!
-          else
-            @mutex.synchronize {
-              tpl = @cache[ktpl] || Template.new(name: name, type: type, format: format, domain: @app.domain, params: params, parent: parent, engine: self)
-              @cache[ktpl] = tpl.loaded? && !tpl.modified? ? tpl : tpl.load!.parse!
-            }
-          end
-        else
-          tpl = Template.new(name: name, type: type, format: format, domain: @app.domain, params: params, parent: parent, engine: self)
-          tpl.load!.parse!
-        end
-      end
-
-    end
-
   end
 end

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.2.8'
+    VERSION = '0.2.9'
     GEM_NAME = 'tzispa_rig'
 
   end

data/lib/tzispa/rig.rb

@@ -1,11 +1,12 @@
 module Tzispa
   module Rig
-
+    
+    require 'tzispa/rig/version'
     require 'tzispa/rig/parameters'
+    require 'tzispa/rig/parsernext'
     require 'tzispa/rig/binder'
     require 'tzispa/rig/template'
-    require 'tzispa/rig/parsernext'
-    require 'tzispa/rig/version'
+    require 'tzispa/rig/engine'
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_rig
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_helpers
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: lru_redux
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: General purpose template engine
 email:
 - japinero@area-integral.com
@@ -49,6 +63,7 @@ files:
 - README.md
 - lib/tzispa/rig.rb
 - lib/tzispa/rig/binder.rb
+- lib/tzispa/rig/engine.rb
 - lib/tzispa/rig/parameters.rb
 - lib/tzispa/rig/parser.rb
 - lib/tzispa/rig/parsernext.rb