dynarex 0.7.7 → 0.7.8

data/lib/dynarex.rb

@@ -88,11 +88,11 @@ EOF
     i = XPath.match(@doc.root, 'records/*/attribute::id').max_by(&:value).to_s.to_i
     t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
     lines = buffer.split(/\r?\n|\r(?!\n)/).map {|x|x.match(/#{t}/).captures}
-    fields = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)
+
     a = lines.map do|x| 
       created = Time.now.to_s
       
-      h = Hash[fields.zip(x)]
+      h = Hash[@fields.zip(x)]
       [h[@default_key.to_s], {id: '', created: created, last_modified: '', body: h}]
     end
     
@@ -139,11 +139,10 @@ EOF
   
   def create_from_line(line)
     t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
-    fields = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)
     line.match(/#{t}/).captures
     
     a = line.match(/#{t}/).captures
-    h = Hash[fields.zip(a)]
+    h = Hash[@fields.zip(a)]
     create h
     self
   end
@@ -193,8 +192,9 @@ EOF
   end
 
   def capture_fields(params)
-    fields = @fields.clone
+    fields = Hash[@fields.map {|x| [x,nil]}]
     fields.keys.each {|key| fields[key] = params[key] if params.has_key? key}      
+    puts 'fields : ' + fields.inspect
     fields
   end
 
@@ -251,10 +251,10 @@ EOF
   end
 
   def attach_record_methods()
-    @fields.keys.each do |field|
+    @fields.each do |field|
       self.instance_eval(
 %Q(def find_by_#{field}(s)
- Hash[@fields.keys.zip(XPath.match(@doc.root, "records/*[#{field}='\#{s}']/*/text()").map &:to_s)]
+ Hash[@fields.zip(XPath.match(@doc.root, "records/*[#{field}='\#{s}']/*/text()").map &:to_s)]
 end))
     end    
   end
@@ -277,15 +277,15 @@ end))
     @default_key = XPath.first(@doc.root, 'summary/default_key/text()')
     @format_mask = XPath.first(@doc.root, 'summary/format_mask/text()')
    
-    #@fields = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym) if @format_mask 
+    @fields = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym) if @format_mask 
 
     if @schema then
       @record_name, raw_fields = @schema.match(/(\w+)\(([^\)]+)/).captures
-      @fields = Hash[raw_fields.split(',').map{|x| [x.strip.to_sym, nil]}] unless @fields      
+      @fields = raw_fields.split(',').map{|x| x.strip.to_sym} unless @fields      
     end
 
     if @fields then
-      @default_key = @fields.keys[0] unless @default_key     
+      @default_key = @fields[0] unless @default_key     
       # load the record query handler methods
       attach_record_methods
     end
@@ -336,7 +336,8 @@ end))
         r[node.name.to_s.to_sym] = node.text.to_s
         r
       end
-      [body[@default_key.to_s],{id: id, created: created, last_modified: \
+      puts 'default key : ' + @default_key
+      [body[@default_key],{id: id, created: created, last_modified: \
           last_modified, body: body}]
     end
     Hash[*ah.flatten]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dynarex
 version: !ruby/object:Gem::Version 
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors: []