dynarex 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 497e98c0cc9e83321ab14a3962246040ecd26a96
-  data.tar.gz: aebacc2dd1ff7fffcfd0f2b65c0fef193ab728f1
+  metadata.gz: 4df04d217ba37aaec81bd1956077d25d25b1b0bb
+  data.tar.gz: 0763d0b88a44e339644c14d6e496f8edd66ae50b
 SHA512:
-  metadata.gz: 18feda8c47b940955190d4c03705e93cfeb068fa0eec3e79b97320777cb8842f0d994d5f14f4147467b8dac310d5aa1b0f9f5bba6fa24ef15a38b798620fdb44
-  data.tar.gz: c7058361ee9ab63498f9d0c7d589dc4a5896a2b6a67d6744a4a46576f22df7fb720952fd05235f99a6e3a53c22728b4dd4d33abf2b4572b43b11085490e815ee
+  metadata.gz: 098f64a26a6bdf9079248ba00e4c9c343ddbdce246b09f805082dc3bb0dbcd07b35839ac7c868b213ee9c1786830ef0fd29412d748a87f4f661968095c231f87
+  data.tar.gz: 92fb1437b4c934ad89a807504a9994b6a92fcf11c3838caa95133a3360cb260964c23ada90b95f792d1a5337875ad6588f618cf82a1f3623cc46c8b7a310dc25

data.tar.gz.sig

@@ -1,2 +1,2 @@
-{�_M-re�E����1w�Gr������q�]�F;v��'����C��{��0$uk�0���&�4�p��z�*
`���ݤS�(V|���J��k�"ٳj�\��ns���0�dn���H/�<�Q�a�00/!�/�g�p�a+�h�$s�M���(�^��� �+����J(�kמ��t��nw=cN���˓ۅ�m��C�Q�@
-o����gg���)�FT
+�ؘX�B�Na=*Y��.�m?�����H<R/=�)�0�W���"���j�~ �}��O�jTU��H��O�c�0�$��F�q|	�-���e|�K�
+a8p3[�P�Sr������da�H� !t�0�j��ՇyQB;/���ηH巟����z�����4�N�H��/���f�T�;�#;`���@�V��9�\4>j�Y��N)

data/lib/dynarex.rb

@@ -38,7 +38,10 @@ class Dynarex
 #    Dynarex.new '<contacts><summary><schema>contacts/contact(name,age,dob)</schema></summary><records/></contacts>'
 
   def initialize(rawx=nil, opt={})
-    
+
+    #File.write '/tmp/d.log',''
+    #@logger  = Logger.new '/tmp/d.log','daily'
+    #@logger.debug 'inside intialize'
     @opt = {username: nil, password: nil}.merge opt
     @delimiter = ''
     @spaces_delimited = false
@@ -47,6 +50,7 @@ class Dynarex
     @records, @flat_records = [], []
 
     openx(rawx.clone) if rawx
+    #@logger.debug 'doc: ' + @doc.xml.inspect
 
   end
 
@@ -204,11 +208,18 @@ class Dynarex
 
   def to_html(domain: '')
     xsl_buffer = RXFHelper.read(domain + @xslt).first
-    #jr100316 xslt  = Nokogiri::XSLT(xsl_buffer)
-    #jr100316 xslt.transform(Nokogiri::XML(@doc.to_s)).to_s 
     Rexslt.new(xsl_buffer, @doc).to_s
   end      
   
+  def to_json(pretty: false)
+    
+    records = self.to_h
+    summary = self.summary.to_h
+
+    h = {summary: summary, records: records}
+    pretty ? JSON.pretty_generate(h) : h.to_json
+  end
+  
   def to_s
 
 xsl_buffer =<<EOF
@@ -279,7 +290,8 @@ EOF
 
       xslt_format = a.join      
 
-      xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)      
+      xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
+      File.write '/home/james/liveblog2.xsl', xsl_buffer      
       out = Rexslt.new(xsl_buffer, @doc).to_s
       
       header + "--#\n" + out
@@ -547,16 +559,8 @@ EOF
       end
     end
 
-    #File.open('dynarex.xsl','w'){|f| f.write xslt}
-    #File.open('dynarex.xml','w'){|f| f.write doc.xml}
-    #xml = Rexslt.new(xslt, doc.xml).to_s
-#=begin
-    #jr100316 xslt  = Nokogiri::XSLT(xslt)
-    #jr100316 out = xslt.transform(Nokogiri::XML(doc.root.xml)).to_xml \
-    #jr100316              :save_with => Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
+
     out = Rexslt.new(xslt, @doc).to_s(declaration: false)
-    
-#=end
 
     #Rexle.new("<rss version='2.0'>%s</rss>" % xml).xml(pretty: true)
 
@@ -596,6 +600,7 @@ EOF
   end
 
   def findx_by(field, value)
+    #@logger.debug "field: #{field.inspect}, value: #{value.inspect}"
     (load_records; rebuild_doc) if @dirty_flag == true
     r = @doc.root.element("records/*[#{field}=\"#{value}\"]")
     r ? recordx_to_record(r) : nil
@@ -629,17 +634,18 @@ EOF
   end
   
   def display_xml(options={})
-
+    #@logger.debug 'inside display_xml'
     opt = {unescape_html: false}.merge options
     
     state = :external
-    
+    #@logger.debug 'before diry'
     if @dirty_flag == true then
       load_records 
       state = :internal
     end
-    
+    #@logger.debug 'before rebuilt'
     doc = rebuild_doc(state)
+    #@logger.debug 'after rebuild_doc'
     
     if opt[:unescape_html] == true then
       doc.content(opt)
@@ -1008,9 +1014,10 @@ EOF
   end
   
   def openx(s)
-
+    #@logger.debug 'inside openx'
     if s[/</] then # xml
-
+      #@logger.debug 'regular string'
+      #@logger.debug 's: ' + s.inspect
       buffer = s
               
     elsif s[/[\[\(]/] # schema
@@ -1030,6 +1037,7 @@ EOF
         raise DynarexException, 'file not found: ' + s
       end
     end
+    #@logger.debug 'buffer: ' + buffer[0..120]
 
     if buffer then
 
@@ -1037,6 +1045,7 @@ EOF
       @xslt = raw_stylesheet[/href=["']([^"']+)/,1] if raw_stylesheet
       
       @doc = Rexle.new(buffer) unless @doc      
+      #@logger.debug 'openx/@doc : ' + @doc.xml.inspect
     end
     
     return if @doc.root.nil?
@@ -1130,6 +1139,7 @@ EOF
 
     i = @doc.root.xpath('max(records/*/attribute::id)') || 0
     records = @doc.root.xpath('records/*')
+    #@logger.debug 'records: ' + records.inspect
     records = records.take @limit if @limit
 
     recs = records #jr160315 (order == :descending ? records.reverse : records)
@@ -1161,7 +1171,9 @@ EOF
 
       attributes = row.attributes
       result.merge body[@default_key.to_sym] => attributes.merge({id: id, body: body})
-    end    
+    end
+    #@logger.debug 'a: ' + a.inspect
+    a
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   nP4bxzo6o8Qw40KPcv/n3Vcx8tV8hUOOe4XkImYbeWst9hbbHfbg8daipgkn9NEu
   YXuVi+EfN14P6g==
   -----END CERTIFICATE-----
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import
@@ -79,20 +79,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.3
   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.0
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: dynarex-xslt
   requirement: !ruby/object:Gem::Requirement
@@ -119,20 +119,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rxraw-lineparser
   requirement: !ruby/object:Gem::Requirement
@@ -159,20 +159,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: table-formatter
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1,4 +1,2 @@
-\��`;�8�D��B�6xO5EJ�(�FHE�E3��X6+�@{kvQ�M5�gtC��
-l
-�s�	�k<#|R�릮�s����|-�B�r��6+�S"y2�8W�I��"~��O�����@�������+���ټ{`C
-���ѯ�.���{���wnξq6���u��Y-���A���!��,E��'���r�FشΈW�;z�.C!��kc7��D�O�~N����d*v�e�Vȼ�jb,��8	��53�nj
+Q3���Q�٨Ü�_�;/$��B�J&�	PM���^�|�3��Xr���h��nV��������A���D`�-o�]���ϻ��������1[
+DkKnr�湤y�~I���$�Pv�L��