dynarex 1.0.21 → 1.0.22

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 = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
+    t = regexify_fmask(@format_mask)
     line.match(/#{t}/).captures
     
     a = line.match(/#{t}/).captures
@@ -319,25 +319,8 @@ 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+\]/)
     
-    if a.length == 2 and a_split[1].length == 1 then  
-      a2 = []
-
-      # 1st
-      a2 << "([^#{a_split[1]}]+)" << a_split[1]
-
-      # last
-      a2 << "(.*)"
-      t = a2.join
-    else
-      # convert the format mask into a friendly reg exp string
-      t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
-    end
+    t = regexify_fmask(@format_mask)
 
     lines = buffer.strip.split(/\r?\n|\r(?!\n)/).map {|x|x.strip.match(/#{t}/).captures}
 
@@ -482,6 +465,25 @@ 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

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dynarex
 version: !ruby/object:Gem::Version 
-  version: 1.0.21
+  prerelease: 
+  version: 1.0.22
 platform: ruby
 authors: []
 
@@ -9,39 +10,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 +00:00
+date: 2011-03-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rexle
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dynarex-import
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: line-tree
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: 
 executables: []
@@ -62,21 +66,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: dynarex