recordx-xslt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 531d10bd42deb16c83caf1d4f3beb6da9e1ec6cb9f88281ce7b93737c1dfc0b0
-  data.tar.gz: a4d34afe21106986a29a2de16c6d3d25df816da6b8cec0154b85394711e0095e
+  metadata.gz: a89aecd58a11c79ff2bb5ad89a8a2c7d1673e8d0bfcf5f31cccbe52b6129a3b4
+  data.tar.gz: ef2fc21339bb537f328ddd13032c99d03415e145d5ede468ebae99a42bf847f6
 SHA512:
-  metadata.gz: f6a3eb1435df8e8d89624d79ea8ec08e04df0aca249056e84f5555e449a7a47f290267a9b9144113fcf9b5e8489822121d7da7d84188a7e7a05f767069e66208
-  data.tar.gz: 1f273f78518584972476dddbebc3b97e72d00d4a7f1cc5173e0416995b52887d57b9d60b226aebd4385b100d8269b3aff801f825955d7a8db8c176b6fffb5772
+  metadata.gz: 48f4496159c7d3b0932c84678aa8eb84813ee4e4ff00a66bc2d4001009c578287b0717542b26927e750777f32faa601f08a7f9331b852ea061b5188d2e7d3d1c
+  data.tar.gz: 450e60d17a11d85e06adecfe7ad8d17ab1d1e416584e3c9d5d4007053844b13f3e9440fbebce29b0940fd9d054748c16b556fbf66c3b079f46cc59545aa54111

data/lib/recordx-xslt.rb

@@ -32,7 +32,7 @@ HEADER
 
     a_html = @xslt_schema.split('/').map do |x|
 
-      result = x.match(/(\w+)(?:[\(\[]([^\]\)]+)[\]\)])?(.*)/)
+      result = x.match(/([\w\>]+)(?:[\(\[]([^\]\)]+)[\]\)])?(.*)/)
       name, children, remaining = result.captures if result
 
 
@@ -43,16 +43,39 @@ HEADER
     
     puts ('a_html: ' + a_html.inspect).debug if @debug
 
-    a = a_element.zip(a_html).map.with_index do |a,i|
+    rxmap = a_element.zip(a_html)
+    
+    a = rxmap.map.with_index do |a,i|
 
       out = []
       tag = a.shift
+      puts 'tag: ' + tag.inspect if @debug
+      
       field = i > 0 ? 'records/' + tag : tag
       out << "<xsl:template match='#{field}'>" + "\n"
       a.flatten!(1)
+      puts 'a: ' + a.inspect if @debug
+      
       if a.last.is_a? Array then
 
-        out << scan_e(a, tag) 
+        if @debug then
+          puts 'before scan_e a: ' + a.inspect
+          puts 'before scan_e rxmap: ' + rxmap.inspect
+          puts 'before scan_e rxmap[i+1]: ' + rxmap[i+1].inspect 
+        end
+        
+        if rxmap[i+1] and rxmap[i+1][1][0] =~ />/ then
+          
+          raw_body, rxtag = rxmap[i+1][1][0].split(/>/,2)
+          body = ["<%s>" % raw_body,"</%s>" % raw_body]
+          
+          puts 'body: ' + body.inspect if @debug
+          rxmap[i+1][1][0] = rxtag
+        else
+          body = []
+        end
+        
+        out << scan_e(a, tag, indent='  ', body) 
         out << "</xsl:template>\n\n"
       else
         out << "  <%s>\n" % a.first
@@ -85,25 +108,41 @@ HEADER
     
   end
 
-  def scan_e(a, prev_tag='', indent='  ')
+  def scan_e(a, prev_tag='', indent='  ', body=[])
 
     out = []
 
     unless a.first.is_a? Array then
       
-      tag = a.shift
+      raw_tags = a.shift
+      
+      tags = raw_tags.split('>')
+      start_tags = tags.map {|x| "<%s>" % x }.join
+      end_tags = tags.reverse.map {|x| "</%s>" % x }
+      puts 'end_tags: ' + end_tags.inspect if @debug
+      puts 'body: ' + body.inspect if @debug
+      
+      if body.any? then
+        end_tags.insert(-2, body[0])
+        end_tags[-1][0] = body[-1] #+ end_tags.last
+      end
+      puts '2. end_tags: ' + end_tags.inspect if @debug
 
-      out << indent + "<%s>\n" % tag
+      puts 'prev_tag: ' + prev_tag.inspect if @debug
+      puts '_a: ' + a.inspect if @debug
+      
+      out << indent + "%s\n" % start_tags
       out << indent + "  <xsl:apply-templates select='summary'/>\n"
+      out << indent + "%s\n" % end_tags[0..-2].join if end_tags.length > 1
       out << indent + "  <xsl:apply-templates select='records'/>\n"      
-      out << indent + "</%s>\n" % tag
+      out << indent + "%s\n" % end_tags[-1]
       out << "</xsl:template>\n\n"
       out << "<xsl:template match='%s/summary'>\n" % [prev_tag]
 
       a.flatten!(1)
       
       if a.last.is_a? Array then
-        out << scan_e(a, tag, indent + '  ') 
+        out << scan_e(a, tags.last, indent + '  ') 
       else
         out << indent + '  ' + a.first + "\n"
       end

metadata

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

metadata.gz.sig

@@ -1,3 +1,2 @@
-v"�K)�C2jFU�^�h+k��W��Z�?�!��[jY �8��C$
-����-�
-DzB��Ք��g���1���75����M����:Y�h�,@zW�?��*�h���/3VHM4K�p�,=p ��	��&Z߉��0�Zi�ٽ�+'�B��H�V���VP�fZ`
+�\>��X㶄���]��!0?K��KW ��}�(�޾��^��ĭ�<�֪?��9���~��d�x�8�h��h}(�8�X��
��t�P.?n~�J�U�3��d��!mN�?:`��/`,��e��l�l�'nɪ�8���,�d���w8�c���׏��N#�p�

+����
9' ��P�r'�2�