dynarex 1.5.18 → 1.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73fd9467bb98a27d03b5509cf2d4bcfa1a0f0f96
-  data.tar.gz: 8814042d4df5443adc0ed128dfe95d1f8264459a
+  metadata.gz: 5412b392093ede04ff5061ae7c4e97a82a1b3c93
+  data.tar.gz: d8e04e710ae9180f73905598facdedd7c94bdf08
 SHA512:
-  metadata.gz: d1d796de08476c645b5f053c5f64bec2de50897b38a0a3509f690e62a114f9cb65ba8bb52b7a51f83766abc867487c59080d1bb00425bfbb4a555375be4ba569
-  data.tar.gz: e33d5a6bee3de8e32dcc67a62a9bcc106f6b4f290d463936e54dd607ad3455460e0c4ecd24e424383743deb94b0b2fbf2defbe759636492e7be21eb6e9f2e2b1
+  metadata.gz: 7cfd1f2b63e4dae8648703147b5947729652710b74cbb22cc7ea21af7e87b88c04f6cdf74c3290ef76aed0e34057cd4b74fd6d6292ac782ca148ef7daba08dca
+  data.tar.gz: 22828e1113885ed6eb297095f9d93b301feeba8f98445222b66b5ccc366bd9625189a4106eb8baf24d4a32e20db91cf2654cad45708dd59d18058f9cfe6cb5cd

data.tar.gz.sig

@@ -1,3 +1 @@
-��$�ߣB^�U�t~�aG�D��e��G�9���vB��c
-Q�
-~P9�mAi�"��*��
+�������n�������9�4�������~͕��w�yJYa�6��s��6w����0���e��1bM����<Ev��a�MTWae��M���F�(

data/lib/dynarex.rb

@@ -311,14 +311,13 @@ EOF
 #Parses 1 or more lines of text to create or update existing records.
 
   def parse(x=nil)
-    #log = Logger.new('/home/james/mm.log')
-    #log.debug('dynarex: inside parse()')
+
     raw_buffer, type = RXFHelper.read(x)
 
     if raw_buffer.is_a? String then
       buffer = raw_buffer.clone
       buffer = yield if block_given?          
-      #log.debug('dynarex: before string_parse()')
+
       string_parse buffer
     else
       foreign_import x
@@ -450,9 +449,14 @@ EOF
         xml.records do
            
           records.each do |k, item|
-
-            xml.send(@record_name, {id: item[:id], created: item[:created], \
-                last_modified:  item[:last_modified]}, '') do
+            
+            attributes = {}
+            
+            item.keys.each do |key|
+              attributes[key] = item[key] || '' unless key == :body
+            end
+            
+            xml.send(@record_name, attributes) do
               item[:body].each do |name,value| 
 
                 name = ('._' + name.to_s).to_sym if reserved_keywords.include? name
@@ -862,7 +866,7 @@ EOF
     @default_key = default_key if default_key
     
     ptrn = %r((\w+)\[?([^\]]+)?\]?\/(\w+)\(([^\)]+)\))
-    #@log.debug 'inside dynarex_new'
+
     if s.match(ptrn) then
       @root_name, raw_summary, record_name, raw_fields = s.match(ptrn).captures 
       summary, fields = [raw_summary || '',raw_fields].map {|x| x.split(/,/).map &:strip}  
@@ -879,13 +883,13 @@ EOF
     end
 
     format_mask = fields ? fields.map {|x| "[!%s]" % x}.join(' ') : ''
-    #@log.debug 'dynarex_new: before @summary'
+
     @summary = Hash[summary.zip([''] * summary.length).flatten.each_slice(2)\
                     .map{|x1,x2| [x1.to_sym,x2]}]
     @summary.merge!({recordx_type: 'dynarex', format_mask: format_mask, schema: s})
     @records = {}
     @flat_records = {}
-    #@log.debug 'dynarex_new: before rebuild_doc'
+
     rebuild_doc
 
   end
@@ -1008,12 +1012,12 @@ EOF
     puts @doc.to_s
   end
  
-  def records_to_h(state=:ascending)
+  def records_to_h(order=:ascending)
 
     i = @doc.root.xpath('max(records/*/attribute::id)') || 0
     records = @doc.root.xpath('records/*')
 
-    recs = records #jr160315 (state == :descending ? records.reverse : records)
+    recs = records #jr160315 (order == :descending ? records.reverse : records)
     a = recs.inject({}) do |result,row|
 
       created = Time.now.to_s
@@ -1025,9 +1029,6 @@ EOF
         i += 1; id = i.to_s
       end
 
-      created = row.attributes[:created] if row.attributes[:created]
-      last_modified = row.attributes[:last_modified] if row.attributes[:last_modified]
-
       body = (@fields - ['uid']).inject({}) do |r,field|
         
         node = row.element field.to_s
@@ -1043,7 +1044,8 @@ EOF
       
       body[:uid] = id if @default_key == 'uid'
 
-      result.merge body[@default_key.to_sym] => {id: id, created: created, last_modified: last_modified, body: body}
+      attributes = row.attributes
+      result.merge body[@default_key.to_sym] => attributes.merge({id: id, body: body})
     end    
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.5.18
+  version: 1.5.19
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   zafTuKRozNy5wCw7Z32VaDGcJ+yTPq73CrcPrNyaoxqGfU0qNsh6oGvwrq4Q1k4j
   Pz2GWE7KigXTBg==
   -----END CERTIFICATE-----
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import