cucumber-in-the-yard 1.5.2 → 1.5.3

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.5.3 / 2010-10-26
+
+* FIX - Step Definition YARD handler regex was poorly formed and raised exceptions
+  when it contained a forward-slash (even if escaped).
+* FIX - Step highlighting was causing 'Out Of Memory' issues because
+  gsub could not handle nil values.
+* FIX - Step highlighting failed to replace matches properly causing for corrupted
+  HTML span values to appear in the highlighted step definitions
+
 === 1.5.2 / 2010-10-26
 
 * FIX - Step Transform YARD handler regex was poorly formed and raised exceptions

data/Rakefile

@@ -8,7 +8,7 @@ task :gendoc do
   `yardoc -e lib/city.rb -p lib/templates 'example/**/*' --debug`
 end
 
-Echoe.new('cucumber-in-the-yard', '1.5.2') do |g|
+Echoe.new('cucumber-in-the-yard', '1.5.3') do |g|
   g.author = "Franklin Webber"
   g.email = "franklin.webber@gmail.com"
   g.url = "http://github.com/burtlo/Cucumber-In-The-Yard"

data/cucumber-in-the-yard.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-in-the-yard}
-  s.version = "1.5.2"
+  s.version = "1.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Franklin Webber"]

data/example/second_example.feature

@@ -24,7 +24,19 @@ Feature: Customer Logout Feature
     When a customer logs in as username 'frank' with password 'default'
 	And visits the customer update page
 	Then I expect the customer is able able to post to their profile
-	
+
+  @optional_parameters
+  Scenario: Optional Parameter Step Definition
+    # This step definition has some optional parameters
+    Given a project
+    And an inactive project
+    And a project with the name 'optional', start date 10/26/2010, nicknamed 'norman'
+
+  @highlighting
+  Scenario: Highlighting
+    Given a duck that has a bill
+    Then I expect the duck to quack
+
   @product
   Scenario Outline: Customers that bought a product are included in their product groups
     Given that <Customer> is a valid customer

data/example/step_definitions/example.step.rb

@@ -1,5 +1,3 @@
-
-
 CUSTOMER = /(?:(?:an?|the) customer|#{TEDDY_BEAR})/
 
 TEDDY_BEAR = /teddy bear/
@@ -49,6 +47,27 @@ And /^edits their the (biography) to state:$/ do |section,text|
   pending "text_field not present for #{section} #{bio} for this release"
 end
 
+#
+# Complicated step definition with optional parameters
+#
+Given /^(?:I create )?an? (?:(active|deactive|inactive|simulated)d?)? ?project(?:[\s,]*(?:with)? ?(?:an?|the)? (?:(?:the size? (?:at|of)? ?(\d+)|named? (?:of )?'([^']+)'|start date (?:of )?((?:(?:\d{1,2}[\/-]){2}(?:\d\d){1,2}))|end date (?:of )?((?:(?:\d{1,2}[\/-]){2}(?:\d\d){1,2}))|user range (?:of )?(\d+-\d+)|description (?:of )?'([^']+)'|nicknamed? (?:of )?'([^']+)')[,\s]*)* ?)?$/ do |state,size,name,start_date,end_date,user_range,description,nickname|
+  pending "#{state} #{size} #{name} #{start_date} #{end_date} #{user_range} #{description} #{nickname}"
+end
+
+
+#
+# The highlighting replacement uses a span which had trouble when blindly using
+# a gsub replacement.
+#
+Given /(a|\d+) ducks? that ha(?:s|ve) (a|\d+) bills?/ do |duck_count,bills_count|
+  pending
+end
+
+Then /I expect the (duck|bird) to (\w+)/ do |animal,verb|
+  pending
+end
+
+
 #
 # Some details about the helper method that might be picked up in the documentation.
 #

data/lib/templates/default/feature/html/steps.erb

@@ -7,7 +7,7 @@
 
 		<% if step.definition %>
 		<span class="defined">
-			<%= highlight_matches(step) %>
+			<%=  highlight_matches(step) %>
 			<div class="details">
 				<a href="<%= url_for step.definition %>">?</a>
 			</div>

data/lib/templates/default/feature/setup.rb

@@ -33,8 +33,13 @@ def highlight_matches(step)
   value = h(step.value)
   
   if step.definition
-    step.value.match(%r{#{step.definition.compare_value}}).to_a[1..-1].each do |match|
-      value.gsub!(h(match),"<span class='match'>#{h(match)}</span>")
+    matches = step.value.match(%r{#{step.definition.compare_value}})
+    
+    if matches
+      matches[1..-1].reverse.each_with_index do |match,index|
+        next if match == nil
+        value[matches.begin((matches.size - 1) - index)..(matches.end((matches.size - 1) - index) - 1)] = "<span class='match'>#{match}</span>"
+      end
     end
   end
   

data/lib/yard/code_objects/cucumber/step.rb

@@ -29,13 +29,7 @@ module YARD::CodeObjects::Cucumber
     def transformed?
       !@transforms.empty?
     end
-    
-    def compare_values
-      
-      @scenario.example_hash.collect do |stub,replacements|
-        replacements.collect {|replace| value.gsub("<#{stub}>",replace) }
-      end.flatten
-    end
+
   end
 
 end

data/lib/yard/code_objects/step_definition.rb

@@ -12,18 +12,20 @@ module YARD::CodeObjects
       @value = format_source(value)
       @constants = {}
       @steps = []
+      @compare_value = nil
     end
     
     def compare_value
-      base_value = value.gsub(/^\/|\/$/,'')
-      @constants.each do |name,value|
-        base_value.gsub!(/\#\{\s*#{name.to_s}\s*\}/,value.gsub(/^\/|\/$/,''))
+      unless @compare_value
+        @compare_value = value.gsub(/^\/|\/$/,'')
+        @constants.each do |name,value|
+          @compare_value.gsub!(/\#\{\s*#{name.to_s}\s*\}/,value.gsub(/^\/|\/$/,''))
+        end
       end
-      base_value
+      @compare_value
     end
     
     def _value_constants(data=@value)
-      #Hash[*data.scan(/\#\{([^\}]+)\}/).flatten.collect {|value| [value.strip,nil]}.flatten]
       data.scan(/\#\{([^\}]+)\}/).flatten.collect { |value| value.strip }
     end
     

data/lib/yard/handlers/cucumber/feature_handler.rb

@@ -61,11 +61,9 @@ module YARD
             #log.debug "Looking at step #{step_value} against #{stepdef}"
 
             if stepdef.compare_value =~ /.+\#\{[^\}]+\}.+/
-              log.warn "Step definition has packed constant #{stepdef.compare_value}"
+              log.warn "Step definition still has a unpacked constant #{stepdef.compare_value}"
             else
-              if %r{#{stepdef.compare_value}}.match(step_value)
-                return stepdef
-              end
+              return stepdef if %r{#{stepdef.compare_value}}.match(step_value)
             end
           end
 

data/lib/yard/handlers/step_definition_handler.rb

@@ -2,7 +2,7 @@
 
 class StepDefinitionHandler < YARD::Handlers::Ruby::Legacy::Base
   #TODO: This needs to become language independent.
-  MATCH = /^((When|Given|And|Then)\s*(\/[^\/]+\/).+)$/
+  MATCH = /^((When|Given|And|Then)\s*(\/.+\/)\s+do(?:\s\|.+\|)?\s*)$/
   handles MATCH
 
   @@unique_name = 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-in-the-yard
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Franklin Webber