tzispa_rig 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0ee09cd6bcb8f16477ec4472fe2442599db939d
-  data.tar.gz: a168edea1da7db3d372b37ca97bbbb58b6adb3ef
+  metadata.gz: fa5e5300f16c59b1d36a54cb61457d7f27d73db7
+  data.tar.gz: 6253800420d94b93692dee73102c8accdd9cafe5
 SHA512:
-  metadata.gz: 272a50312a02d4455a1701d12a27270fc01523ee03cd61c85fbd7609875671bbf5885f9c942f96b5f825e131174886cefcec3813e82db66b5a13bdf7a5f3c0d6
-  data.tar.gz: d67f6a12863368644c24a2988e223972ffe5ce6c20cfe0d7632369096f6f1e5d1865e469c6afc57a6e10dc532d0561c8668d8e3c3e0f4342c2339dcd08bd616a
+  metadata.gz: 21d4d0c0e55ffea5ef20a6cef84fb5e47e14ac8af437c87e6bdeef7fb042108c449dd21c8b765c988345c3af10066b242a3147aaac8dccf02dce5e1840a1fb13
+  data.tar.gz: dbc9b3e8095d7115fd33889892dd8963acf644db99394b72108953120a4f870d41c10eee72372e5a8fdd59c19e67638b2b3d817d3b1aa7b63e9a49796555b336

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Tzispa Rig
 
 Rig templates implementation
 
+## v0.5.2
+- replace lru_redux with moneta to improve template cache storage
+- added fallback to super in method_missing at LoopBinder
+- support for bind data from json
+
 ## v0.5.1
 - Bug fixes and code refactoring
 

data/README.md

@@ -1,6 +1,6 @@
 # Tzispa Rig
 
-A general purpose template engine
+Lego-block style general purpose template engine
 
 ## Installation
 

data/lib/tzispa/rig/binder.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'forwardable'
+require 'json'
+require 'tzispa/utils/hash'
 
 module Tzispa
   module Rig
@@ -88,6 +90,8 @@ module Tzispa
     class TemplateBinder < Binder
       extend Forwardable
 
+      using Tzispa::Utils::TzHash
+
       attr_reader :template
       def_delegators :@template, :params
 
@@ -100,15 +104,28 @@ module Tzispa
         @data ||= @data_struct.new
       end
 
-      def attach(**params)
+      def attach(json = nil, **params)
+        attach_json(json) if json
         data.tap do |d|
           params.each do |k, v|
             raise UnknownTag.new(self.class.name, k) unless tags.include? k
-            d[k] = v
+            d[k] = v.is_a?(Enumerable) ? attach_loop(k, v) : v
           end
         end
       end
 
+      def attach_json(data)
+        src = JSON.parse(data).symbolize!
+        attach(src.reject { |_, v| v.is_a?(Array) || v.is_a?(::Hash) })
+        attach(src.select { |_, v| v.is_a?(Array) }.map do |k, v|
+          [k, attach_loop(k, v)]
+        end.to_h)
+      end
+
+      def attach_loop(k, v)
+        loop_binder(k).bind! { v.map { |item| loop_item item.symbolize! } }
+      end
+
       def self.for(template, context)
         if template.bindable?
           binder_class = template.binder_class
@@ -131,11 +148,15 @@ module Tzispa
       end
 
       def method_missing(method, *args, &generator)
-        @source_object.send(method, *args, &generator)
+        if respond_to_missing? method
+          @source_object.send(method, *args, &generator)
+        else
+          super
+        end
       end
 
-      def respond_to_missing?(method, *)
-        @source_object.respond_to?(method)
+      def respond_to_missing?(method)
+        @source_object.respond_to?(method, true)
       end
 
       def loop_item(params = nil)

data/lib/tzispa/rig/engine.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'singleton'
 require 'digest'
-require 'lru_redux'
+require 'moneta'
 require 'tzispa/rig/template'
 
 module Tzispa
@@ -10,16 +10,12 @@ module Tzispa
     class Engine
       include Singleton
 
-      @cache_size = 512
-      @cache_ttl  = 600
-
       def initialize
-        @cache = LruRedux::TTL::ThreadSafeCache.new(Engine.cache_size, Engine.cache_ttl)
+        @cache = Moneta.new(:LRUHash, threadsafe: true)
+        # @cache = LruRedux::TTL::ThreadSafeCache.new(Engine.cache_size, Engine.cache_ttl)
       end
 
       class << self
-        attr_accessor :cache_size, :cache_ttl
-
         def empty
           TemplateBase.new
         end
@@ -44,7 +40,7 @@ module Tzispa
       private
 
       def cache_template(name, domain, block_type, content_type, params)
-        key = "#{domain}/#{block_type}/#{name}/#{content_type}".to_sym
+        key = "#{domain.name}/#{block_type}/#{name}/#{content_type}".to_sym
         get_template(key, name, domain, block_type, content_type).dup.tap do |ctpl|
           ctpl.params = params if params
         end

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
     GEM_NAME = 'tzispa_rig'
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_rig
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_utils
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: lru_redux
+  name: moneta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: General purpose template engine