dynarex 1.2.26 → 1.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b573cdd1290583d427cec4101c8f0e1ec2985eb5
-  data.tar.gz: 79f8dd40f460468685a95ed9331b35a32e9101a1
+  metadata.gz: af8958c780bbbef841f04e8965372dc34d0c29af
+  data.tar.gz: bc48951dadb1b96090a60bb2655f6d1ebc7f57df
 SHA512:
-  metadata.gz: 70a2ddcbf9eebc56a825328fd75122f3183283c21270d8eda8bb5f4c5aca5df3148c3c4ac8b2442f6a4969d506ebb60cdd74f129520c8b81b394483b1ce84669
-  data.tar.gz: 0a272a23a7a3a8f4141e261b84414527eadffae578d4a9bd1e89e306b8b5ba740ac7845d64c0eca1fb26b9705762356f572acda2f6544b6d13cb6d5986bcc502
+  metadata.gz: 3e7389b1af0c11bcde4e55b526caa3b95e0d95ac0ad3b80a14a73d18a1c1361527286fa8d8d666b63291d8d1e657fbd9a16e6c0c38c09ca506f459c44dd95c5d
+  data.tar.gz: 3a7bb836d926972d3b909276f90166a8b7183fbc29391e9a6bdbb3ded42627b165001cadb866b27767c0283a4e48fbb7fdd01397ec1dcf2f6afa4ce3ec9a38ee

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-R�ݓM�s��B.����\�͙��������}��b(����AXZ���|���?�Y�8�����>�?q�kt �&(--��f��[��
2$��]J�����8*�F_SF�A��s�,�JZ�HPj��`���3��R�..�D����&agG��1����}��`�6lJ�SSߖ�vsEP�h	��\|�'���z5�h"%�/�B���
+k�pG�-���`Y�S䛯h;��w�ٟGJ����;
*����j0F�O��/��oR47�03�
��:��
+�k
>`��p�?ig'�*��]Q�)������?�N�h%
+��s��

data.tar.gz.sig

@@ -1,2 +1 @@
-T�G��3�P;���T��82Om<���,����1���a�	�(F��*���{�@0
-��qT���!������x[D/�����HP�ԥ�F�Ў���}�����l#��@�H��	w+2�ek
����s��!����M`��\j����`T�z�kǨ�γs2�0���1A�e�c""��@]�P�[�0���	Ly/�dZ���휢i�k>���Ns��"��:Y���iL��M޻��vSz�[v�k�52
+w���I�2#i1v������2!����WR��C�}Q�?�D���:���B����y���l�]%F�bpИ"p�I��8�)Iw̯g�U^b:��E�	k�s���҉9�l�'S)u_z���iPg�1LUp��w��%)����/����w,X53y}0X����%-]

data/lib/dynarex.rb

@@ -13,6 +13,7 @@ require 'recordx'
 require 'rxraw-lineparser'
 require 'yaml'
 require 'rowx'
+require 'nokogiri'
 
 class Dynarex
 
@@ -142,16 +143,19 @@ EOF
 
 
     #format_mask = XPath.first(@doc.root, 'summary/format_mask/text()').to_s
-    format_mask = @doc.root.element('summary/format_mask/text()')
-    xslt_format = format_mask.to_s.gsub(/\s(?=\[!\w+\])/,'<xsl:text> </xsl:text>').gsub(/\[!(\w+)\]/, '<xsl:value-of select="\1"/>')
+    #format_mask = @doc.root.element('summary/format_mask/text()')
+    format_mask = self.format_mask
+    format_mask.gsub!(/\[[^!\]]+\]/) {|x| x[1] }
+    xslt_format = format_mask.gsub(/\s(?=\[!\w+\])/,'<xsl:text> </xsl:text>')
+      .gsub(/\[!(\w+)\]/, '<xsl:value-of select="\1"/>')
     
     xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
 
-    #jr250711 xslt  = Nokogiri::XSLT(xsl_buffer)
-    #jr250711 out = xslt.transform(Nokogiri::XML(@doc.to_s))
+    xslt  = Nokogiri::XSLT(xsl_buffer)
+    out = xslt.transform(Nokogiri::XML(@doc.to_s))
     #jr250811 puts 'xsl_buffer: ' + xsl_buffer
     #jr250811 puts 'doc_to_s: ' + @doc.to_s
-    #jr260711 out.text
+    out.text
     #jr231211 Rexslt.new(xsl_buffer, @doc.to_s).to_s
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.2.26
+  version: 1.2.27
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   kUea9jZD+xTq1Js9t2BHCz3Ev/sgS7CaijrbQetbNwzasFGHRd30xBEwd4zANQOp
   i0OBH0e4iIMkv+Q+PYlNRnlpQogsAdTs
   -----END CERTIFICATE-----
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -157,6 +157,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: james@r0bertson.co.uk
 executables: []