rexle-builder 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 173cd08ae892bc695eba952bfbe63fc021ef7a3fd0241b399e36cff7a8c1b5c8
-  data.tar.gz: 2e31849b636155a8251e1a2a06620f33b1b868a7fc1d90cca981619a76041f9b
+  metadata.gz: ff62c53e5a7dd2775aa78650ebdc6bafeec01f666af4c0f88cd4ea85ddc407d2
+  data.tar.gz: b2b64bb339c75f2082d3be69675c4e9bf871df5a4b2d0aaf1dca4c2a1fe1c9c7
 SHA512:
-  metadata.gz: b16a7f83b82355b14e61f320a4f032ffa29697fe6850b386490754da64a1cf19eced22b92c49deba892ed1bcd616978065ce0f27e0c342b2e4f0f10bc468152f
-  data.tar.gz: 75ea0138a555d42c640f94fe7600f8e0970e2e0ba58760a36af1cdcf17479fb33108decbee4a6fae604541a674755dace8c0493c711e794bc0cff507ed1841c4
+  metadata.gz: bd689817a5975e66798398cfb361dba7d25cef704c97078c4a23f00b8cfb1fd6915172a809cc692bf7b3983372bbb9c722bb870bc2d2e6382f35736cb1ade03b
+  data.tar.gz: 47707186dbe3b2bf49b26418f2c44a0ad30dfd3bee5c5814a36e21d2956355b7e18016330ce77b80271f10efeb608153f67b7bf4339cd64ba33a99d8f356e061

data/lib/rexle-builder.rb

@@ -4,7 +4,7 @@
 
 
 class RexleArray < Array
-  
+
   def initialize(raw_a)
     a = raw_a.first.is_a?(Array) ? raw_a : [raw_a]
     super(a)
@@ -19,20 +19,20 @@ class RexleBuilder
     yield(self.new(debug: debug))
 
   end
-  
+
   def initialize(obj=nil, root: 'root', debug: false)
-    
+
     @debug = debug
     @a = []
     @current_a = @a
     @namespace = nil
-    
+
     if obj.is_a? Hash then
-      
-      key = obj.keys.first      
-      
+
+      key = obj.keys.first
+
       if obj.length > 1 or obj[key].is_a?(Array) or obj[key].is_a?(String) then
-        self.send(root.to_sym) { buildx obj} 
+        self.send(root.to_sym) { buildx obj}
       else
         self.send(key.to_sym) {buildx obj[key]}
       end
@@ -50,91 +50,135 @@ class RexleBuilder
   end
 
   def method_missing(sym, *args)
-    
+
     puts 'args: ' + args.inspect if @debug
-    
+
     value = args.find {|x| x.is_a? String} || ''
     attributes, obj = args.select {|x| x.is_a? Hash}
-    
-    # The obj is an optional Hash object used to build nested XML 
+
+    # The obj is an optional Hash object used to build nested XML
     # after the current element
-    
+
     if value =~ /^<.*>$/ then
-      
+
       a = [
-        sym.to_s, 
-        attributes, 
+        sym.to_s,
+        attributes,
         *Rexle.new("<root>%s</root>" % value, debug: @debug).to_a[2..-1]
       ]
-      
+
     end
-    
+
+
+    # reserved keywords are masked with ._ e.g. ._method_missing
+    a ||= [sym.to_s.sub(/^(?:\._|_)/,'').sub(/^cdata!$/,'![')\
+         .sub(/^comment!$/, '!-'), attributes || {}, value || '']
     if @debug then
       puts 'sym: ' + sym.inspect
       puts 'args: ' + args.inspect
+      puts 'obj: ' + obj.inspect
+      puts 'a: ' + a.inspect
     end
-    
-    # reserved keywords are masked with ._ e.g. ._method_missing
-    a ||= [sym.to_s.sub(/^(?:\._|_)/,'').sub(/^cdata!$/,'![')\
-         .sub(/^comment!$/, '!-'), attributes || {}, value || '']
-    
+
     a.concat RexleBuilder.new(obj, debug: false).to_a[3..-1] if obj
 
-    if @namespace then 
+    if @namespace then
       a.first.prepend(@namespace + ':')
-      @namespace = nil 
+      @namespace = nil
     end
 
     @current_a << a
-    
+    puts '@current_a, before block_given : ' + @current_a.inspect if @debug
+
     if block_given? then
-      
+
       prev_a = @current_a
       @current_a = a
-      
-      r = yield()     
-      
-      @current_a.concat r if r.class == RexleArray
-      @current_a = prev_a      
-      
+
+      r = yield()
+
+      if @debug then
+        puts 'r: ' + r.inspect
+        puts 'r.class: ' + r.class.inspect
+      end
+
+      return r if r == @a.first
+
+      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
+      return @a.first
+
     end
-    
-    @a.first
+
+    #@a.first
+    nil
   end
-  
+
   private
-  
+
   # build from a Hash object
   #
   def buildx( h)
 
-    h.each_pair do |key, value|
+    puts 'buildx: ' + h.inspect if @debug
+    # the following statement prevents duplicate elements where 1 key is
+    # represented by a String and the other by a symbol.
+    #
+    h2 = h.map {|x| [x[0].to_sym, x[1]]}.to_h
+
+    h2.each_pair do |key, value|
 
       if value.is_a? Hash then
-        
-        self.send(key.to_sym) do 
+        puts 'buildx found Hash' + value.inspect if @debug
+        self.send(key.to_sym) do
           buildx value
+          nil
         end
-        
-      elsif value.is_a? Array  
-        
+
+      elsif value.is_a?(Array) and value.first.is_a? Hash
+
+        puts 'buildx found Array' + value.inspect if @debug
+        puts 'key:' + key.inspect if @debug
+
         self.send(key.to_sym) do
-          
-          if value.first.is_a? Hash then
-            value.map {|x| buildx x} 
-          else
-            RexleArray.new value
+
+          r2= []
+          value.each do |x|
+
+            if x.is_a? Hash then
+              puts 'x:' + x.inspect if @debug
+              buildx x
+              nil
+            else
+              puts 'x2:' + x.inspect if @debug
+               r2 << x
+            end
+
           end
-          
+
+          r2
         end
-        
+
       else
-        
-        self.send(key.to_sym,  value.to_s)
-        
+
+        puts 'buildx found other' + value.inspect  if @debug
+        if value.is_a? String then
+          self.send(key.to_sym,  value.to_s)
+        else
+           self.send(key.to_sym) {[value]}
+        end
+
       end
     end
 
-  end  
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-builder
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - James Robertson
@@ -10,35 +10,36 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNTAxMTgyMTU4WhcN
-  MjEwNTAxMTgyMTU4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDXvcGF
-  KAsFoSJW5WibJ3BCxoe5RyUNGARFsSo+Y755n9YmTEoL9jCNkxHCyZAPJSXeZJlV
-  jM1LqYD6n9MW73o0B7vy9Rq1n49cWIliXYrkIvhLlS7qviVg+ij8/o36LVeK4/4d
-  Z5d+jRyr6tovVn6Hlqs8qoMdI4lOj1f3yb2kFhbkW2Zx/O+4TMFvQT5/pc0/JcMM
-  b4SjzEZ8/aamSpjBNCIfML4pu2NNIaD/Zt8fLAa8kXGxCG47YP1rrnPuggz5YaOh
-  0AgC4f2EKjfBqGcmgQ4QHOZ4GLf5pLPdILZk6dwCE6nwg3MLR+KDzuoHOppbzgpi
-  bHBVJ2mJczOpK4b1GQ0h8fb5HzJtFUrw6iRBwiPTKtbrh9x2QHS+npbKLbDdpjvL
-  b4u1krO1KazyhveIvcdScQ9+UbW5DxwYABoQ2VyRDplBn5c6+FTgSi5visvrrJTv
-  oqG6wLRxiTU9KRN24d7yEO0jrZf4PvCCLEAs/OnNzvJphQ2UgECBSstkjxkCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUjwkszDfc
-  EtAc5VTBGeONI5ddrI8wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
-  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAWAyU3Ht4sJy3dsUJ0EZTRTyamnWQk2p0Rb1SqqHp
-  2wM2KLZVluuyM5kQ9IsI4UCtB4C6uvFu9P4JX9dWF6JTU0UQKvsgbPH1i+7sXUUf
-  gnBfsdfqWmmYU0y+m05DYgTYOOTPBY7nhM1Ms5zrkHfw7MdddTMIhPw/kuyqRHc6
-  vP8mNUJD2sr4untuOFdOBrFVcjylY8IHTR/aVINbQOh53r1TD8ATROvB9MEaHbEQ
-  LLr+c9+ti0wCZiHwd0o5jZBrH4hDrybFR9Dx61GZrLwaoDorq/nKnaIHikVGAUMX
-  7zfbefTm9GvWrDQTjESHOfLVzjvcVR3/lLdDy914oSbA3+v9a2xsyZzVXKYADidr
-  LxGza+bzBCYgXoht0vSUR82d8uH+YdngvcK99G+3T8W53ikFDF2wS0l57yF9jfks
-  rC7AiWdayhS+wLWd/i/UtpYL25JcgKdaq24E/7+vB1EPRzPsDJrx8AzYo759WDob
-  o0Nd2o91GHfpqyL9snw6G3Dl
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTIyMDcyNDE5NTI0N1oXDTIzMDcyNDE5NTI0N1owSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBAPcD/W+g9XKq4ugEgFrJ0o3aMpOPQPMMTQYMqPdadoRFsCqj32619ryDKWrr
+  5U1T3cf/I9Y/6Qh8sKKbdmqX8+H/hd5YgppWnPRjcThEAiR04Cek9MGH0I4qgztB
+  dNaanZNqeFWj3gPuAJq27wzOyPAzltnCeG2BW9hF6ZnDytfXFCv29Mtjhd+ZnLYu
+  /vCl7BVB8STrDEFz0IUACWZpBI7kfnKOiwUf97Akx24qWu8sVYovoxl5IwssG4Zb
+  Y3SYJRnMt+VpDj0NfMEJ3z6gsz+71dUrGfJgzra3xASpZfO1UnsJ2Y6r+CClFOkt
+  2jSW3h/Dj1SPDXcxD8yA0VqA90Rf5c4tBUPgrHb3UHoXCFWMRRAfeBIhGKnjHk1p
+  UYhzIyzGPpTxFezsbqo19VsCGH+Fdix7s5x6U7GaCwNGtQQ/4ff1QEsxDgu30p2O
+  fE+bU0vLiPflUeMIekE7joRJsaMLIfU7L4WAdJDnlzW9FGG2diB/vJLvdG2HBt4F
+  weFa+QIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBTf/hyUVRBhiJnLyS9ixjhp7e2dejAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQANTkbRlCnyKnC93YfSYYZZIY2yG3w4
+  aMC5NdlJbJKqNS5iFJFGzQmQFh64qphNYS/ER71XjeUcpQmL3G8CStlE2/Pgmw3q
+  AxGZQicTWSz7oZy0YWeAXiHu+Z+H5N9ar7r6cbN7e1X7100rXJOIoRbV30/7X2nd
+  oqq/CmaXtg5Tbr+pV461riwkEd+zq98EhVw8Mud0YOZ7QBGY1i1xK6DpTLWgzsiI
+  dCDj3IztA2K8hUJpP5aNw5nAGcLc/FxxGDySI2cQc+fDsM6RfFjch8EUd125yvRe
+  ab0Xx0Rsvj2/Z63HLArC6rESIzZVpt4FAOBlCzOtMJEC9SMBMM7+sbMbwRxoTCKj
+  VmHj3sRQB3mQj4qN3dd241Ea4y2eTa/mML8gvkx84jAYr/nmQc8tRV64bnp2G01a
+  w7Z+7EzJFzhHpXYm4QBYR+qb81pB/ZX0LWtVs/2jjCWoCOOdIuH/jh+DzQk4Qhby
+  R02xW5SGXEOiylE3Q9SDqGfvomcQ8ENDYts=
   -----END CERTIFICATE-----
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2022-07-31 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Generates XML, by producing an array of raw XML elements which can parsed