polyrex 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 530e9d5026fa2ee7615fa2e5aed51feaf29abafa
-  data.tar.gz: bdd3abdcb86751092b1b79a9595defc9eeadbf6f
+  metadata.gz: 972596a01d30af3f37c3e941ed4f0032ec504af7
+  data.tar.gz: d442512d6460ae5130ec8d902d16a7d3455e3a3f
 SHA512:
-  metadata.gz: 63f063cf70c5c63ead0a397e68eb3f0059861260a79245e75fb789fbcb89f4653c17fb2085d0157d7ef88fa17f2a26ec803abb5415c77bc0d0b6488b177fedae
-  data.tar.gz: 050354720e326a95118d509c1ec4c7cd178bd06311c725b7d2dacb2d95b85002f245e641def72105693de2bc5d99a59249c45abfe0a1aea2cf1459ab2ca86d09
+  metadata.gz: e9f91bbd86e5562604e6387f5b975a3805fb3c52d726ade138809f5c2bdd5eb48200632e6d73f733e96c45246f3bc7caecfd0695aa18f99b9fcdddd048f1a947
+  data.tar.gz: a9393a80decff4fdc5b3abd846847ad5cadb01e254a6e8d2ac1b652bdb94c64e02c3148c28faa8f66ed48885785ae1e7c41d3257e43633d4249a96b0c2d73533

data/lib/polyrex.rb

@@ -80,10 +80,13 @@ class Polyrex
   end
 
   def create(id: nil)
-      # @create is a PolyrexCreateObject, @parent_node is a Rexle::Element pointing to the current record
+    
+    # @create is a PolyrexCreateObject, 
+    # @parent_node is a Rexle::Element pointing to the current record
     
     @create.id = id || @id_counter
-    @create.record = @parent_node.name == 'records' ? @parent_node.root : @parent_node.root.element('records')
+    @create.record = @parent_node.name == 'records' ? \
+                     @parent_node.root : @parent_node.root.element('records')
     @create
   end
 
@@ -205,7 +208,8 @@ class Polyrex
 
     openx(s)
 
-    summary_h = Hash[*@doc.root.xpath("summary/*").map {|x| [x.name, x.text.to_s]}.flatten]      
+    summary_h = Hash[*@doc.root.xpath("summary/*").\
+                                     map {|x| [x.name, x.text.to_s]}.flatten]
 
     @summary = RecordX.new summary_h
     @summary_fields = summary_h.keys.map(&:to_sym)    
@@ -245,7 +249,10 @@ class Polyrex
         line = format_mask.gsub(/\[![^\]]+\]/){|x| summary.text(x[2..-2]).to_s}
 
         records = item.element('records').elements.to_a
-        line = line + "\n" + build(records, indent + 1).join("\n") if records.length > 0
+        
+        if records.length > 0 then
+          line = line + "\n" + build(records, indent + 1).join("\n") 
+        end
         ('  ' * indent) + line
       end
     end
@@ -378,7 +385,8 @@ EOF
     summary = ''
     if @format_masks.length == @recordx.length then
       root_format_mask = @format_masks.shift
-      field_names = root_format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)
+      field_names = root_format_mask.to_s.scan(/\[!(\w+)\]/).\
+                                                          flatten.map(&:to_sym)
       summary = field_names.map {|x| "<%s/>" % x}.join
     end
     
@@ -389,27 +397,26 @@ EOF
     @id_counter = '0'
 
     root_name = @recordx.shift
-    ("<%s><summary>%s</summary><records/></%s>" % [root_name, (summary || '') , root_name])
+    ("<%s><summary>%s</summary><records/></%s>" % \
+                                    [root_name, (summary || '') , root_name])
 
   end
   
   def recordx_map(node)
+    
     # get the summary
-    summary = XPath.first(node, 'summary')
-
-    # get the fields
-    fields = summary.elements.map do |x|
+    fields = node.xpath('summary/*').map do |x|
       next if %w(schema format_mask recordx_type).include? x.name 
-      r = x.text.to_s.gsub(/^[\n\s]+/,'').length > 0 ? x.text.to_s : x.cdatas.join.strip
-      REXML::Text::unnormalize(r)
+      r = x.text.to_s.gsub(/^[\n\s]+/,'').length > 0 ? x.text.to_s : \
+                                                          x.cdatas.join.strip
+      r
     end
 
     # get the records
-    records = XPath.first(node, 'records')
-    a = records.elements.map {|x| recordx_map x}
+    a = node.xpath('records/*').map {|x| recordx_map x}
     
-    [fields, a]
-  end
+    [fields.compact, a]
+  end  
   
   def string_parse(buffer, options={})
 
@@ -686,7 +693,8 @@ EOF
     methodx = a.map do |class_name, methods| 
       class_name.downcase!
       methods.map do |method_name| 
-        xpath = %Q(@doc.root.element("//%s[summary/%s='\#\{val\}']")) % [class_name, method_name]
+        xpath = %Q(@doc.root.element("//%s[summary/%s='\#\{val\}']")) % \
+                                                      [class_name, method_name]
         "def find_by_#{class_name}_#{method_name}(val) 
         
           node = #{xpath}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - James Robertson