dynarex 1.5.41 → 1.5.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 842bde190d3cb79c50892bc960f7f31fcf918319
-  data.tar.gz: 9e16299717daf5f49463324dbe62878d40bc525a
+  metadata.gz: 57081646a9a8b349a8fb4e204f71aa8f28b81604
+  data.tar.gz: b9ed9c832cf3dc9c249fa9df8211852af17cfb5c
 SHA512:
-  metadata.gz: 6731218f52c4d9cfa89a92550b09ef712bef397d9241e0a8651f85c851f4b34c5b26bb931b56b8fdd9d300ec529b633160d8eeedae94196b6c51bd32b117cd87
-  data.tar.gz: 154490d98941e7a4b65e6d6cb3c248708238d6c6c060f15122f1fe931ce518aa1376bbca5a58bf3d1ef6dd40db43ba268a9a9e797b0e17a052bce2c75d638774
+  metadata.gz: 9441eb13e214b144bf12af9b11d3cc0d085ce4052c70eb3055522cefaa694e7a1cefd1b89bc52593cba233882d49fbcf70d576111171ef53f259f346c8a19b83
+  data.tar.gz: 0decd6196dbeeb393755d637a4fd647f3a75c371f5af39754c21215dd71f4d4c5a66d442aa48042aa023b696e4a7f6920b2ab4d87c612ca91f2b3f170fce9a2b

data/lib/dynarex.rb

@@ -27,7 +27,7 @@ end
 class Dynarex
 
   attr_accessor :format_mask, :delimiter, :xslt_schema, :schema, :linked,
-      :order, :type, :limit_by, :xslt
+      :order, :type, :limit, :xslt
   
   
 #Create a new dynarex document from 1 of the following options:
@@ -44,14 +44,9 @@ class Dynarex
     @delimiter = ''
     @spaces_delimited = false
     @order = 'ascending'
+    @limit = nil
 
     openx(rawx.clone) if rawx
-=begin 160315
-    if @order == 'descending' then
-      @records = records_to_h(:descending) 
-      rebuild_doc
-    end
-=end    
 
   end
 
@@ -122,15 +117,9 @@ class Dynarex
     
   def order=(value)
     
-    self.summary.merge!({order: value})    
-=begin    jr 160315
-    if @order == 'ascending' and value == 'descending' then
-      sort_records
-    elsif @order == 'descending' and value == 'ascending'
-      sort_records
-    end    
-=end    
-    @order = value
+    self.summary.merge!({order: value.to_s})    
+
+    @order = value.to_s
   end
   
   def recordx_type()
@@ -147,10 +136,6 @@ class Dynarex
     @summary[:type] = v
   end
   
-  def limit_by=(val)
-    @limit_by = val.to_i
-  end
-
   # Returns the hash representation of the document summary.
   #
   def summary
@@ -700,12 +685,20 @@ EOF
   def display_xml(options={})
 
     opt = {unescape_html: false}.merge options
-    load_records if @dirty_flag == true
-    doc = rebuild_doc(:external)
+    
+    state = :external
+    
+    if @dirty_flag == true then
+      load_records 
+      state = :internal
+    end
+    
+    doc = rebuild_doc(state)
+    
     if opt[:unescape_html] == true then
-      doc.content(opt) #jr230711 pretty: true
+      doc.content(opt)
     else
-      doc.xml(opt) #jr230711 pretty: true      
+      doc.xml(opt)
     end
   end
 
@@ -951,7 +944,6 @@ EOF
     h.each {|key, item| h.delete(key) if not h2.has_key? key}
 
     @flat_records = @records.values.map{|x| x[:body]}
-    @flat_records = @flat_records.take @limit_by if @limit_by
 
     rebuild_doc
     self
@@ -1101,8 +1093,7 @@ EOF
   def load_records
 
     @records = records_to_h
-
-    @records = @records.take @limit_by if @limit_by
+    
     
     @records.instance_eval do
        def delete_item(i)
@@ -1123,6 +1114,7 @@ EOF
 
     i = @doc.root.xpath('max(records/*/attribute::id)') || 0
     records = @doc.root.xpath('records/*')
+    records = records.take @limit if @limit
 
     recs = records #jr160315 (order == :descending ? records.reverse : records)
     a = recs.inject({}) do |result,row|

metadata

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