tzispa_rig 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f9244aa0671284489e35cc3ab1d69313acb7cc
-  data.tar.gz: 78644d54bf7fc9ee38447c8f88c95cfb60dc23aa
+  metadata.gz: e9b0801d5dd6d70a7e9787b110ea8ddcd481058b
+  data.tar.gz: fc1e6464c849608c5818cdbd10323de2377cc597
 SHA512:
-  metadata.gz: 5f97e685d30424bc8a34084d75b9ccb5daa01f4ad75bba8158991d2a5f656cc410654d357b845753fbcdbf3c5badbd6bed924bedb43974903c48201d6d992082
-  data.tar.gz: a46ee803a956f44b75b3d6b841ca82abf957e7ac1ce7bea4b521b444f5496bed8d13508cbcb486b0d6670e20fe9c0412d881681a89e8efd3b0decf6f2e4dfa7a
+  metadata.gz: e5968f3ffc90ead75ffdaa7ea700aeea5089e4efe2f311d8c3c035f25b01ced2b3d86eb67f8d20c2f0dd3d4fae8a7adce7a974b28e7fb7acbe1d53ee7efff60c
+  data.tar.gz: e8c1965acb288ead946bba1d0d90a3f2319a3931747d9563dc2eaaa15d79dbf4c95ec05a0bc1c36f2cbac915e7c73f52ee0c40ec0dd64b66199beab0fcdc6024

data/CHANGELOG.md

@@ -2,7 +2,10 @@ Tzispa Rig
 
 Rig templates implementation
 
-@@ v0.5.3
+## v0.5.4
+- fix nested loops not binding
+
+## v0.5.3
 - added before/after hooks in template binders
 
 ## v0.5.2

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
@@ -58,8 +60,8 @@ module Tzispa
       # loop_id<Symbol>: The id of the template loop to bind
       #
       def loop_binder(loop_id)
-        lp = loop_parser?(loop_id)
-        LoopBinder.new(lp.first, @context) if lp
+        prl = loop_parser?(loop_id)
+        LoopBinder.new(prl, context) if prl
       end
 
       def attr_cache(*attrs)
@@ -71,7 +73,7 @@ module Tzispa
       def loop_parser?(loop_id)
         lp = @parser.loop_parser loop_id
         duplicated? lp
-        lp if lp.count.positive?
+        lp.first if lp.count.positive?
       end
 
       def duplicated?(loop_parser)
@@ -79,9 +81,39 @@ module Tzispa
       end
     end
 
-    class LoopBinder < Binder
-      attr_reader :data
+    class AttachBinder < Binder
+      using Tzispa::Utils::TzHash
 
+      def data
+        @data ||= data_struct.new
+      end
+
+      def attach(**params)
+        data.tap do |d|
+          params.each do |k, v|
+            next unless tags.include? k
+            d[k] = evaluate k, v
+          end
+        end
+      end
+
+      def attach_json(data)
+        attach(JSON.parse(data).deep_symbolize!)
+      end
+
+      def evaluate(k, value)
+        case value
+        when Enumerable
+          loop_binder(k)&.bind! { value.reject(&:nil?).map { |item| loop_item item } } || value
+        when Proc
+          loop_binder(k)&.bind!(&value) || value.call
+        else
+          value
+        end
+      end
+    end
+
+    class LoopBinder < AttachBinder
       def bind!(&generator)
         @source_object = eval 'self', generator.binding
         @data = instance_eval(&generator).to_enum(:each)
@@ -104,7 +136,7 @@ module Tzispa
         (LoopItem.new self).tap do |item|
           params&.each do |k, v|
             next unless tags.include? k
-            item.data[k] = v
+            item.data[k] = evaluate k, v
           end
         end
       end

data/lib/tzispa/rig/template_binder.rb

@@ -1,8 +1,6 @@
 # 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'
@@ -16,11 +14,9 @@ module Tzispa
       end
     end
 
-    class TemplateBinder < Binder
+    class TemplateBinder < AttachBinder
       extend Forwardable
 
-      using Tzispa::Utils::TzHash
-
       include Tzispa::Helpers::Hooks::Before
       include Tzispa::Helpers::Hooks::After
 
@@ -38,39 +34,6 @@ module Tzispa
         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

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
     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.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_utils