rexle-builder 1.0.4 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6c908421b55a41fe3988edff4238b011358ba5b78440036593ebf4b5ff65bb7
-  data.tar.gz: 150737d9be007c7c9d48fe30be8f606efe2b66bb3bfcbb69f3ea18b298cded1b
+  metadata.gz: 330ed47e2dbea9f32edf44ac2f8f24a51707bb36dc36a7ce2a363561145471c1
+  data.tar.gz: 856d76fd386f153f4b115a2029367e5ed5f4e9d1807b38998b747ff368d86ee6
 SHA512:
-  metadata.gz: 29db012b7fcd96b56a5490afda250c9f7791c1d8354f0de0a66f40c4bf57689d130ca9db6077242a624af0882f61904c0ea77e186df480fe1194519bdadd398f
-  data.tar.gz: a56a35dd95093c7545bed8b7e2f5c9584947ccef4348fe2a5ccddc612167c89165dca45a79f1daa4a10dd12fb6998f5f33cbff428fe4bf23dcda58280947765c
+  metadata.gz: 0df19c5b5e472b4d11eaf91e8e44142de2bbe8ba5d856386bb788c355836cbebad8ea7155d4df495e49fa9a182f4ea42b6471336da2a7fcf08a31733228da0ae
+  data.tar.gz: ce199ba03c3a4282b809bd1a7a5e0bdfd2e35e16ffc6b1b0f130eaff1ec7b7e86e170907ef897d0228d671b7bcfe606598e9a15d020397ac5decac84da9433fe

data/lib/rexle-builder.rb

@@ -95,7 +95,8 @@ class RexleBuilder
       prev_a = @current_a
       @current_a = a
 
-      r = yield()
+      r = yield(@current_a)
+      @current_a = prev_a
 
       if @debug then
         puts 'r: ' + r.inspect
@@ -103,10 +104,19 @@ class RexleBuilder
       end
 
       return r if r == @a.first
-      @current_a.concat r if r.is_a? Array
+
+      if r.is_a? Array then
+
+        # only concat if r contains raw Rexle elements.
+        if r.all? {|field, attributes, value| attributes.is_a? Hash} then
+          @current_a.concat r
+        end
+
+      end
       puts '@current_a ' + @current_a.inspect if @debug
-      @current_a = prev_a
+      #@current_a = prev_a
       return @a.first
+      #return @current_a
 
     end
 
@@ -140,7 +150,7 @@ class RexleBuilder
         puts 'buildx found Array' + value.inspect if @debug
         puts 'key:' + key.inspect if @debug
 
-        self.send(key.to_sym) do
+        self.send(key.to_sym) do |row|
 
           r2= []
           value.each do |x|
@@ -151,12 +161,12 @@ class RexleBuilder
               nil
             else
               puts 'x2:' + x.inspect if @debug
-               r2 << x
+               row << x
             end
 
           end
 
-          r2
+          nil
         end
 
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-builder
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.7
 platform: ruby
 authors:
 - James Robertson
@@ -36,7 +36,7 @@ cert_chain:
   w7Z+7EzJFzhHpXYm4QBYR+qb81pB/ZX0LWtVs/2jjCWoCOOdIuH/jh+DzQk4Qhby
   R02xW5SGXEOiylE3Q9SDqGfvomcQ8ENDYts=
   -----END CERTIFICATE-----
-date: 2022-07-24 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: digital.robertson@gmail.com