dynarex 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85c84a866f5477515ee7d711d97ac69d3cadf746
-  data.tar.gz: ff46fda368a4a1032d2e11b260c63d545555f7fc
+  metadata.gz: 57b0819d94ee366e3dd26ba97373908cb8683c06
+  data.tar.gz: 492090c76d41b762771724111fd3369eeaa7b50a
 SHA512:
-  metadata.gz: da8ade306d95cd031896f6fce0342d72d7003c5cb5de99d9098f4d811436d41a2b14db0b46e4940b51d6548c221d7221be161ae5fd10c5cd65f672037e215bee
-  data.tar.gz: 43655dd4cdaae682515dcec0d62bcbe5623bc225f2e9de89849104b0dcdeae8cce3a99133626efa2e05509a500755a5dfe0940e793ad24c4e9143c9d5fd1041b
+  metadata.gz: 5f0c3dbfd05f038e9783ddf43dc5f9922ca824d4f0dbd488a0673f8d8b9905745faa8ea13ee80f86a11a7949a58cf2e435a86113a7502c74646fe1fca257aab6
+  data.tar.gz: ba3039fcffe2b1a6da4e7aafd03adebc5fb16477da00139f5c0a97fce0ed5470693f88d487231967a82ecc7c02814525b05db47ef383d77cc1f55e12541a40db

data/lib/dynarex.rb

@@ -16,6 +16,7 @@ require 'rowx'
 require 'nokogiri'
 require 'ostruct'
 require 'table-formatter'
+require 'rxfhelper'
 
 
 class DynarexException < Exception
@@ -39,14 +40,15 @@ class Dynarex
   def initialize(rawx=nil, opt={})
     
     @opt = {username: nil, password: nil}.merge opt
-    #puts Rexle.version
-    @delimiter = ''   
+    @delimiter = ''
+
     openx(rawx.clone) if rawx
+
     if @order == 'descending' then
       @records = records_to_h(:descending) 
       rebuild_doc
     end
-    #jr240913 @dirty_flag = false
+
   end
 
   def add(x)
@@ -192,9 +194,6 @@ xsl_buffer =<<EOF
 EOF
 
 
-    #format_mask = XPath.first(@doc.root, 'summary/format_mask/text()').to_s
-    #format_mask = @doc.root.element('summary/format_mask/text()')
-
     raw_summary_fields = self.summary[:schema][/^\w+\[([^\]]+)\]/,1]
     sumry = ''
     
@@ -281,14 +280,17 @@ EOF
     @local_filepath = filepath
     xml = display_xml(opt)
     buffer = block_given? ? yield(xml) : xml
-    File.open(filepath,'w'){|f| f.write buffer }
+    File.write filepath, buffer
   end
   
 #Parses 1 or more lines of text to create or update existing records.
 
   def parse(x=nil)
-    if x.is_a? String then
-      buffer = x.clone
+    
+    raw_buffer, type = RXFHelper.read(x)
+
+    if raw_buffer.is_a? String then
+      buffer = raw_buffer.clone
       buffer = yield if block_given?          
       string_parse buffer
     else
@@ -305,12 +307,10 @@ EOF
 
   def create(arg, id=nil)
     raise 'Dynarex#create(): input error: no arg provided' unless arg
-    #jr291012 rebuild_doc()
-    #jr291012 (load_records; rebuild_doc) if @dirty_flag == true
+
     methods = {Hash: :hash_create, String: :create_from_line}
     send (methods[arg.class.to_s.to_sym]), arg, id
 
-    #jr291012load_records
     @dirty_flag = true
 
     self
@@ -405,10 +405,12 @@ EOF
 
         @summary.each do |key,value|
 
-          xml.send key, value.gsub('>','&gt;')\
+          v = value.gsub('>','&gt;')\
             .gsub('<','&lt;')\
             .gsub(/(&\s|&[a-zA-Z\.]+;?)/) {|x| x[-1] == ';' ? x : x.sub('&','&amp;')}
 
+          xml.send key, v
+
         end
       end
 
@@ -421,11 +423,11 @@ EOF
         xml.records do
            
           records.each do |k, item|
-            #p 'foo ' + item.inspect
+
             xml.send(@record_name, {id: item[:id], created: item[:created], \
                 last_modified:  item[:last_modified]}, '') do
               item[:body].each do |name,value| 
-                #name = name.to_s.prepend('._').to_sym if reserved_keywords.include? name
+
                 name = ('._' + name.to_s).to_sym if reserved_keywords.include? name
                 val = value.send(value.is_a?(String) ? :to_s : :to_yaml)                
                 xml.send(name, val.gsub('>','&gt;')\
@@ -445,7 +447,7 @@ EOF
     end
 
     doc = Rexle.new(a)
-
+    
     if @xslt then
       doc.instructions = [['xml-stylesheet', 
         "title='XSL_formatting' type='text/xsl' href='#{@xslt}'"]]
@@ -645,6 +647,7 @@ EOF
 
       r = header.scan(/#{r1}|#{r2}/).map(&:compact).flatten      
       r.each do |x|
+
         attr, val = x.split(/\s*=\s*["']/,2)
         self.method((attr + '=').to_sym).call(unescape val)
       end
@@ -655,11 +658,7 @@ EOF
     i = @doc.root.xpath('max(records/*/attribute::id)').to_i
     
     raw_summary = schema[/\[([^\]]+)/,1]
-    #rowx = buffer[/--\+.*/m]
 
-    #buffer = rowx if rowx
-    
-    #jr061013 raw_lines = buffer.gsub(/^\s*#[^\n]+/,'').lines.to_a
     raw_lines = buffer.lines.to_a
 
     if raw_summary then
@@ -716,7 +715,7 @@ EOF
     raw_lines.shift while raw_lines.first.strip.empty?
 
     lines = case raw_lines.first.chomp
-      
+
       when '---'
 
         yaml = YAML.load raw_lines.join("\n")
@@ -815,6 +814,7 @@ EOF
     end
 
     a = lines.map.with_index do |x,i| 
+      
       created = Time.now.to_s
 
       h = Hash[
@@ -830,7 +830,7 @@ EOF
     end
 
     h2 = Hash[a]
-    
+
     #replace the existing records hash
     h = @records
     i = 0
@@ -850,8 +850,7 @@ EOF
     end    
 
     h.each {|key, item| h.delete(key) if not h2.has_key? key}
-    #refresh_doc
-    #load_records  
+
     @flat_records = @records.values.map{|x| x[:body]}
     @flat_records = @flat_records.take @limit_by if @limit_by
 
@@ -889,7 +888,6 @@ EOF
     @summary.merge!({recordx_type: 'dynarex', format_mask: format_mask, schema: s})
     @records = {}
     @flat_records = {}
-    
     rebuild_doc
 
   end
@@ -903,9 +901,13 @@ EOF
     if s[/</] then # xml
 
       buffer = s
+              
     elsif s[/[\[\(]/] # schema
+
       dynarex_new(s)
+              
     elsif s[/^https?:\/\//] then  # url
+
       buffer = Kernel.open(s, 'UserAgent' => 'Dynarex-Reader',\
           http_basic_authentication: [@opt[:username], @opt[:password]]).read
     else # local file
@@ -915,16 +917,18 @@ EOF
     end
 
     if buffer then
+
       raw_stylesheet = buffer.slice!(/<\?xml-stylesheet[^>]+>/)
       @xslt = raw_stylesheet[/href=["']([^"']+)/,1] if raw_stylesheet
       
       @doc = Rexle.new(buffer) unless @doc      
     end
-    
-    @schema = @doc.root.text('summary/schema')
+
+    e = @doc.root.element('summary')
+    @schema = e.text('schema')
     @root_name = @doc.root.name
     @summary = summary_to_h
-    
+
     summary_methods = (@summary.keys - self.public_methods)
     
     summary_methods.each do |x|
@@ -944,11 +948,12 @@ EOF
 
     @order = @summary[:order] if @summary.has_key? :order
 
-    @default_key = @doc.root.element('summary/default_key/text()') 
-    @format_mask = @doc.root.element('summary/format_mask/text()')
-   
+
+    @default_key = e.text('default_key')
+    @format_mask = e.text('format_mask')
+
     @fields = @schema[/([^(]+)\)$/,1].split(/\s*,\s*/).map(&:to_sym)
- 
+
     @fields << @default_key if @default_key and \
                         !@fields.include? @default_key.to_sym
 
@@ -1002,7 +1007,6 @@ EOF
   def records_to_h(state=:ascending)
 
     i = @doc.root.xpath('max(records/*/attribute::id)') || 0
-    #jr090813 fields = @doc.root.text('summary/schema')[/\(.*\)/].scan(/\w+/)
     records = @doc.root.xpath('records/*')
 
     recs = (state == :descending ? records.reverse : records)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   SLshUY2PSjSnVYx3Gln9vzST8CSTQPZbVpDfzbTqqAZnzqhIe2UaLbzGCMoz8kbw
   jQ7NXbu03ZrsvQ==
   -----END CERTIFICATE-----
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.39
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.39
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: dynarex-import
   requirement: !ruby/object:Gem::Requirement
@@ -79,40 +79,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        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.6
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rexslt
   requirement: !ruby/object:Gem::Requirement
@@ -199,20 +199,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +253,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.13
+- !ruby/object:Gem::Dependency
+  name: rxfhelper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.14
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.14
 description: 
 email: james@r0bertson.co.uk
 executables: []