step_master 0.0.3 → 0.0.4

data/lib/step_master/matcher.rb

@@ -38,6 +38,11 @@ module StepMaster
 		#	  matcher << "Given /^this is a step$/ do"
 		#
 		def <<(value)
+			add(value, :format => :rb)
+		end
+		
+		def add(value, options = {})
+			
 			raise "#{value.inspect} is not a step" unless value =~ STEP_REGEX
 			
 			full_line = $&
@@ -65,7 +70,7 @@ module StepMaster
 				regex.scan(CHUNK_REGEX).unshift(" ").unshift(step_type).collect { |i| StepItem.new(i, regex_options) }
 			end
 						
-			elements.inject(@match_table) { |parent, i| parent[i] ||= Possible.new }.terminal!(value)			
+			elements.inject(@match_table) { |parent, i| parent[i] ||= Possible.new }.terminal!(value, options)					
 		end
 		
 		# Returns all possible outcomes of a string.
@@ -94,8 +99,13 @@ module StepMaster
 		end
 		
 		def where_is?(string)
-			find_possible(string).select{ |x| x.terminal? }.collect { |x| x.result }
-		end		
+			find_possible(string).select{ |x| x.terminal? }.collect { |x| x.file || x.result }
+		end
+		
+		def terminals(string)
+			find_possible(string).select{ |x| x.terminal? }
+		end
+		
 		
 private
 		def find_possible(input, against = @match_table)

data/lib/step_master/possible.rb

@@ -2,20 +2,27 @@ module StepMaster
 	class Possible < ::Hash
 		EMPTY = Possible.new		
 		
-		def terminal!(result)
-			@terminal = result.freeze
+		attr_reader :file_path, :line_number
+		
+		def terminal!(result, options = {})
+			@terminal = true
+			@result = result
+			@file_path = options[:file_path].freeze
+			@line_number = options[:line_number].freeze
 		end
 		
 		def terminal?
-			!@terminal.nil?
+			@terminal
 		end
 		
 		def result
-			@terminal
+			@result
 		end
 		
-		def inspect
-			super << ((terminal? )? "["+result+"]" : "")
+		def file
+			if @file_path
+				[@file_path, @line_number].compact.join(":")
+			end
 		end
 	end
 end

data/lib/step_master.rb

@@ -4,5 +4,5 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'step_master/matcher'
 
 module StepMaster
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/step_helper/matcher_spec.rb

@@ -27,6 +27,40 @@ module StepMaster
 			end
 		end
 		
+
+		
+		describe "#add()" do
+			it "accepts a string" do
+				@matcher.add(VALID_STEP)
+			end
+			
+			it "should not like a step it can't parse" do
+				lambda {
+					@matcher.add "This is not a step"
+				}.should raise_error(%q["This is not a step" is not a step])
+			end			
+			
+			describe "accepts optional paramters" do
+				it "should accept :file_path with just a file name" do
+					@matcher.add(VALID_STEP, :file_path => "step.rb")
+				end
+				
+				it "should accept :file_path an entire path" do
+					@matcher.add(VALID_STEP, :file_path => "/src/project/step.rb")
+				end
+				
+				it "should accept :file_path and :line_number" do
+					@matcher.add(VALID_STEP, :file_path => "/src/project/step.rb", :line_number => 6)
+				end
+				
+				it "should accept :format" do
+					@matcher.add(VALID_STEP, :format => :rb)
+				end				
+			end
+			
+		end
+				
+		
 		describe "#is_match?" do
 			
 			describe "with a terminal and longer step" do
@@ -305,17 +339,40 @@ module StepMaster
 			end	
 			
 		end		
+		
 		describe "#where_is?" do 
 			describe "with step with a comment" do
 				before :each do
-					@matcher << %q~Given /^this$/i do |name| # This is a comment~
+					@matcher << %q~Given /^this$/i do # This is a comment~
 				end
 				
 				it "should return the original line with where_is?" do
-					@matcher.where_is?("Given this").should include(%q~Given /^this$/i do |name| # This is a comment~)
+					@matcher.where_is?("Given this").should include(%q~Given /^this$/i do # This is a comment~)
 				end
 			end
+			
+			describe "with step with a file path" do
+				before :each do
+					@matcher.add(%q~Given /^this$/i do~, :file_path => "/src/test.rb")
+				end
+				
+				it "should return the original line with where_is?" do
+					@matcher.where_is?("Given this").should include(%q~/src/test.rb~)
+				end
+			end
+			
+			describe "with step with a file path and line_number" do
+				before :each do
+					@matcher.add(%q~Given /^this$/i do ~, :file_path => "/src/test.rb", :line_number => 6)
+				end
+				
+				it "should return the original line with where_is?" do
+					@matcher.where_is?("Given this").should include(%q~/src/test.rb:6~)
+				end
+			end			
+			
 		end
+		
 	end
 	
 	describe Matcher do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: step_master
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jim Holmes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -04:00
+date: 2009-10-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency