dynarex 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b8943166b68d545c2d810b1fe87487a3e7ee292
-  data.tar.gz: f74f23770ef9c48b0cb99433d93b929aaf939730
+  metadata.gz: 3bc90e7f9765e7690636c7387cdab80667656728
+  data.tar.gz: 4705b196cb65bb198c2cfb7c5264f31873aa18e2
 SHA512:
-  metadata.gz: 40eac8e1f172a9b4754b821eebde8d6a249cdb61fde2bb13146a37e5882e486282c81b2de3f31e28252fb6c832f6478c6b31c0da8f75628d2348f785a85ad2d0
-  data.tar.gz: fd86b76c18e299bad8e2ecfc3c3ce846fd7ff0221c9b277037ae52b32996559783d7d8d93b5a3092c1e57790cee668db1c4ddfab2280f83374ef8aa5978b6c2c
+  metadata.gz: 5eb725ed18a6dbc69dfe8e9903cd6d4781a760d8a6c90bac4a21bb752cc20f5fb5231bc71a800405f2d02bd750f3e84e11818eb125a2aa3e0a6c029068685dfc
+  data.tar.gz: 209046c0146edacae7bae1b6dfceda515ca2c91eb74c08f62c561bc7ed7a157a75d2f5fae811c88eb7cb56d71023913bb4341569fa931795b33d8f14ed0c9fea

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-�^1��8hӜ�77��.����cЌe�(�u��P8��#D����C���J����{^�y!��_�i&�G����7�eCR�v8�:����)��B���^:�Pc0�s�/���/`�	/��͙&� �`l�U�	���
�n=�ܢc��3,?!s/κs�;�r^�5��Ê-��~�����(F6A�y��)‡b��/������[s�z�%�9�>6��#�7
�%hĕSq�'�0$��X�B�

+5ص]�
+d��u$z����y�d�m��6�x
�NJ�N�r�b�H��;�A��쏹)bD)����H��X��
+B0�\}��U�sDk�W���9J���T4�m��C���t

data/lib/dynarex.rb

@@ -26,7 +26,7 @@ end
 class Dynarex
 
   attr_accessor :format_mask, :delimiter, :xslt_schema, :schema, :linked,
-      :order, :type, :limit, :xslt
+      :order, :type, :limit, :xslt, :json_out
   
   
 #Create a new dynarex document from 1 of the following options:
@@ -37,17 +37,20 @@ class Dynarex
 #* an XML string
 #    Dynarex.new '<contacts><summary><schema>contacts/contact(name,age,dob)</schema></summary><records/></contacts>'
 
-  def initialize(rawx=nil, opt={})
+  def initialize(rawx=nil, username: nil, password: nil, schema: nil, 
+                 default_key: nil, json_out: true)
 
     #File.write '/tmp/d.log',''
-    #@logger  = Logger.new '/tmp/d.log','daily'
+    @log  = Logger.new File.expand_path('~/dx.log'),'daily'
     #@logger.debug 'inside intialize'
-    @opt = {username: nil, password: nil}.merge opt
+    @username, @password, @schema, @default_key, @json_out = username, 
+        password, schema, default_key, json_out
     @delimiter = ''
     @spaces_delimited = false
     @order = 'ascending'
     @limit = nil
     @records, @flat_records = [], []
+    @json_out = json_out
 
     openx(rawx.clone) if rawx
     #@logger.debug 'doc: ' + @doc.xml.inspect
@@ -221,6 +224,8 @@ class Dynarex
   end
   
   def to_s
+    
+    @log.debug 'inside to_s'
 
 xsl_buffer =<<EOF
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -246,7 +251,9 @@ EOF
       sumry = summary_fields.map {|x| x.strip!; x + ': ' + \
                                      self.summary[x.to_sym]}.join("\n") + "\n"
     end
-
+    
+    @log.debug 'before @raw_header'
+    
     if @raw_header then
       declaration = @raw_header
     else
@@ -266,6 +273,8 @@ EOF
     end
 
     header = declaration + sumry
+    
+    @log.debug 'after header'
 
     if self.summary[:rawdoc_type] == 'rowx' then
       a = self.fields.map do |field|
@@ -304,15 +313,18 @@ EOF
       header + tfo.display
 
     else
-      
+      @log.debug 'inside else'
       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)
-      
+      @log.debug 'before Rexslt'
+      File.write 'test.xsl', xsl_buffer
+      File.write 'test.xml', @doc.xml
       out = Rexslt.new(xsl_buffer, @doc).to_s
+      @log.debug 'after Rexslt'
       header + "\n" + out
     end
 
@@ -350,6 +362,7 @@ EOF
     xml = display_xml(opt)
     buffer = block_given? ? yield(xml) : xml
     File.write filepath, buffer
+    File.write(filepath.sub(/\.xml$/,'.json'), self.to_json) if @json_out
   end
   
 #Parses 1 or more lines of text to create or update existing records.
@@ -1031,14 +1044,14 @@ EOF
       dynarex_new(s)
               
     elsif s[/^https?:\/\//] then  # url
-      buffer, _ = RXFHelper.read s, {username: @opt[:username], password: @opt[:password]}
+      buffer, _ = RXFHelper.read s, {username: @username, password: @password}
     else # local file
       @local_filepath = s
       
       if File.exists? s then 
         buffer = File.read s
-      elsif @opt[:schema]
-        dynarex_new @opt[:schema], default_key: @opt[:default_key]
+      elsif @schema
+        dynarex_new @schema, default_key: @default_key
       else
         raise DynarexException, 'file not found: ' + s
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   nP4bxzo6o8Qw40KPcv/n3Vcx8tV8hUOOe4XkImYbeWst9hbbHfbg8daipgkn9NEu
   YXuVi+EfN14P6g==
   -----END CERTIFICATE-----
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import
@@ -199,20 +199,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.11
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.11
+        version: 0.6.0
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -243,6 +243,6 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: The Dynarex gem can create, read, update or delete rows of Dynarex flavoured
+summary: The Dynarex gem creates, reads, updates or delete rows of Dynarex flavoured
   XML records.
 test_files: []

metadata.gz.sig

@@ -1,2 +1,2 @@
-u6�"u!�V�D�ɖ�}T�]*9a�A�
-�V�Uz�� �H!:,�0����
�d���������+{��@����>��"-U���+��l���+�cc��o�ߎv�N.�9*}Z�A�.�G��p��� 
w׫1P�VGG�])Ί���߃�k��c�s/���+U�j%�X�5r[1����X!�`���k�4�]^��9c��T�u�h��w�srqSԸ��F�f�;��:���u�(�Juw�s?|�K�Y
+�#��fJ/]��_�����[����+J���i/�M��jt2�Fox���Z�Y �Q~s*�U�����{�Q�H�0��
+�뿵F%Q��w��	{����b�a�H���������߄D7�����Ԣ��igٶ��^�QX�