xml_col_finder 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f197d3b4951b9482ecc356421fb1d665b3e2e33a4e0d0ca1fb91da463877e690
-  data.tar.gz: d3c4e36b690c2684b9bd8ace2dbe1057fd89deaefaa402dcbbb77524cb82d693
+  metadata.gz: fb9968f62dfa167170d225305499a06a3fb07949d22b44cfc5fc7aaff2250e70
+  data.tar.gz: 590549966bf32070036e68f45ff1c61cc5b81b7c11a5237466928e573758eeb5
 SHA512:
-  metadata.gz: 38a8eaf60f976d7773e7d611e240e0ace91dc487bb06f47950915ae96dc26d289878ec62a62d8ab7dd5fab0cde15d7a9dda3dd97a2dc567185c86572eaa76289
-  data.tar.gz: cd4b309ae655a17efb48818f44004753f957a28e5cdbae462d1f31ab3bb97f4ccaf306408c0276b6df1d547e7ebf37a90ce55bcb04313ac5abbe0a8a0cfeadac
+  metadata.gz: a022f1836170e5628062360a2bef7d4fc26ac1748dd7970fd56eb76ca5fa194f2f61b75bf7f8dfe667191ef194aeb2306a8c5e94e55552aafa105e0d34a7828b
+  data.tar.gz: 2f932bcffe0ace2bfc4fdefb3df0fde1cff61e3095110fb765de6732c096c44066e13046591c8423bb75465e9b981774751c225b9791a72601bac97bb24237a5

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-!~��WXɿٷWI����Q����Vn�.Qf�-�v?�ڝ�S���T�U�&6<��ŭ�D�g����
�j��O�m��}�ԛ!��֐����6�	C������
-���ÖO�n�����؆�m�Hpl���HY�:.ɇ��z��(-�����E�]��pT_�Iڜ"W�Z�������t�ٗf
-���u�;����a�v[):����C��ujnz���d���D{9�FX�9�d��lgN��j?@�
+T�V�c.nf���}�"Ny�
S�dVA$�t/�n����F��*�2ay�.�7��"�L�B�ϊ#[����|��R�iQ��L�2���~�T�u��N�6r]�u[��$�4�"����ے��i���jxe8W*%rT�!mf��\�QӪ�+i5�3G�*t�*�ԡ9�;�u��:�u����Aj�IG�8���U*����i�9*��rΥ����
d�JG��,
+�d����D�n��F�*

data/lib/xml_col_finder.rb

@@ -33,6 +33,7 @@ class XMLColFinder
   def to_code()
 
     @tags = {}
+
     xpath, remaining = @to_a
 
     eid = getid(xpath)
@@ -45,13 +46,13 @@ class XMLColFinder
 
   private
 
-  def formatline(pid, eid=nil, key=nil, tail=nil)
+  def formatline(pid, eid=nil, key=nil, tail=nil, index: nil)
 
     if eid then
       line = "%s = %s.element(\"%s\")" % [eid, pid, key]
       line += '.text' if tail.is_a? String
     else
-      line = "%s.text" % pid
+      line = index ? ("%s[%d].text" % [pid, index]) : ("%s.text" % pid)
     end
 
     return line
@@ -119,8 +120,6 @@ class XMLColFinder
 
         else
 
-          puts "path.join('/'): " + path.join('/').inspect
-          puts 'txt:' + txt.inspect
 
           h2[stickypath.sub(/^\//,'')] ||= []
           h2[stickypath.sub(/^\//,'')] << [path.join('/'), txt]
@@ -147,6 +146,8 @@ class XMLColFinder
 
   def scan(a, eid='doc', pid=eid.clone)
 
+    #puts 'a: ' + a.inspect if @debug
+
     a.map do |row|
 
       head, tail = row
@@ -160,9 +161,17 @@ class XMLColFinder
         if head[0] == '/' then
 
           key = head[1..-1]
+          puts 'key: ' + key.inspect if @debug
 
           eid = getid(key)
-          hline = formatline(pid, eid, key, tail)
+
+          hline = if tail.is_a? Array and tail.all? {|x| x.is_a? String } then
+            @prev_xpath = true
+            "%s = %s.xpath(\"%s\")" % [eid, pid, key]
+          else
+            @prev_xpath = false
+            formatline(pid, eid, key, tail)
+          end
 
         else
 
@@ -171,7 +180,20 @@ class XMLColFinder
       end
 
       if tail.is_a? Array then
-        tline = scan(tail, eid)
+
+        if tail.compact[0].is_a? Array then
+
+          puts 'tail: ' + tail.inspect if @debug
+
+          tline = scan(tail, eid)
+
+        elsif tail.all? {|x| x.is_a? String} and tail[0][0] != '/'
+          puts '_tail: ' + tail.inspect if @debug
+          tline = tail.map.with_index do |x,i|
+            formatline(pid=eid, index: i)
+          end.join("\n")
+
+        end
       end
 
       [hline, tline]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml_col_finder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson