polyrex 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afdf9d69e8ab31c3285880c695ebfb157698ac7f
-  data.tar.gz: 2b0a96745c0630033d8e22ee376bd0afad23b885
+  metadata.gz: 932bd632891aad9d704f28c577f0d74bd87e8086
+  data.tar.gz: 6ddd40237513fe41bac1d99d3ea2a14536156dd1
 SHA512:
-  metadata.gz: e16d7a48c390f9888cf99925383ef350bf12055a74b3b8a7d5cd7b514e1940b62ec7f436c5df4e743118376b5b4ba01886728edd92edc4cbfc4885088553a40b
-  data.tar.gz: 01fbf2f47282d7d7c06bccf277e721cc3fa559c9b3b2b865e1e42f19aed87589db538a434bd771654a9321783224b238293595a1c94fb6733cb6b6e55dd58c3c
+  metadata.gz: 9a7e3560650802d78f827fcf4777507c2dc437caae1b9d1aab97c85fef1e63fb0a853d791a4c00bbe3cf1f09c5316396a00ae7e40a58e46cbc62d23509651139
+  data.tar.gz: 5a7c2cec07f4a06d30c4053b6ae4cffcff9ac5910a0a4c235e459e81ec886d1128f500b5e07888dbae51aa387b870b2e5a7971dd005e76e4736d44ef7ad2056a

data/lib/polyrex.rb

@@ -392,13 +392,6 @@ EOF
 
     end
 
-    if @type == 'checklist' then
-      
-      @format_masks[1..-1].each do |fm|
-        fm.sub!(/\s(\[[^\[]+\]$)/,'999999999\1')
-      end
-    end
-    
     @summary.format_mask = @format_masks
 
     records = @parent_node.root
@@ -423,9 +416,29 @@ EOF
   end
   
   def format_line!(a, i=0)
-
+    
     records = Rexle::Element.new('records')
+    
+    # add code here for rowx
+    @field_names =  format_masks[i].to_s.scan(/\[!(\w+)\]/)\
+                                            .flatten.map(&:to_sym)
 
+    rowx_fields = a.map{|x| x.first[/^\w+(?=:)/].to_s.to_sym}.uniq
+    
+    records = if (@field_names & rowx_fields).length >= 2 then
+      # rowx implementation still to-do
+      #vertical_fiedlparse(records, a, i)
+    else
+      horizontal_fieldparse(records, a, i)
+    end
+    
+  end
+    
+  
+  # -- end of full text edit methods
+    
+  def horizontal_fieldparse(records, a, i)
+    
     a.each do |x|          
 
       unless @recordx[i] then
@@ -436,19 +449,9 @@ EOF
       tag_name = @recordx[i].to_s
       line = raw_line = x.shift
 
-      if @type == 'checklist' then
 
-        raw_checked, line = raw_line.partition(/\]/).values_at 0,2
-        
-        if raw_checked.lstrip[/^\[/] then
-          checkmark = raw_checked[/x/] ? true : false
-        else
-          checkmark = nil
-          line = raw_line
-        end        
-      else
-        line = raw_line
-      end
+      line = raw_line
+
       
       if line[/\w+\s*---/] then
 
@@ -459,6 +462,7 @@ EOF
         next
       end
 
+      
       unless @format_masks[i][/^\(.*\)$/] then
 
         @field_names, field_values = RXRawLineParser.new(format_masks[i])\
@@ -487,10 +491,7 @@ EOF
 
       record.add_attribute(id: @id_counter.clone)
       summary = Rexle::Element.new('summary')
-      
-      if @type == 'checklist' then
-        field_values[-1] = checkmark.to_s unless checkmark.nil?
-      end
+
       
       @field_names.zip(field_values).each do |name, value|  
         field =  Rexle::Element.new(name.to_s)
@@ -500,10 +501,6 @@ EOF
 
       format_mask = @format_masks[i]
 
-      if @type == 'checklist' then
-        format_mask = format_mask.sub(/999999999/,' ')
-      end
-
       schema = "%s[%s]" % [tag_name, @field_names.join(', ')]
       summary.add Rexle::Element.new('format_mask').add_text(format_mask)
       summary.add Rexle::Element.new('schema').add_text(schema)
@@ -515,11 +512,9 @@ EOF
       record.add child_records
       records.add record
     end
-
+    
     records
   end
-  
-  # -- end of full text edit methods
 
   def attach_create_handlers(names)
     methodx = names.map do |name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   wbQnaFmJMPFyXo9Yh/95QJEinnBsM0Yk8nJhmcChjdCpQL5243BjgzVEjHI1Ouxe
   SmUIljyExpxiHQ==
   -----END CERTIFICATE-----
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-schema