tzispa_rig 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5e5300f16c59b1d36a54cb61457d7f27d73db7
-  data.tar.gz: 6253800420d94b93692dee73102c8accdd9cafe5
+  metadata.gz: 83f9244aa0671284489e35cc3ab1d69313acb7cc
+  data.tar.gz: 78644d54bf7fc9ee38447c8f88c95cfb60dc23aa
 SHA512:
-  metadata.gz: 21d4d0c0e55ffea5ef20a6cef84fb5e47e14ac8af437c87e6bdeef7fb042108c449dd21c8b765c988345c3af10066b242a3147aaac8dccf02dce5e1840a1fb13
-  data.tar.gz: dbc9b3e8095d7115fd33889892dd8963acf644db99394b72108953120a4f870d41c10eee72372e5a8fdd59c19e67638b2b3d817d3b1aa7b63e9a49796555b336
+  metadata.gz: 5f97e685d30424bc8a34084d75b9ccb5daa01f4ad75bba8158991d2a5f656cc410654d357b845753fbcdbf3c5badbd6bed924bedb43974903c48201d6d992082
+  data.tar.gz: a46ee803a956f44b75b3d6b841ca82abf957e7ac1ce7bea4b521b444f5496bed8d13508cbcb486b0d6670e20fe9c0412d881681a89e8efd3b0decf6f2e4dfa7a

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Tzispa Rig
 
 Rig templates implementation
 
+@@ v0.5.3
+- added before/after hooks in template binders
+
 ## v0.5.2
 - replace lru_redux with moneta to improve template cache storage
 - added fallback to super in method_missing at LoopBinder

data/lib/tzispa/rig/binder.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'forwardable'
-require 'json'
-require 'tzispa/utils/hash'
 
 module Tzispa
   module Rig
@@ -19,12 +17,6 @@ module Tzispa
       end
     end
 
-    class IsnotTemplateBinder < ArgumentError
-      def initialize(name)
-        super "Class #{name} isn't a TemplateBinder"
-      end
-    end
-
     class Binder
       extend Forwardable
 
@@ -66,10 +58,8 @@ module Tzispa
       # loop_id<Symbol>: The id of the template loop to bind
       #
       def loop_binder(loop_id)
-        loop_parser = @parser.loop_parser loop_id
-        unknown? loop_parser
-        duplicated? loop_parser
-        LoopBinder.new loop_parser[0], @context
+        lp = loop_parser?(loop_id)
+        LoopBinder.new(lp.first, @context) if lp
       end
 
       def attr_cache(*attrs)
@@ -78,63 +68,14 @@ module Tzispa
 
       private
 
-      def unknown?(loop_parser)
-        raise UnknownTag.new(self.class.name, loop_parser.id) unless loop_parser.count.positive?
+      def loop_parser?(loop_id)
+        lp = @parser.loop_parser loop_id
+        duplicated? lp
+        lp if lp.count.positive?
       end
 
       def duplicated?(loop_parser)
-        raise DuplicatedLoop.new(self.class.name, loop_parser.id) unless loop_parser.count == 1
-      end
-    end
-
-    class TemplateBinder < Binder
-      extend Forwardable
-
-      using Tzispa::Utils::TzHash
-
-      attr_reader :template
-      def_delegators :@template, :params
-
-      def initialize(template, context)
-        super(template.parser, context)
-        @template = template
-      end
-
-      def data
-        @data ||= @data_struct.new
-      end
-
-      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.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
-          binder_class&.new(template, context)&.tap do |binder|
-            raise IsnotTemplateBinder(binder_class.name) unless binder.is_a? TemplateBinder
-          end
-        else
-          new(template, context)
-        end
+        raise DuplicatedLoop.new(self.class.name, loop_parser.id) if loop_parser.count > 1
       end
     end
 
@@ -162,7 +103,7 @@ module Tzispa
       def loop_item(params = nil)
         (LoopItem.new self).tap do |item|
           params&.each do |k, v|
-            raise UnknownTag(self.class.name, k) unless tags.include? k
+            next unless tags.include? k
             item.data[k] = v
           end
         end

data/lib/tzispa/rig/template.rb

@@ -6,7 +6,7 @@ require 'tzispa/utils/string'
 require 'tzispa/utils/indenter'
 require 'tzispa/rig/parameters'
 require 'tzispa/rig/parsernext'
-require 'tzispa/rig/binder'
+require 'tzispa/rig/template_binder'
 
 module Tzispa
   module Rig
@@ -97,7 +97,7 @@ module Tzispa
 
       using Tzispa::Utils::TzString
 
-      BASIC_TYPES    = [:layout, :block, :static].freeze
+      BASIC_TYPES    = %i[layout block static].freeze
       RIG_EXTENSION  = 'rig'
 
       attr_reader :id, :name, :type, :domain, :parser, :subdomain, :childrens, :content_type
@@ -133,7 +133,7 @@ module Tzispa
       def render(context, binder = nil)
         parse! unless parser
         binder ||= TemplateBinder.for self, context
-        binder.bind! if binder&.respond_to?(:bind!)
+        binder.bound
         parser.render binder
       end
 
@@ -205,7 +205,7 @@ module Tzispa
       end
 
       def create_binder
-        return unless [:block, :layout].include?(type)
+        return unless %i[block layout].include?(type)
         ::File.open("#{domain.path}/#{binder_require}.rb", 'w') do |f|
           f.puts write_binder_code
         end

data/lib/tzispa/rig/template_binder.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+require 'json'
+require 'tzispa/utils/hash'
+require 'tzispa/helpers/hooks/before'
+require 'tzispa/helpers/hooks/after'
+require 'tzispa/rig/binder'
+
+module Tzispa
+  module Rig
+
+    class IsnotTemplateBinder < ArgumentError
+      def initialize(name)
+        super "Class #{name} isn't a TemplateBinder"
+      end
+    end
+
+    class TemplateBinder < Binder
+      extend Forwardable
+
+      using Tzispa::Utils::TzHash
+
+      include Tzispa::Helpers::Hooks::Before
+      include Tzispa::Helpers::Hooks::After
+
+      attr_reader :template
+      def_delegators :@template, :params
+
+      def initialize(template, context)
+        super(template.parser, context)
+        @template = template
+      end
+
+      def bound
+        do_before
+        bind! if respond_to?(:bind!)
+        do_after
+      end
+
+      def data
+        @data ||= @data_struct.new
+      end
+
+      def attach(json = nil, **params)
+        attach_json(json) if json
+        data.tap do |d|
+          params.each do |k, v|
+            next unless tags.include? k
+            d[k] = case v
+                   when Enumerable
+                     bind_loopitems(k, v)
+                   when Proc
+                     loop_binder(k)&.bind!(&v) || v.call
+                   else
+                     v
+                   end
+          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, bind_loopitems(k, v)]
+        end.to_h)
+      end
+
+      def bind_loopitems(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
+          binder_class&.new(template, context)&.tap do |binder|
+            raise IsnotTemplateBinder(binder_class.name) unless binder.is_a? TemplateBinder
+          end
+        else
+          new(template, context)
+        end
+      end
+    end
+
+  end
+end

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.5.2'
+    VERSION = '0.5.3'
     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.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_utils
@@ -69,6 +69,7 @@ files:
 - lib/tzispa/rig/parsernext.rb
 - lib/tzispa/rig/syntax.rb
 - lib/tzispa/rig/template.rb
+- lib/tzispa/rig/template_binder.rb
 - lib/tzispa/rig/token.rb
 - lib/tzispa/rig/type_token/api_url.rb
 - lib/tzispa/rig/type_token/block.rb