dynarex 0.9.4 → 0.9.5

data/lib/dynarex.rb

@@ -2,14 +2,13 @@
 
 # file: dynarex.rb
 
-require 'rexml/document'
 require 'nokogiri'
 require 'open-uri'
 require 'builder'
 require 'ostruct'
+require 'rexle'
 
 class Dynarex
-  include REXML 
 
   attr_accessor :format_mask, :delimiter, :schema
   
@@ -81,14 +80,15 @@ xsl_buffer =<<EOF
 </xsl:stylesheet>
 EOF
 
-    format_mask = XPath.first(@doc.root, 'summary/format_mask/text()').to_s
-dynarex = Dynarex.new
+    #format_mask = XPath.first(@doc.root, 'summary/format_mask/text()').to_s
+    format_mask = @doc.element('summary/format_mask/text()')
+    dynarex = Dynarex.new
 
-s = %q(schema="companies/company(name, last_contacted, contact)" delimiter=" # ")
-s.split(/(?=\w+\="[^"]+")/)
-raw_a = s.scan(/\w+\="[^"]+"/)
-a = raw_a.map{|x| r = x.split(/=/); [(r[0] + "=").to_sym, r[1][/^"(.*)"$/,1]] }
-a.each{|name, value| dynarex.method(name).call(value)}
+    s = %q(schema="companies/company(name, last_contacted, contact)" delimiter=" # ")
+    s.split(/(?=\w+\="[^"]+")/)
+    raw_a = s.scan(/\w+\="[^"]+"/)
+    a = raw_a.map{|x| r = x.split(/=/); [(r[0] + "=").to_sym, r[1][/^"(.*)"$/,1]] }
+    a.each{|name, value| dynarex.method(name).call(value)}
 
     xslt_format = format_mask.to_s.gsub(/\s(?=\[!\w+\])/,'<xsl:text> </xsl:text>').gsub(/\[!(\w+)\]/, '<xsl:value-of select="\1"/>')
     xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
@@ -96,6 +96,7 @@ a.each{|name, value| dynarex.method(name).call(value)}
     xslt  = Nokogiri::XSLT(xsl_buffer)
     out = xslt.transform(Nokogiri::XML(@doc.to_s))
     out.text
+
   end
   
   def to_xml  
@@ -121,7 +122,8 @@ a.each{|name, value| dynarex.method(name).call(value)}
       header.scan(/\w+\="[^"]+\"/).map{|x| r = x.split(/=/); [(r[0] + "=").to_sym, r[1][/^"(.*)"$/,1]] }.each {|name, value|      self.method(name).call(value)}
     end
 
-    i = XPath.match(@doc.root, 'records/*/attribute::id').max_by(&:value).to_s.to_i
+    #i = XPath.match(@doc.root, 'records/*/attribute::id').max_by(&:value).to_s.to_i
+    i = @doc.xpath('records/*/attribute::id').max_by(&:value).to_s.to_i
     t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
 
     lines = buffer.strip.split(/\r?\n|\r(?!\n)/).map {|x|x.match(/#{t}/).captures}
@@ -191,7 +193,7 @@ a.each{|name, value| dynarex.method(name).call(value)}
     fields = capture_fields(params)
     
     # for each field update each record field
-    record = XPath.first(@doc.root, "records/#{@record_name}[@id=#{id.to_s}]")
+    record = @doc.element("records/#{@record_name}[@id=#{id.to_s}]")    
     fields.each {|k,v| record.elements[k.to_s].text = v if v}
     record.add_attribute('last_modified', Time.now.to_s)
 
@@ -203,7 +205,7 @@ a.each{|name, value| dynarex.method(name).call(value)}
 #  dyarex.delete 3      # deletes record with id 3
   
   def delete(id)        
-    node = XPath.first(@doc.root, "records/*[@id='#{id}']")
+    node = @doc.element("records/*[@id='#{id}']")
     node.parent.delete node        
     load_records
     self
@@ -211,44 +213,46 @@ a.each{|name, value| dynarex.method(name).call(value)}
   
   def sort_by!(&element_blk)
     refresh_doc
-    a = XPath.match(@doc.root, 'records/*').sort_by &element_blk
-    records = XPath.first(@doc.root, 'records')
-    records.parent.delete records
-    records = Element.new 'records'
+    a = @doc.xpath('records/*').sort_by &element_blk
+    @doc.delete('records')
+
+    records = Rexle::Element.new 'records'
     a.each {|record| records.add record}
     @doc.root.add records
+
     load_records
     self
   end
   
   def record(id)
-    h = Hash[*XPath.match(@doc.root, "records/*[@id='#{id}']/*").map {|x| [x.name, x.text]}.flatten]
+    h = Hash[*@doc.xpath("records/*[@id='#{id}']/*").map {|x| [x.name, x.text]}.flatten]
     OpenStruct.new h    
   end
   
   def record_exists?(id)
-    XPath.first(@doc.root, "records/*[@id='#{id}']").nil? ? false : true
+    !@doc.element("records/*[@id='#{id}']").nil?
   end
 
   private
   
   def hash_create(params={}, id=nil)
     fields = capture_fields(params)
-    record = Element.new @record_name
+    record = Rexle::Element.new @record_name
     fields.each do |k,v|
-      element = Element.new(k.to_s)       
+      element = Rexle::Element.new(k.to_s)              
       element.text = v if v
       record.add element
     end
 
     unless id
-      ids = XPath.match(@doc.root,'records/*/attribute::id').map {|x| x.value.to_i}
+      ids = @doc.xpath('records/*/attribute::id').map(&:to_i)
       id = ids.empty? ? (id || 1) : ids.max.succ
     end
 
     attributes = {id: id, created: Time.now.to_s, last_modified: nil}
     attributes.each {|k,v| record.add_attribute(k.to_s, v)}
-    @doc.root.elements['records'].add record      
+
+    @doc.element('records').add record            
   end
 
   def capture_fields(params)
@@ -279,7 +283,7 @@ a.each{|name, value| dynarex.method(name).call(value)}
       end
     end
 
-    @doc = Document.new buffer
+    @doc = Rexle.new buffer
     buffer
 
   end
@@ -317,29 +321,32 @@ a.each{|name, value| dynarex.method(name).call(value)}
     @fields.each do |field|
       self.instance_eval(
 %Q(def find_by_#{field}(s)
- Hash[@fields.zip(XPath.match(@doc.root, "records/*[#{field}='\#{s}']/*/text()").map &:to_s)]
+ Hash[@fields.zip(@doc.xpath("records/*[#{field}='\#{s}']/*/text()"))]
 end))
     end    
   end
   
   def open(s)
-    if s[/\(/] then  # schema
+    
+    if s.strip[/^</] then # xml
+      puts 'fuh'
+      buffer = s
+    elsif s[/\(/] # schema
+      puts 'duh'
       buffer = dynarex_new s
     elsif s[/^https?:\/\//] then  # url
       buffer = Kernel.open(s, 'UserAgent' => 'Dynarex-Reader').read
-    elsif s[/\</] # xml
-      buffer = s
     else # local file
       @local_filepath = s
       buffer = File.open(s,'r').read
     end
 
-    @doc = Document.new buffer
+    @doc = Rexle.new buffer
     @schema = @doc.root.text('summary/schema')
     @root_name = @doc.root.name
     @summary = summary_to_h    
-    @default_key = XPath.first(@doc.root, 'summary/default_key/text()')
-    @format_mask = XPath.first(@doc.root, 'summary/format_mask/text()')
+    @default_key = @doc.element('summary/default_key/text()') 
+    @format_mask = @doc.element('summary/format_mask/text()')
    
     @fields = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym) if @format_mask 
 
@@ -352,10 +359,12 @@ end))
       @default_key = @fields[0] unless @default_key     
       # load the record query handler methods
       attach_record_methods
+    else
+      @default_key = @doc.xpath('records/*/*').first.name
     end
     
-    if XPath.match(@doc.root, 'records/*').length > 0 then
-      @record_name = XPath.first(@doc.root, 'records/*[1]').name      
+    if @doc.xpath('records/*').length > 0 then
+      @record_name = @doc.element('records/*[1]').name            
       load_records 
     end
 
@@ -373,44 +382,42 @@ end))
 #Returns a ready-only snapshot of records as a simple Hash.
   
   def flat_records_to_h
-    XPath.match(@doc.root, 'records/*').map do |row|
-      XPath.match(row, '*').inject({}) do |r,node|
-        r[node.name.to_s.to_sym] = node.text.to_s
-        r
+    @doc.xpath('records/*').map do |row|
+      row.xpath('*').inject({}) do |r,node|
+        r.merge node.name.to_s.to_sym => node.text
       end
     end
   end
 
   def records_to_h()
-    i = XPath.match(@doc.root, 'records/*/attribute::id').max_by(&:value).to_s.to_i
+
+    i = @doc.xpath('max(records/*/attribute::id)') || 0
     
-    ah = XPath.match(@doc.root, 'records/*').map do |row|
-      
+    @doc.xpath('records/*').inject({}) do |result,row|
+
       created = Time.now.to_s
       last_modified = ''
       
-      if row.attribute('id') then
-        id = row.attribute('id').value.to_s 
+      if row.attributes['id'] then
+        id = row.attributes['id']
       else
         i += 1; id = i.to_s
       end
-      created = row.attribute('created').value.to_s if row.attribute('created')
-      last_modified = row.attribute('last_modified').value.to_s if row.attribute('last_modified')
-      body = XPath.match(row, '*').inject({}) do |r,node|
-        r[node.name.to_s.to_sym] = node.text.to_s
-        r
+      created = row.attributes['created'] if row.attributes['created']
+      last_modified = row.attributes['last_modified'] if row.attributes['last_modified']
+      body = row.xpath('*').inject({}) do |r,node|
+        r.merge node.name.to_s => node.text
       end
 
-      [body[@default_key],{id: id, created: created, last_modified: \
-          last_modified, body: body}]
+      result.merge body[@default_key] => {id: id, created: created, last_modified: last_modified, body: body}
     end
-    Hash[*ah.flatten]
+
   end
 
   def summary_to_h
-    XPath.match(@doc.root, 'summary/*').inject({}) do |r,node|
-      r[node.name.to_s.to_sym] = node.text.to_s
-      r
+
+    @doc.xpath('summary/*').inject({}) do |r,node|
+      r.merge node.name.to_s.to_sym => node.text.to_s
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dynarex
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +00:00
+date: 2010-12-07 00:00:00 +00:00
 default_executable: 
 dependencies: []