dynarex 1.0.22 → 1.0.24

data/lib/dynarex.rb

@@ -156,7 +156,7 @@ EOF
 #  dynarex.create_from_line 'Tracy 37 15-Jun-1972'  
   
   def create_from_line(line, id=nil)
-    t = regexify_fmask(@format_mask)
+    t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
     line.match(/#{t}/).captures
     
     a = line.match(/#{t}/).captures
@@ -319,8 +319,18 @@ EOF
 
     # if records already exist find the max id
     i = @doc.xpath('max(records/*/attribute::id)').to_i
+
+    
+    # 'a' and 'a_split' just used for validation
+    a = @format_mask.scan(/\[!\w+\]/)
+    a_split = @format_mask.split(/\[!\w+\]/)
     
-    t = regexify_fmask(@format_mask)
+    if a.length == 2 and a_split[1].length == 1 then  
+      t = "([^#{a_split[1]}]+)" + a_split[1] + "(.*)"
+    else
+      # convert the format mask into a friendly reg exp string
+      t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
+    end
 
     lines = buffer.strip.split(/\r?\n|\r(?!\n)/).map {|x|x.strip.match(/#{t}/).captures}
 
@@ -431,7 +441,12 @@ LINES
 
   def load_records
     @records = records_to_h
-
+    @records.instance_eval do
+       def delete_item(i)
+         self.delete self.keys[i]
+       end
+    end
+      
     #Returns a ready-only snapshot of records as a simple Hash.
     @flat_records = @records.values.map{|x| x[:body]}
   end
@@ -465,25 +480,6 @@ LINES
     end
 
   end
-  
-  def regexify_fmask(f)
-        
-    a = f.split(/(?=\[!\w+\])/).map do |x|
-
-      aa = x.split(/(?=[^\]]+$)/)
-
-      if aa.length == 2 and aa.first[/\[!\w+\]/] then
-        field, delimiter = *aa
-        delimiter ||= '$'
-        d = delimiter[0]
-        "([^%s]+)%s" % ([d] * 2)
-      else
-        x.sub(/\[!\w+\]/,'(.*)')
-      end
-    end
-
-    a.join            
-  end  
 
   def summary_to_h
 

metadata

@@ -2,7 +2,7 @@
 name: dynarex
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.22
+  version: 1.0.24
 platform: ruby
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +00:00
+date: 2011-04-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency