suhyo 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/suhyo/view_matchers.rb

@@ -21,20 +21,20 @@ module Suhyo
 				@document = Webrat::XML.document(stringlike)
 				@element = @document.inner_text
 				compacted = @element.gsub(/\s+/, ' ')
-				if index = compacted.index(@content)
+				if @main_content_index = compacted.index(@content)
 					if @options.has_key?(:before)
 						@other_content_index = compacted.index(@options[:before])
 						if @other_content_index.nil?
 							return false
 						else
-							return index < @other_content_index
+							return @main_content_index < @other_content_index
 						end
 					elsif @options.has_key?(:after)
 						@other_content_index = compacted.index(@options[:after])
 						if @other_content_index.nil?
 							return false
 						else
-							return index > @other_content_index
+							return @main_content_index > @other_content_index
 						end
 					else
 						return true
@@ -55,13 +55,13 @@ module Suhyo
 			def order_message
 				if @options.has_key?(:before)
 					str = %Q{ before "#{@options[:before]}"}
-					if @other_content_index.nil?
+					if !@main_content_index.nil? and @other_content_index.nil?
 						str << %Q{ but "#{@options[:before]}" was not found}
 					end
 					return str
 				elsif @options.has_key?(:after)
 					str = %Q{ after "#{@options[:after]}"}
-					if @other_content_index.nil?
+					if !@main_content_index.nil? and @other_content_index.nil?
 						str << %Q{ but "#{@options[:after]}" was not found}
 					end
 					return str
@@ -178,4 +178,4 @@ module Suhyo
 			HaveRestfulForm.new(method, options)
 		end
 	end
-end
+end

data/lib/suhyo/webrat_steps.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require 'webrat'
 require 'suhyo'
 

data/spec/view_matchers_spec.rb

@@ -76,13 +76,20 @@ describe Suhyo::ViewMatchers do
 			it 'tells the expected order in the error message' do
 				lambda do
 					'<p>Bar</p><p>Foo</p>'.should contain_in_order('Foo', :before => 'Bar')
-				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /expected the following element's content to include "Foo" before "Bar":/)
+				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /^expected the following element's content to include "Foo" before "Bar":/)
 			end
 			
 			it 'tells you if the reference content is missing' do
 				lambda do
 					'<p>Foo</p><p>...</p>'.should contain_in_order('Foo', :before => 'Bar')
-				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /expected the following element's content to include "Foo" before "Bar" but "Bar" was not found:/)
+				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /^expected the following element's content to include "Foo" before "Bar" but "Bar" was not found:/)
+			end
+			
+			# Bug fix
+			it 'does not falsely tell you the reference content is missing when the main content is missing' do
+				lambda do
+					'<p>...</p><p>Bar</p>'.should contain_in_order('Foo', :before => 'Bar')
+				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /^expected the following element\'s content to include "Foo" before "Bar":/)
 			end
 		end
 		
@@ -106,13 +113,20 @@ describe Suhyo::ViewMatchers do
 			it 'tells the expected order in the error message' do
 				lambda do
 					'<p>Foo</p><p>Bar</p>'.should contain_in_order('Foo', :after => 'Bar')
-				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /expected the following element's content to include "Foo" after "Bar":/)
+				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /^expected the following element's content to include "Foo" after "Bar":/)
 			end
 			
 			it 'tells you if the reference content is missing' do
 				lambda do
 					'<p>...</p><p>Foo</p>'.should contain_in_order('Foo', :after => 'Bar')
-				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /expected the following element's content to include "Foo" after "Bar" but "Bar" was not found:/)
+				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /^expected the following element's content to include "Foo" after "Bar" but "Bar" was not found:/)
+			end
+			
+			# Bug fix
+			it 'does not falsely tell you the reference content is missing when the main content is missing' do
+				lambda do
+					'<p>Bar</p><p>...</p>'.should contain_in_order('Foo', :after => 'Bar')
+				end.should raise_error(Spec::Expectations::ExpectationNotMetError, /^expected the following element's content to include "Foo" after "Bar":/)
 			end
 		end
 	end

data/spec/webrat_steps_spec.rb

@@ -124,4 +124,4 @@ describe 'Suhyo Webrat Steps' do
 			scenario('webrat.feature', 'partial query string expected, path wrong').should fail_cuke
 		end
 	end
-end
+end

data/suhyo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{suhyo}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jarrett"]
-  s.date = %q{2010-03-14}
+  s.date = %q{2010-03-17}
   s.description = %q{Matchers built on Webrat to address some common needs in web app testing}
   s.email = %q{jarrett@uchicago.edu}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - jarrett
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 -06:00
+date: 2010-03-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency