cucumber-in-the-yard 1.7.4 → 1.7.5

data/History.txt

@@ -1,10 +1,14 @@
+=== 1.7.5 / 2010-12-14
+
+* Ruby 1.9.2 Support
+* FIX Step Transforms were colliding with Step Definitions in Ruby 1.9.2
+  
 === 1.7.4 / 2010-12-11
 
 * Ruby 1.9.2 Support
 * Change to YARD Server support:
    yard server -e /path/to/gem/lib/server.b
 
-
 === 1.7.3 / 2010-12-06
 
 * Shortcut Keys (t) for tags and (r) for features (f was taken)

data/lib/city.rb

@@ -4,7 +4,7 @@ require 'gherkin/formatter/tag_count_formatter'
 
 
 module CucumberInTheYARD
-  VERSION = '1.7.4' unless defined?(CucumberInTheYARD::VERSION)
+  VERSION = '1.7.5' unless defined?(CucumberInTheYARD::VERSION)
 end
 
 require File.dirname(__FILE__) + "/yard/code_objects/cucumber/base.rb"

data/lib/templates/default/fulldoc/html/css/common.css

@@ -66,11 +66,12 @@
 .scenario .tags { float: right; margin-right: 20px; margin-top: 5px; }
 
 
-* ul.alpha { font-size: 1.1em; }
+* ul.alpha { padding-left: 50px; font-size: 1.1em; }
 * ul.alpha { padding-bottom: 10px; list-style: none; }
 * ul.alpha li.letter { font-size: 1.4em; padding-bottom: 10px; }
-* ul.alpha ul { padding-left: 15px; }
+* ul.alpha ul { padding-left: 5px; }
 * ul small { color: #666; font-size: 0.7em; }
+* ul.alpha ul li { list-style: none; padding-left: 0px;}
 
 
 .scenario .steps {

data/lib/templates/default/requirements/html/namespace.erb

@@ -9,20 +9,7 @@
 
   <div class="requirements">
 
-    <div class="summary">
-      <span class="name">Features:</span><span class="value"><%= features.size %></span>
-      <span class="name">Scenarios:</span><span class="value"><%= scenarios.size %></span>
-      <span class="name">Steps:</span><span class="value"><%= steps.size %></span>
-      <span class="name">Tags:</span><span class="value"><%= tags.size %></span>
-    </div>
-    <div class="tags"><span class="name">Tags:</span>
-      <%= tags.collect {|tag| linkify(tag,tag.value) }.join(",\n") %>
-    </div>
-   
     <% if features && !features.empty? %>
-      <div id="features" style="margin-left: 40px;">
-        <div class="title"><span class="name">Features</span></div>
-      </div>
       <% i = 0 %>
       <table style="margin-left: 10px;">
         <tr>

data/lib/yard/handlers/step_definition_handler.rb

@@ -7,7 +7,7 @@ class YARD::Handlers::Ruby::StepDefinitionHandler < YARD::Handlers::Ruby::Base
   process do
     @@unique_name += 1
 
-    instance = StepDefinitionObject.new(YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE,"step_definition#{@@unique_name}") do |o| 
+    instance = YARD::CodeObjects::StepDefinitionObject.new(YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE,"step_definition#{@@unique_name}") do |o| 
       o.source = statement.source
       o.comments = statement.comments
       o.keyword = statement[0].source
@@ -19,24 +19,4 @@ class YARD::Handlers::Ruby::StepDefinitionHandler < YARD::Handlers::Ruby::Base
     
   end
   
-  #
-  # Step Definitions can contain defined steps within them.  While it is likely that they could not
-  # very easily be parsed because of variables that are only calculated at runtime, it would be nice
-  # to at least list those in use within a step definition and if you can find a match, go ahead and
-  # make it
-  #
-  def find_steps_defined_in_block(block)
-    #log.debug "#{block} #{block.class}"
-    block.each_with_index do |token,index|
-      #log.debug "Token #{token.class} #{token.text}"
-        if token.is_a?(YARD::Parser::Ruby::Legacy::RubyToken::TkCONSTANT)  && 
-          token.text =~ /^(given|when|then|and)$/i &&
-          block[index + 2].is_a?(YARD::Parser::Ruby::Legacy::RubyToken::TkSTRING)
-          log.debug "Step found in Step Definition: #{block[index + 2].text} "
-        end
-          
-    end
-    
-  end
-  
 end

data/lib/yard/handlers/step_transform_handler.rb

@@ -7,7 +7,7 @@ class YARD::Handlers::Ruby::StepTransformHandler < YARD::Handlers::Ruby::Base
   process do
     @@unique_name += 1
     
-    instance = StepTransformObject.new(YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE,"step_definition#{@@unique_name}") do |o| 
+    instance = YARD::CodeObjects::StepTransformObject.new(YARD::CodeObjects::Cucumber::CUCUMBER_STEPTRANSFORM_NAMESPACE,"step_transform#{@@unique_name}") do |o| 
       o.source = statement.source
       o.comments = statement.comments
       o.keyword = statement[0].source

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 7
-  - 4
-  version: 1.7.4
+  - 5
+  version: 1.7.5
 platform: ruby
 authors: 
 - Franklin Webber
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -08:00
+date: 2010-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,7 +158,7 @@ homepage: http://github.com/burtlo/Cucumber-In-The-Yard
 licenses: []
 
 post_install_message: "\n\
-  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n  Thank you for installing Cucumber-In-The-YARD 1.7.4 / 2010-12-11.\n  \n  Changes:\n    \n  * Ruby 1.9.2 Support\n  * Change to YARD Server support:\n     yard server -e /path/to/gem/lib/server.b\n  \n  \n\n\
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n  Thank you for installing Cucumber-In-The-YARD 1.7.5 / 2010-12-14.\n  \n  Changes:\n    \n  * Ruby 1.9.2 Support\n  * FIX Step Transforms were colliding with Step Definitions in Ruby 1.9.2\n    \n\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n"
 rdoc_options: 
 - --charset=UTF-8