cuporter 0.3.6 → 0.3.7

data/Rakefile

@@ -65,7 +65,7 @@ namespace :cuporter do
 
   spec = Gem::Specification.new do |s|
     s.name = 'cuporter'
-    s.version = '0.3.6'
+    s.version = '0.3.7'
     s.rubyforge_project = s.name
 
     s.platform = Gem::Platform::RUBY
@@ -77,8 +77,8 @@ namespace :cuporter do
     s.author = "Tim Camper"
     s.email = 'twcamper@thoughtworks.com'
     s.homepage = 'http://github.com/twcamper/cuporter'
-    s.required_ruby_version = '>= 1.8.7'
-    s.add_dependency('nokogiri', '>= 1.4.4')
+    s.required_ruby_version = '>= 1.8.6'
+    s.add_dependency('nokogiri', '>= 1.4.1')
     s.default_executable = "cuporter"
     s.executables = [s.default_executable]
 

data/lib/cuporter/cli/options.rb

@@ -99,11 +99,10 @@ module Cuporter
                                            otherwise, the html will link to the files under 'cuporter/public' in
                                            your gempath.
           }) do |a|
-            @options[:assets_dir] = full_path(a)
+            @options[:assets_dir] = a
           end
 
-          opts.on("-l", "--link-assets", %Q{Do not inline CSS and js in <style/> and <script/> tags, but link to
-                                       external files instead.
+          opts.on("-l", "--link-assets", %Q{Do not inline CSS and js in <style/> and <script/> tags, but link to external files instead.
                                            Default:  'false' for the tag and feature views, not optional for the
                                                      tree view, which requires external gifs.
           }) do |l|

data/lib/cuporter/document.rb

@@ -18,7 +18,7 @@ module Cuporter
       project_assets = File.expand_path( "public", File.dirname(__FILE__) + "../../../")
 
       # we count on the dirs being created by the option parser
-      if assets_dir
+      if link_assets
         FileUtils.cp_r("#{project_assets}/.", assets_dir)
         doc.assets_dir = assets_dir
       else

data/lib/cuporter/extensions/nokogiri.rb

@@ -4,6 +4,22 @@ Nokogiri::XML::Node.class_eval do
   # so our mixed-in versions get used.
   remove_method :<=>
   include(Cuporter::Node::BaseMethods)
+
+  # Nokogiri 1.4.1 backwards compatability
+  unless instance_methods.include?("children=")
+
+    # defined in 1.4.4
+    def children=(node_or_tags)
+      children.unlink
+      if node_or_tags.is_a?(Nokogiri::XML::NodeSet)
+        node_or_tags.each { |n| add_child_node n }
+      else
+        add_child_node node_or_tags 
+      end
+      node_or_tags
+    end
+
+  end
 end
 
 module NodeSetExtensions
@@ -38,4 +54,15 @@ module DocumentExtensions
     root.at(:body) << s
   end
 end
-Nokogiri::XML::Document.send(:include, DocumentExtensions)
+Nokogiri::XML::Document.class_eval do
+
+  # Nokogiri 1.4.1 backwards compatability
+  unless instance_methods.include?("create_cdata")
+    # defined in 1.4.4
+    def create_cdata(text)
+      Nokogiri::XML::CDATA.new(self, text.to_s)
+    end
+  end
+
+  include(DocumentExtensions)
+end

data/lib/cuporter/node/node_base.rb

@@ -67,14 +67,14 @@ module Cuporter
 
       def to_text
         s = Cuporter::Formatters::Text.build_line(self)
-        s += children.map {|n| n.to_text}.to_s
+        s += children.map {|n| n.to_text}.join
         s
       end
       alias :to_pretty :to_text
 
       def to_csv
         s = Cuporter::Formatters::Csv.build_line(self)
-        s += children.map {|n| n.to_csv}.to_s
+        s += children.map {|n| n.to_csv}.join
         s
       end
 

data/lib/cuporter/tag_nodes_parser.rb

@@ -13,7 +13,7 @@ module Cuporter
         s = {:cuke_name => sub_expression, :tags => @current_tags}
 
         (@feature[:tags] | s[:tags]).each do |tag|
-          next unless @filter.pass? tag.to_a
+          next unless @filter.pass?([tag])
           add_scenario(tag, @feature, s)
         end
       end
@@ -36,7 +36,7 @@ module Cuporter
         e = {:cuke_name => sub_expression}
 
         context_tags.each do |tag|
-          next unless @filter.pass? tag.to_a
+          next unless @filter.pass?([tag])
           add_example(tag, @feature, @scenario_outline, @example_set, e)
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cuporter
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Tim Camper
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 -04:00
+date: 2011-05-31 00:00:00 -04:00
 default_executable: cuporter
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 5
         segments: 
         - 1
         - 4
-        - 4
-        version: 1.4.4
+        - 1
+        version: 1.4.1
   type: :runtime
   version_requirements: *id001
 description: Scrapes Cucumber *.feature files to build reports on tag usage and test inventory
@@ -119,12 +119,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
+      hash: 59
       segments: 
       - 1
       - 8
-      - 7
-      version: 1.8.7
+      - 6
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: