dynarex 1.5.23 → 1.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2a4f8cb51cbe13c21e47f2836b5abdca7f4c673
-  data.tar.gz: 6e58c34ef2b1897afbd058eafcded7895bc28b20
+  metadata.gz: 194a935aaee6a2c66e74eb482928b27bc4ab2a0c
+  data.tar.gz: c290ab1afefd0583d2f7f47aea711cc08bf56cde
 SHA512:
-  metadata.gz: 4c2e8639d211787319ab3ae4e904f49f2ba92776a3dfd5cc11c8906b8349b637e5b513f8d3522f267a8fee1cf8e12cf1686a739aae403bca51e9ec8056974969
-  data.tar.gz: 8814cbc039a9eed2775a63ffcfed72fc47e19b2109e3a123c3a8f800a71a8a1cf95efa911645a6f44ba42686774472b96c574eec84bfb643d1fd0cab15b333cc
+  metadata.gz: 21c9a98a9dd710e65951f3a2b7a8be4e59621f3685f448d2a3ede9fb380e34d61d27c119895527beb6bb54f8df23fd570a622ad53858acf08e15046554364823
+  data.tar.gz: b3d5a5977c23d5113164cd94c877529549817c21612fc2476ae53e5ead867a3a3fc1e8f113d355c5d47ff3cbeda3ae5faa74340d54a6c0469d2fcb44f508e9de

data/lib/dynarex.rb

@@ -25,7 +25,7 @@ end
 
 class Dynarex
 
-  attr_accessor :format_mask, :delimiter, :xslt_schema, :schema, 
+  attr_accessor :format_mask, :delimiter, :xslt_schema, :schema, :linked,
       :order, :type, :limit_by, :xslt
   
   
@@ -108,6 +108,10 @@ class Dynarex
   def inspect()
     "<object #%s>" % [self.object_id]
   end
+  
+  def linked=(bool)
+    @linked = bool == 'true'
+  end
     
   def order=(value)
     
@@ -264,7 +268,8 @@ EOF
       header + "--#\n" + out.text
     elsif self.delimiter.length > 0 then
 
-      tfo = TableFormatter.new border: false, nowrap: true, divider: self.delimiter
+      tfo = TableFormatter.new border: false, nowrap: true, \
+                                                  divider: self.delimiter
       tfo.source = self.to_h.map{|x| x.values}      
       header + tfo.display
 
@@ -349,7 +354,8 @@ EOF
 #  dynarex.create_from_line 'Tracy 37 15-Jun-1972'  
   
   def create_from_line(line, id=nil, attr: '')
-    t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
+    t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[')\
+                                                                .sub(/\]/,'\]')
     line.match(/#{t}/).captures
     
     a = line.match(/#{t}/).captures
@@ -435,7 +441,8 @@ EOF
 
           v = value.gsub('>','&gt;')\
             .gsub('<','&lt;')\
-            .gsub(/(&\s|&[a-zA-Z\.]+;?)/) {|x| x[-1] == ';' ? x : x.sub('&','&amp;')}
+            .gsub(/(&\s|&[a-zA-Z\.]+;?)/) {|x| x[-1] == ';' ? x \
+                                                      : x.sub('&','&amp;')}
 
           xml.send key, v
 
@@ -461,8 +468,11 @@ EOF
             xml.send(@record_name, attributes) do
               item[:body].each do |name,value| 
 
-                name = ('._' + name.to_s).to_sym if reserved_keywords.include? name
-                val = value.send(value.is_a?(String) ? :to_s : :to_yaml)                
+                if reserved_keywords.include? name then
+                  name = ('._' + name.to_s).to_sym 
+                end
+                
+                val = value.send(value.is_a?(String) ? :to_s : :to_yaml)
                 xml.send(name, val.gsub('>','&gt;')\
                   .gsub('<','&lt;')\
                   .gsub(/(&\s|&[a-zA-Z\.]+;?)/) do |x| 
@@ -605,14 +615,15 @@ EOF
   end
 
   def findx_all_by(field, value)
-    @doc.root.xpath("records/*[#{field}=\"#{value}\"]").map {|x| recordx_to_record x}
+    @doc.root.xpath("records/*[#{field}=\"#{value}\"]")\
+                                             .map {|x| recordx_to_record x}
   end
 
   def recordx_to_record(recordx)
     
     h = recordx.attributes
-    RecordX.new(Hash[*@fields.zip(recordx.xpath("*/text()")).flatten], self, \
-                                        h[:id], h[:created], h[:last_modified])
+    hash = Hash[*@fields.zip(recordx.xpath("*/text()")).flatten]
+    RecordX.new(hash, self, h[:id], h[:created], h[:last_modified])
   end
 
   def hash_create(raw_params={}, id=nil, attr: {})
@@ -625,7 +636,7 @@ EOF
 
   def capture_fields(params)
     fields = Hash[@fields.map {|x| [x,nil]}]
-    fields.keys.each {|key| fields[key] = params[key.to_sym] if params.has_key? key.to_sym}      
+    fields.keys.each {|key| fields[key] = params[key.to_sym] if params.has_key? key.to_sym}
     fields
   end
   
@@ -665,6 +676,26 @@ EOF
 
   alias refresh_doc display_xml
 
+  def parse_links(raw_lines)
+    puts 'raw_lines : '  + raw_lines.inspect
+    raw_lines.map do |line|
+
+      buffer = RXFHelper.read(line.chomp).first
+
+      doc = Rexle.new buffer
+      
+      if doc.root.name == 'kvx' then
+
+        kvx = Kvx.new doc
+        h = kvx.to_h[:body]
+        @fields.inject([]){|r,x| r << h[x]}
+
+      end
+
+    end
+
+  end
+  
   def string_parse(buffer)
 
     buffer.gsub!("\r",'')
@@ -792,25 +823,32 @@ EOF
         
     else
 
-      raw_lines = raw_lines.join("\n").gsub(/^\s*#[^\n]+/,'').lines.to_a        
-      a2 = raw_lines.map.with_index do |x,i|
+      raw_lines = raw_lines.join("\n").gsub(/^(\s*#[^\n]+|\n)/,'').lines.to_a
+      
+      if @linked then
 
-        next if x[/^\s+$|\n\s*#/]
-        
-        begin
+        parse_links(raw_lines)
+
+      else
+        a2 = raw_lines.map.with_index do |x,i|
+
+          next if x[/^\s+$|\n\s*#/]
           
-          field_names, field_values = RXRawLineParser.new(@format_mask).parse(x)
-        rescue
-          raise "input file parser error at line " + (i + 1).to_s + ' --> ' + x
+          begin
+            
+            field_names, field_values = RXRawLineParser.new(@format_mask).parse(x)
+          rescue
+            raise "input file parser error at line " + (i + 1).to_s + ' --> ' + x
+          end
+          field_values
         end
-        field_values
-      end
       
-      a2.compact!
-      a3 = a2.compact.map(&:first)
-      add_id(a2) if a3 != a3.uniq 
+        a2.compact!
+        a3 = a2.compact.map(&:first)
+        add_id(a2) if a3 != a3.uniq 
+        a2
+      end      
 
-      a2
     end
 
     a = lines.map.with_index do |x,i| 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.5.23
+  version: 1.5.24
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   zafTuKRozNy5wCw7Z32VaDGcJ+yTPq73CrcPrNyaoxqGfU0qNsh6oGvwrq4Q1k4j
   Pz2GWE7KigXTBg==
   -----END CERTIFICATE-----
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import