dynarex 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e08090973a91214fcbeb4a90a977d807df41aa8cb6a09a5e190a490755c13a9c
-  data.tar.gz: c5fbf4b0c7fc003735bedd57485e95eb877b2f1c22c7f2c5198baade4873ee26
+  metadata.gz: e8ef98976afc4fcc30bb3f964d33ddc30bae0c4b84f2631cdd2f134e4ac6af48
+  data.tar.gz: f9be49ef4a36640b96543dbecf9f9b625ae94d451c81e2e116b84dbdbc55df5f
 SHA512:
-  metadata.gz: cea2e080fc4911d1007bce2c97f4d21c7763be227d956a7816f527d2f4261bd6af7cc024a58a9ce895b68786544684cc73487f21ddf425cb698b4d33c7de48fd
-  data.tar.gz: 454ab3e2ab145a18177a6fb9b72add99706d8f9587c0a17a4e1a506afc96f9fc7ee97d18453c91c3835192ae3525d271b798584681f3570137fae28b008c1f6c
+  metadata.gz: ec3763b8c3621c6c69db7d86cd32e44b2f0d29d2a050044d937b89f0f4196c8c7b1488ddf0a359a4fac82a651c297b3c7665bbfbeaff415b1d09f8681dca8928
+  data.tar.gz: 52961337168cb97e0991a3df28aba516ac6eed1931ee6ffb978bca71a55358aea0a74c4e7433af7002b9a637da0aec990ed4b2c29c33a051022cc8a2dbeb8fae

data/lib/dynarex.rb

@@ -74,14 +74,19 @@ class Dynarex
     puts 'inside Dynarex::initialize' if debug
     @username, @password, @schema, @default_key, @json_out, @debug = username, 
         password, schema, default_key, json_out, debug
-    
+    puts '@debug: ' + @debug.inspect if debug
     @delimiter = delimiter
     @spaces_delimited = false
     @order = 'ascending'
     @limit = nil
     @records, @flat_records = [], []
 
-    openx(rawx.clone) if rawx
+    if rawx then
+      
+      return import(rawx) if rawx =~ /\.txt$/
+      openx(rawx.clone) 
+      
+    end
 
   end
 
@@ -405,15 +410,23 @@ EOF
     display_xml(opt)
   end
   
-#Save the document to a local file.  
+# Save the document to a file.  
   
   def save(filepath=nil, options={})
-
+    
+    puts 'inside Dynarex::save' if @debug
+    
     opt = {pretty: true}.merge options
     filepath ||= @local_filepath
     @local_filepath = filepath
     xml = display_xml(opt)
     buffer = block_given? ? yield(xml) : xml
+    
+    if @debug then
+      puts 'before write; filepath: ' + filepath.inspect
+      puts 'buffer: ' + buffer.inspect
+    end
+    
     FileX.write filepath, buffer
     FileX.write(filepath.sub(/\.xml$/,'.json'), self.to_json) if @json_out
   end
@@ -457,6 +470,7 @@ EOF
 
   def create(obj, id: nil, custom_attributes: {})
 
+    puts 'inside create' if @debug
     raise 'Dynarex#create(): input error: no arg provided' unless obj
     
     case obj.class.to_s.downcase.to_sym    
@@ -720,7 +734,9 @@ EOF
 
   def hash_create(raw_params={}, id=nil, attr: {})
 
+    puts 'inside hash_create' if @debug
     record = make_record(raw_params, id, attr: attr)
+    puts 'record: '  + record.inspect
     method_name = @order == 'ascending' ? :add : :prepend
     @doc.root.element('records').method(method_name).call record
 
@@ -1132,7 +1148,10 @@ EOF
     elsif s[/^(?:http|df)s?:\/\//] then  # url
       buffer, _ = RXFHelper.read s, {username: @username, 
                                      password: @password, auto: false}
+      @local_filepath = s if s =~ /^dfs:\/\/.*\.xml$/
+      
     else # local file
+      
       @local_filepath = s
       
       if File.exists? s then 
@@ -1144,6 +1163,8 @@ EOF
       end
     end
     #@logger.debug 'buffer: ' + buffer[0..120]
+    
+    return import(buffer) if buffer =~ /^<\?dynarex\b/
 
     if buffer then
 
@@ -1279,6 +1300,8 @@ EOF
       attributes = row.attributes
       result.merge body[@default_key.to_sym] => attributes.merge({id: id, body: body})
     end
+    
+    puts 'records_to_h a: ' + a.inspect if @debug
     #@logger.debug 'a: ' + a.inspect
     a
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   +2pKHQJfU1lEmVoo4afsLMvmq/CZPJba1LR3Z1QJXYCWt9IEZTECStKlK7H6RiIx
   gRA=
   -----END CERTIFICATE-----
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import