dynarex 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9add011144a343e154c246b3487f03572064e002
-  data.tar.gz: 47a34797d586426cf694aefb857c9ded547744ec
+  metadata.gz: d56acd1bf4c6610a466ce814862ad922bddc9089
+  data.tar.gz: c7c244fdeb6d457ab69e660b615351dcb51e3178
 SHA512:
-  metadata.gz: 2336188485516cc1f8419affdc99ecd914f51f0a8502565ce199d36c0975980ce1ad160d2ba22c71b99c7b6542dcb0633aa81d90f82dcb33e5252988c8d116c0
-  data.tar.gz: d13573e3b641ee5a2c500f593581e458288f598c5dd24910aa3180de2bed4312d2b856f40c7b47bb85a32db9a5cbb7c11bd01a5645b6f3c48eeeccdb5f31b5a9
+  metadata.gz: 10570bb1492398195085b3b5e17e5245f9d36a3c1ac8db614a3b5dca51c8a39cf016d69b543cb758450dadcb3037f5c2223dfbab832d4b04544ed82f90d55587
+  data.tar.gz: 5061e3cef44d759108c09fac1434f15f9254aacef197aae2dbd25254dc9e6c08289d31bda29f9bc28c2ef17353e35f3201a9c0783ac1c2125fef0a74152a5532

data/lib/dynarex.rb

@@ -458,96 +458,13 @@ EOF
   end    
   
   def sort_by!(&element_blk)
-    refresh_doc
-    a = @doc.root.xpath('records/*').sort_by &element_blk
-    @doc.root.delete('records')
-
-    records = Rexle::Element.new 'records'
-
-    a.each {|record| records.add record}
 
-    @doc.root.add records
+    r = sort_records_by! &element_blk
+    @dirty_flag = true    
+    r
 
-    load_records if @dirty_flag
-    self
   end  
 
-  def rebuild_doc(state=:internal)
-
-    reserved_keywords = ( 
-                          Object.public_methods | \
-                          Kernel.public_methods | \
-                          public_methods + [:method_missing]
-                        )
-    
-    xml = RexleBuilder.new
-
-    a = xml.send @root_name do
-
-      xml.summary do
-
-        @summary.each do |key,value|
-
-          v = value.gsub('>','>')\
-            .gsub('<','&lt;')\
-            .gsub(/(&\s|&[a-zA-Z\.]+;?)/) {|x| x[-1] == ';' ? x \
-                                                      : x.sub('&','&amp;')}
-
-          xml.send key, v
-
-        end
-      end
-
-      records = @records.to_a
-
-      if records then
-
-        #jr160315records.reverse! if @order == 'descending' and state == :external
-
-        xml.records do
-           
-          records.each do |k, item|
-            
-            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| 
-
-                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| 
-                    x[-1] == ';' ? x : x.sub('&','&amp;')
-                  end
-                )
-              end
-            end
-          end
-
-        end
-      else
-        xml.records
-      end # end of if @records
-    end
-
-    doc = Rexle.new(a)
-    
-    if @xslt then
-      doc.instructions = [['xml-stylesheet', 
-        "title='XSL_formatting' type='text/xsl' href='#{@xslt}'"]]
-    end
-
-    return doc if state != :internal
-    @doc = doc
-  end
   
   def record(id)
     e = @doc.root.element("records/*[@id='#{id}']")    
@@ -753,6 +670,83 @@ EOF
 
   end
   
+  def rebuild_doc(state=:internal)
+
+    reserved_keywords = ( 
+                          Object.public_methods | \
+                          Kernel.public_methods | \
+                          public_methods + [:method_missing]
+                        )
+    
+    xml = RexleBuilder.new
+
+    a = xml.send @root_name do
+
+      xml.summary do
+
+        @summary.each do |key,value|
+
+          v = value.gsub('>','&gt;')\
+            .gsub('<','&lt;')\
+            .gsub(/(&\s|&[a-zA-Z\.]+;?)/) {|x| x[-1] == ';' ? x \
+                                                      : x.sub('&','&amp;')}
+
+          xml.send key, v
+
+        end
+      end
+
+      records = @records.to_a
+
+      if records then
+
+        #jr160315records.reverse! if @order == 'descending' and state == :external
+
+        xml.records do
+           
+          records.each do |k, item|
+            
+            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| 
+
+                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| 
+                    x[-1] == ';' ? x : x.sub('&','&amp;')
+                  end
+                )
+              end
+            end
+          end
+
+        end
+      else
+        xml.records
+      end # end of if @records
+    end
+
+    doc = Rexle.new(a)
+    
+    if @xslt then
+      doc.instructions = [['xml-stylesheet', 
+        "title='XSL_formatting' type='text/xsl' href='#{@xslt}'"]]
+    end
+
+    return doc if state != :internal
+    @doc = doc
+  end  
+  
   def string_parse(buffer)
     
     if @spaces_delimited then
@@ -926,6 +920,22 @@ EOF
     rebuild_doc
     self
   end
+  
+  def sort_records_by!(&element_blk)
+    
+    refresh_doc
+    a = @doc.root.xpath('records/*').sort_by &element_blk
+    @doc.root.delete('records')
+
+    records = Rexle::Element.new 'records'
+
+    a.each {|record| records.add record}
+
+    @doc.root.add records
+
+    load_records if @dirty_flag
+    self
+  end    
 
   def unescape(s)
     s.gsub('&lt;', '<').gsub('&gt;','>')
@@ -1071,7 +1081,11 @@ EOF
   def load_records
 
     @dirty_flag = false
-    self.sort_by! {|x| x.element(@default_key.to_s).text } if @summary.has_key? :order    
+    
+    if @summary[:order] then
+      orderfield = @summary[:order][/(\w+)\s+(?:ascending|descending)/,1] 
+      self.sort_records_by! {|x| x.element(orderfield).text }  if orderfield
+    end
     
     @records = records_to_h
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - James Robertson