RubyGems - cuporter - Versions diffs - 0.2.0 → 0.2.1 - Mend

cuporter 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/README.textile +5 -5
data/Rakefile +1 -1
data/lib/cuporter.rb +1 -0
data/lib/cuporter/formatters/html.rb +9 -41
data/lib/cuporter/formatters/html_node_writer.rb +96 -0
metadata +4 -3

data/README.textile CHANGED Viewed

@@ -60,9 +60,9 @@ h3. Command Lines
 h4. help
 <pre>
-  $ ./bin/cuporter.rb -h
+  $ ./bin/cuporter -h
-  Usage: cuporter.rb [options]
+  Usage: cuporter [options]
       -i, --in DIR                     directory of *.feature files
   					Default: features/**/*.feature
@@ -80,11 +80,11 @@ h4. help
 h4. run script directly
 <pre>
-  $ ./bin/cuporter.rb -i fixtures/self_text                         # pretty-print demo report to stdout
+  $ ./bin/cuporter -i fixtures/self_text                         # pretty-print demo report to stdout
-  $ ./bin/cuporter.rb -f html -o feature_tag_report.html            # default input features/**/*.feature to named output file
+  $ ./bin/cuporter -f html -o feature_tag_report.html            # default input features/**/*.feature to named output file
-  $ ./bin/cuporter.rb -f html --numbers -o feature_tag_report.html  # same, but number the scenarios and example rows
+  $ ./bin/cuporter -f html --numbers -o feature_tag_report.html  # same, but number the scenarios and example rows
 </pre>
 h4. run via rake

data/Rakefile CHANGED Viewed

@@ -56,7 +56,7 @@ namespace :cuporter do
   spec = Gem::Specification.new do |s|
     s.name = 'cuporter'
-    s.version = '0.2.0'
+    s.version = '0.2.1'
     s.rubyforge_project = s.name
     s.platform = Gem::Platform::RUBY

data/lib/cuporter.rb CHANGED Viewed

@@ -11,4 +11,5 @@ require 'cuporter/formatters/writer'
 require 'cuporter/formatters/text_methods'
 require 'cuporter/formatters/text'
 require 'cuporter/formatters/csv'
+require 'cuporter/formatters/html_node_writer'
 require 'cuporter/formatters/html'

data/lib/cuporter/formatters/html.rb CHANGED Viewed

@@ -1,48 +1,11 @@
 # Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
 require 'rubygems'
 require 'erb'
-require 'builder'
 module Cuporter
   module Formatters
     class Html < Writer
-      NODE_CLASS = [:tag, :feature, :scenario, :example_set, :example]
-      def write_nodes
-        @report.children.each do |tag_node|
-          tag_node.number_all_descendants if @number_scenarios
-          write_node(tag_node, 0)
-        end
-        builder
-      end
-      def builder
-        @builder ||= Builder::XmlMarkup.new
-      end
-      def write_node(node, indent_level)
-        builder.li(:class => NODE_CLASS[indent_level]) do |list_item|
-          list_item.span("#{node.number}.", :class => :number) if node.number
-          list_item.span(node.name, :class => "#{NODE_CLASS[indent_level]}_name" )
-          if node.has_children?
-            list_item.ul(:class => "#{NODE_CLASS[indent_level]}_children") do |list|
-              node.children.each do |child|
-                if child.has_children?
-                  write_node(child, indent_level + 1)
-                else
-                  list.li() do |item|
-                    item.span("#{child.number}.", :class => :number) if child.number
-                    item.span(child.name, :class => "#{NODE_CLASS[indent_level + 1]}_name")
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
       def inline_style
         File.read("lib/cuporter/formatters/cuporter.css")
       end
@@ -59,7 +22,7 @@ module Cuporter
         @output.puts rhtml.result(get_binding).reject {|line| /^\s+$/ =~ line}
       end
-  RHTML = %{
+      RHTML = %{
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -69,13 +32,18 @@ module Cuporter
     </style>
 </head>
 <body>
+    <div class="cuporter_header">
+      <div id="label">
+          <h1>Cucumber Tags</h1>
+      </div>
+    </div>
     <ul class="tag_list">
-      <%= write_nodes%>
+      <%= HtmlNodeWriter.new.write_nodes(@report, @number_scenarios)%>
     </ul>
 </body>
 </html>
-  }
+      }
     end
   end

data/lib/cuporter/formatters/html_node_writer.rb ADDED Viewed

@@ -0,0 +1,96 @@
+# Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
+require 'rubygems'
+require 'builder'
+module Cuporter
+  module Formatters
+    class HtmlNodeWriter
+      attr_reader :builder
+      def initialize
+        @builder = Builder::XmlMarkup.new
+      end
+      def write_nodes(report, number_scenarios)
+        report.children.each do |tag_node|
+          tag_node.number_all_descendants if number_scenarios
+          write_node(tag_node)
+        end
+        builder
+      end
+      def write_node(node)
+        builder.li(:class => node_class(node.name)) do
+          write_node_name(node)
+          write_children(node)
+        end
+      end
+      def write_node_name(node)
+        builder.span("#{node.number}.", :class => :number) if node.number
+        builder.div(node.name, :class => "#{node_class(node.name)}_name")
+      end
+      def write_children(node)
+        return if node.children.empty?
+        if node.is_a? ExampleSetNode
+          write_children_in_table(node.children)
+        else
+          write_children_in_list(node.children)
+        end
+      end
+      def write_children_in_table(children)
+        builder.div(:class => :example_rows) do
+          builder.table do
+            builder.thead {to_row(children.first)}
+            builder.tbody do
+              children[1..-1].each do |child|
+                to_row(child, :class => :example)
+              end
+            end
+          end
+        end
+      end
+      def to_row(node, attributes = {})
+        builder.tr(attributes) do |row|
+          number_string = node.number ? "#{node.number}." : ""
+          row.td(number_string, :class => :number)
+          node.name.sub(/^\|/,"").split("|").each {|s| row.td(s.strip, :class => :val) }
+        end
+      end
+      def write_children_in_list(children)
+        builder.ul do
+          children.each do |child|
+            if child.has_children?
+              write_node(child)
+            else
+              builder.li() { write_node_name(child) }
+            end
+          end
+        end
+      end
+      def node_class(name)
+        case name
+          when FeatureParser::TAG_LINE
+            :tag
+          when FeatureParser::FEATURE_LINE
+            :feature
+          when FeatureParser::SCENARIO_LINE
+            :scenario
+          when FeatureParser::SCENARIO_OUTLINE_LINE
+            :scenario_outline
+          when FeatureParser::SCENARIO_SET_LINE, FeatureParser::EXAMPLE_SET_LINE
+            :example_set
+          else
+            :example
+        end
+      end
+    end
+  end
+end

metadata CHANGED Viewed

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors:
 - Tim Camper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-09-05 00:00:00 -05:00
+date: 2010-09-06 00:00:00 -04:00
 default_executable: cuporter
 dependencies: []
@@ -34,6 +34,7 @@ files:
 - lib/cuporter/example_set_node.rb
 - lib/cuporter/formatters/csv.rb
 - lib/cuporter/formatters/text.rb
+- lib/cuporter/formatters/html_node_writer.rb
 - lib/cuporter/formatters/html.rb
 - lib/cuporter/formatters/writer.rb
 - lib/cuporter/formatters/text_methods.rb