cukeregator 0.1.0 → 0.1.1

data/Rakefile

@@ -39,7 +39,7 @@ namespace :cukeregator do
 
   spec = Gem::Specification.new do |s|
     s.name = 'cukeregator'
-    s.version = '0.1.0'
+    s.version = '0.1.1'
     s.rubyforge_project = s.name
 
     s.platform = Gem::Platform::RUBY

data/lib/cukeregator/html_generator.rb

@@ -12,13 +12,7 @@ module Cukeregator
       @doc.to_html
     end
 
-    def new_doc
-      doc =Nokogiri::XML::Document.new
-      root = Nokogiri::XML::Node.new('html', doc)
-      root.create_internal_subset( 'html', "-//W3C//DTD XHTML 1.0 Strict//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd")
-      doc << root
-      doc
-    end
+    private
 
     def head
       h = new_node(:head)
@@ -31,59 +25,37 @@ module Cukeregator
 
     def body
       b = new_node(:body)
-      b << summary
+      b << summary(@aggregator, :id => :summary, :class => @aggregator.status)
+      b << new_node(:hr)
       b << cucumbers
       b
     end
 
-    def summary
-      s = new_node(:div, @aggregator.status)
-      s['id'] = "summary"
-      s << summary_p(@aggregator, 'totals')
-      s << summary_p(@aggregator, 'duration')
-      s
-    end
-
     def cucumbers
-      c = new_node(:table)
-      c['id'] = "cucumbers"
-      tb = new_node(:tbody)
+      c = new_node(:div, :id => :cucumbers )
       @aggregator.docs.each do |doc_data|
-        tb << row(doc_data)
+        c << summary(doc_data, :class => "#{doc_data.status} cucumber result_summary") << link_for(doc_data.path, :class => :result_detail)
       end
-      c << tb
       c
     end
 
-    def row(doc_data)
-      tr = new_node(:tr, doc_data.status)
-      td = new_node(:td, 'result-detail')
-      td << link_for(doc_data.path)
-      tr << td
-
-      td = new_node(:td, 'result-summary')
-      td << summary_p(doc_data, 'totals')
-      td << summary_p(doc_data, 'duration')
-      tr << td
-      tr
-    end
-
-    def link_for(path)
-      a  = new_node(:a)
+    def link_for(path, attributes = {})
+      a  = new_node(:a, attributes)
       a['href'] = path
-      a.content = path
+      a.content = path.split(File::SEPARATOR).last
       a
     end
 
-    def new_node(name, class_name = nil)
-      n = Nokogiri::XML::Node.new(name.to_s, @doc)
-      n['class'] = class_name.to_s if class_name
-      n
+    def summary(data, attributes)
+      s = new_node(:div, attributes)
+      s << summary_p(data, 'totals')
+      s << summary_p(data, 'duration')
+      s
     end
 
-    def summary_p(o, which)
+    def summary_p(data, which)
       p  = new_node(:p, which)
-      p.inner_html = o.send("#{which}_inner_html")
+      p.inner_html = data.send("#{which}_inner_html")
       p
     end
 
@@ -93,5 +65,21 @@ module Cukeregator
       style.content = "\n#{File.read(File.expand_path(File.dirname(__FILE__)) + '/style.css')}"
       style
     end
+
+    def new_doc
+      doc =Nokogiri::XML::Document.new
+      root = Nokogiri::XML::Node.new('html', doc)
+      root.create_internal_subset( 'html', "-//W3C//DTD XHTML 1.0 Strict//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd")
+      doc << root
+      doc
+    end
+
+    def new_node(name, attributes = {})
+      n = Nokogiri::XML::Node.new(name.to_s, @doc)
+      attributes.each do | attr, value |
+        n[attr.to_s] = value.to_s
+      end
+      n
+    end
   end
 end

data/lib/cukeregator/html_reader.rb

@@ -64,7 +64,7 @@ module Cukeregator
     end
 
     # our data lies in javascript functions at the bottom of the body, because
-    # Aslak can't put up the totals until the suite completes
+    # Cucumber can't put up the totals until the suite completes
     def parse_scripts(doc)
       doc.search("body script").map {|script| script.text }
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cukeregator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tim Camper
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 -04:00
+date: 2011-03-29 00:00:00 -04:00
 default_executable: cukeregator
 dependencies: 
 - !ruby/object:Gem::Dependency