tzispa_rig 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3abd2ac7d760cd2cabf17104393e729d9a6c8684
-  data.tar.gz: c45a9e6387937ec48211955a0c4615012197984d
+  metadata.gz: 8c7fc4d4373f601d2153eb629fa2cbd150ce1f2c
+  data.tar.gz: 179daf386ee3851db47dfc3808667bd9dae5acfd
 SHA512:
-  metadata.gz: bf14d442886539737944870b6d9e7d8b1e667548c19d151848eda5f07d967f9924e12a6089aa095b014d26c226812fd135590bd790256d2bdf96febca5562aba
-  data.tar.gz: 920da35422db633d62f89ef19cc53456f2b95ce0124bc5303bca3ab1c7b76a4f451a8675f7e4fbd495a135633416ca43e69dc97c26cce31a79dec68b0eadf490
+  metadata.gz: 0b42740653389d7d04833dc5e90ccdfff3d6316ef35eb790fe748f928f0602ef29ea4ed2573b6ef2ec86954aea73e9a3ac92968210cd4f59bb6d7418cc4e5649
+  data.tar.gz: ffe72dfc14733a083980078d497cc1ca315935de5019a97d2b7e6a457931e635807a9d00b17e47035bc4a93d0f363ced286201c01abc992e258eac4afa87a733

data/CHANGELOG.md

@@ -2,6 +2,16 @@ Tzispa Rig
 
 Rig templates implementation
 
+## v0.5.0
+- Rig templates syntax changes in url/purl and blk/iblk/static
+- Added support for subdoamins in layouts
+- new rig engine interface now shared by all apps
+- added some testing with minitest
+- escape (by content type) var tags values before render
+- allow recursive template block calls
+- code refactoring & templates namespace simplification
+- rig-parser implementation improvements
+
 ## v0.4.5
 - code fixes for replacing TzString with String refinement
 

data/README.md

@@ -68,8 +68,8 @@ private
 attr_reader :idb
 
 def load_brand
-  brand = context.repository[:brand, :ecomm_shop][idb]
-  data(
+  brand = repository[:brand, :ecomm_shop][idb]
+  attach(
     idb: brand.id,
     name: brand.name,
     skey: brand.skey
@@ -111,7 +111,9 @@ In the binder you must define customer_exist
 def bind!
   idc = context.router_params[:id0]
   customer = context.repository[:customer, :ecomm_shop][idb]
-  data.customer_exist = !customer.nil?
+  attach(
+    customer_exist: !customer.nil?
+  )
 end
 
 ```
@@ -141,14 +143,16 @@ In the binder you must use the 'loop_binder' method
 ```ruby
 
 def bind!
-  data.lbrands = loop_binder(:lbrands).bind!(&load_brands)
+  attach(
+    lbrands: loop_binder(:lbrands).bind!(&load_brands)
+  )
 end
 
 private
 
 def load_brands
   Proc.new {
-    context.repository[:brand, :ecomm_shop].list.map { |b|
+    repository[:brand, :ecomm_shop].list.map { |b|
       loop_item(
         id: b.id,
         skey: b.skey,
@@ -262,7 +266,7 @@ You can also use template subdomains using dot notation in the name
        </div>
     </div>
   </div>
-  <static:footer/>
+  <blk:widget.footer/>
   <static:footscripts/>
 </body>
 </html>

data/Rakefile

@@ -0,0 +1,7 @@
+# file: Rakefile
+require 'rake/testtask'
+
+Rake::TestTask.new do |task|
+  task.libs << %w(test)
+  task.pattern = 'test/*_test.rb'
+end

data/lib/tzispa/rig/binder.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'forwardable'
-require 'tzispa/rig'
 
 module Tzispa
   module Rig
@@ -14,10 +13,11 @@ module Tzispa
     class Binder
       extend Forwardable
 
-      attr_reader :context, :data_struct, :tags, :parser
+      attr_reader :context, :data_struct, :parser
       def_delegators :@parser, :attribute_tags
-      def_delegators :@context, :app, :request, :response, :session, :router_params, :not_found
+      def_delegators :@context, :app, :request, :response, :session, :router_params, :cache
       def_delegators :app, :repository, :config, :logger
+      alias :tags :attribute_tags
 
 
       def initialize(parser, context)
@@ -26,8 +26,6 @@ module Tzispa
         @data_struct = attribute_tags.count > 0 ? Struct.new(*attribute_tags) : Struct.new(nil)
       end
 
-      alias :tags :attribute_tags
-
       # Gets a LoopBinder context for the given loop_id in a rig template
       #
       #       .... <var:myvar/> ...
@@ -54,6 +52,12 @@ module Tzispa
         LoopBinder.new loop_parser[0], @context
       end
 
+      def attr_cache(*attrs)
+        attrs.each { |attrib|
+          cache[attrib] = send(attrib) if respond_to?(attrib)
+        }
+      end
+
     end
 
 
@@ -69,8 +73,12 @@ module Tzispa
         @template = template
       end
 
-      def data(**params)
-        (@data ||= @data_struct.new).tap { |d|
+      def data
+        @data ||= @data_struct.new
+      end
+
+      def attach(**params)
+        data.tap { |d|
           params.each{ |k,v|
             raise UnknownTag.new "#{k} is not a tag in #{self.class.name}" unless tags.include? k
             d[k] = v

data/lib/tzispa/rig/engine.rb

@@ -1,61 +1,73 @@
 # frozen_string_literal: true
-
-require 'tzispa/rig'
+require 'singleton'
+require 'digest'
 require 'lru_redux'
-
+require 'tzispa/rig/template'
 
 module Tzispa
   module Rig
 
     class Engine
+      include Singleton
 
-      attr_reader :app
+      @@cache_size = 512
+      @@cache_ttl  = 600 # 10 mins
 
-      def initialize(app, cache_enabled, cache_size)
-        @app = app
-        @cache = LruRedux::ThreadSafeCache.new(cache_size) if cache_enabled
+      def initialize
+        @cache = LruRedux::TTL::ThreadSafeCache.new(@@cache_size, @@cache_ttl)
       end
 
-      def layout(name:, format:nil, params:nil)
-        rig_template name, :layout, format, params, nil
-      end
+      class << self
 
-      def block(name:, format:nil, params:nil, parent:nil)
-        rig_template name, :block, format, params, parent
-      end
+        def empty
+          TemplateBase.new
+        end
 
-      def static(name:, format:nil, params:nil, parent:nil)
-        rig_template name, :static, format, params, parent
-      end
+        def layout(name:, domain:, content_type:, params:nil)
+          rig_template name, domain, :layout, content_type, params
+        end
 
-      def rig_template(name, type, tpl_format, params, parent)
-        if @cache
-          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!
+        def block(name:, domain:, content_type:, params:nil)
+          rig_template name, domain, :block, content_type, params
+        end
+
+        def static(name:, domain:, content_type:, params:nil)
+          rig_template name, domain, :static, content_type, params
+        end
+
+        def rig_template(name, domain, block_type, content_type, params)
+          instance.send(:cache_template, name, domain, block_type, content_type, params)
+        end
+
+        def cache_size=(sz)
+          @@cache_size = sz
         end
+
+        def cache_ttl=(seconds)
+          @@cache_ttl = seconds
+        end
+
       end
 
       private
 
-      def cache_template(name, type, tpl_format, params, parent)
-        key = "#{type}__#{name}".to_sym
-        (get_template(key, name, type, tpl_format, parent) || set_template(key, name, type, tpl_format, parent)).dup.tap { |ctpl|
+      def cache_template(name, domain, block_type, content_type, params)
+        key = "#{domain}/#{block_type}/#{name}/#{content_type}".to_sym
+        get_template(key, name, domain, block_type, content_type).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)
+      def get_template(key, name, domain, block_type, content_type)
+        if !@cache.key?(key) || @cache.key?(key) && (@cache[key].modified? || !@cache[key].valid?)
+          set_template(key, name, domain, block_type, content_type)
         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!
+      def set_template(key, name, domain, block_type, content_type)
+        @cache[key] = Template.new(name: name, type: block_type, domain: domain, content_type: content_type).load!.parse!
       end
 
     end

data/lib/tzispa/rig/parameters.rb

@@ -14,16 +14,12 @@ module Tzispa
         setData(params) if params
       end
 
-      def set(key,value)
-        @data[key.to_sym] = value
-      end
-
-      def get(key)
+      def [](key)
         @data[key.to_sym]
       end
 
-      def [](key)
-        @data[key.to_sym]
+      def []=(key, value)
+        @data[key.to_sym] = value
       end
 
       def has?(key)
@@ -35,7 +31,7 @@ module Tzispa
       end
 
       def to_h
-        @data
+        @data.dup
       end
 
       alias_method :data, :to_h