dynarex 1.5.44 → 1.5.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1c986b9441b99e1547f35ee19d77b76040b21ef
-  data.tar.gz: 02622b66cc1a6f205a30d8379869d0a813306c0d
+  metadata.gz: 66b00f71bc1dc1e06868ff15f64a7ceeadcb023a
+  data.tar.gz: b5db365240c1d6b8381e48e3708f5a325d8d5a51
 SHA512:
-  metadata.gz: a45c1a8f2f09145a603afc65b0524d8ce320fd1d8ac07d02b1a6c0db6921db93a6680eafe04eddec5916004356ab0cabae7b569f768e449405763afb352416f9
-  data.tar.gz: 082274e61e178944ed177498ed61aa2e30cd5b5c7dd916a7b2cdd49755a521381726676d4791053eb10721fb5c919a53e7a77779b5b76d4c7d2e728cc50a98e4
+  metadata.gz: ec67afb8e2ad43cf5a0dfad45bbae7a6f64cd88fd162cefe50e46184fae69cb66782b88bca581967d784defc5279adf06caae4893759d240bb2f3cd05b49a119
+  data.tar.gz: 04bbbbe1d69047d83e73c3f870897a6003e3d63f83c364722a45a9a8351a93cf1c8c38ca89fecdea61b0362c1c9d718f3c903044accbd9d5963929c47e642e2b

data/lib/dynarex.rb

@@ -465,7 +465,7 @@ EOF
 
     @doc.root.add records
 
-    load_records
+    load_records if @dirty_flag
     self
   end  
 
@@ -576,10 +576,6 @@ EOF
       h = {limit: 11}.merge(opt)
       doc = Rexle.new(self.to_xslt)
       e = doc.element('//xsl:apply-templates[2]')
-
-      #jr311015 order = self.order || 'descending'
-      #jr311015 doc2 = Rexle.new "<xsl:sort order='#{order}' data-type='number' select='@id'/>"
-      #jr311015 e.add doc2.root
       
       e2 = doc.root.element('xsl:template[3]')
       item = e2.element('item')
@@ -816,35 +812,6 @@ EOF
                                                              or @summary[:xsl]
     end
 
-=begin 170315
-    if @type == 'checklist' then
-      
-      # extract the brackets from the line
-
-      checked = []
-      raw_lines.map! do |x| 
-        raw_checked, raw_line = x.partition(/\]/).values_at 0,2
-        checked << (raw_checked[/x/] ? true : false)
-        raw_line
-      end
-
-    end
-
-
-    if @order == 'descending' then
-      rl = raw_lines
-
-      if rl.first =~ /--/ then
-        raw_lines = [rl[0]] + rl[1..-1].each_slice(@fields.count).inject([])\
-            {|r,x| r += x.reverse }.reverse
-      else
-        raw_lines = rl.each_slice(@fields.count).inject([])\
-            {|r,x| r += x.reverse }.reverse
-      end
-      checked.reverse! if @type == 'checklist'
-      
-    end    
-=end
     @summary[:recordx_type] = 'dynarex'
     @summary[:schema] = @schema
     @summary[:format_mask] = @format_mask
@@ -1100,9 +1067,11 @@ EOF
 
   def load_records
 
-    @records = records_to_h
-    
+    @dirty_flag = false
+    self.sort_by! {|x| x.element(@default_key.to_s).text } if @summary.has_key? :order    
     
+    @records = records_to_h
+      
     @records.instance_eval do
        def delete_item(i)
          self.delete self.keys[i]
@@ -1111,7 +1080,7 @@ EOF
       
     #Returns a ready-only snapshot of records as a simple Hash.
     @flat_records = @records.values.map{|x| x[:body]}
-    @dirty_flag = false
+
   end
 
   def display()

metadata

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