dataisland 0.1.3 → 0.1.4

data/lib/dataisland.rb

@@ -24,12 +24,12 @@ class DataIsland
 
     h = @html_doc.element('//object').attributes
 
-
     path = { url: -> {File.dirname(location)}, 
             file: -> {File.expand_path(File.dirname(location))}, 
              xml: -> {File.expand_path('.')}}    
     
     @location = path[typex].call
+
     @html_doc.xpath("//object[@type='text/xml']").each do |x|
 
       h = x.attributes
@@ -51,7 +51,6 @@ class DataIsland
         dynarex.flat_records.reverse : dynarex.flat_records
 
       xpath = "//*[@datasrc='" + '#' + h[:id] + "']"
-
       @html_doc.xpath(xpath).each do |island|      
         render(records, x.attributes, island.element('//*[@datafld]'));
       end
@@ -96,7 +95,7 @@ class DataIsland
             Range.new(0,rpp - 1)
       end
 
-      records = range ? flat_records[range] : flat_records
+      records = range ? flat_records[range] : flat_records      
       
       if sort_by then
         if sort_by[/^-/].nil? then
@@ -105,14 +104,21 @@ class DataIsland
           recs = records.sort_by {|record| record[sort_by[1..-1]] }.reverse
         end
       else 
-        recs = flat_records
+        recs = records
       end
 
       recs.each do |record|
 
         rec = rec_orig.deep_clone
 
-        rec.xpath('//*[@datafld]').each do |e|
+        rec.xpath('.//span[@class]|.//a[@class]').each do |e|
+          r = e.attribute(:class)[/\{([^\}]+)\}$/,1]
+          dest_nodes[r.to_sym] = e if r
+        end
+        puts '!bank: ' + rec.xpath('.//a[@class]').inspect
+
+        
+        rec.xpath('.//*[@datafld]').each do |e|
           dest_nodes[e.attribute(:datafld).downcase.to_sym] = e
         end
 
@@ -122,12 +128,36 @@ class DataIsland
           next if record[field].nil?
 
           case dest_nodes[field].name.downcase.to_sym
+            
             when :span
-              dest_nodes[field].text = record[field]
+
+              classx = dest_nodes[field].attributes[:class]
+
+              if classx then
+
+                if classx[/{#{field}/] then
+                  val = record[field]
+                  new_class = classx.sub(/\{[^\}]+\}/,val)
+                  dest_nodes[field].attributes[:class] = new_class
+                elsif
+                  dest_nodes[field].text = record[field]
+                end
+              elsif
+                dest_nodes[field].text = record[field]
+              end
+              
             when :a
-              dest_nodes[field].attributes['href'] = record[field]
-          when :img
-              dest_nodes[field].attributes['src'] = record[field]
+              dest_nodes[field].attributes[:href] = record[field]
+              classx = dest_nodes[field].attributes[:class]
+
+              if classx and classx[/{#{field}/] then
+
+                val = record[field]
+                new_class = classx.sub(/\{[^\}]+\}/,val)
+                dest_nodes[field].attributes[:class] = new_class
+              end
+            when :img
+              dest_nodes[field].attributes[:src] = record[field]
           end
         end    
 
@@ -140,3 +170,4 @@ class DataIsland
   end
 
 end
+

metadata

@@ -2,7 +2,7 @@
 name: dataisland
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - James Robertson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-06-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dynarex