suhyo 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/suhyo/view_matchers.rb

@@ -14,16 +14,24 @@ module Suhyo
 				compacted = @element.gsub(/\s+/, ' ')
 				if index = compacted.index(@content)
 					if @options.has_key?(:before)
-						@other_content_index = compacted.index(options[:before])
-						index < @other_content_index
+						@other_content_index = compacted.index(@options[:before])
+						if @other_content_index.nil?
+							return false
+						else
+							return index < @other_content_index
+						end
 					elsif @options.has_key?(:after)
-						@other_content_index = compacted.index(options[:after])
-						index > @other_content_index
+						@other_content_index = compacted.index(@options[:after])
+						if @other_content_index.nil?
+							return false
+						else
+							return index > @other_content_index
+						end
 					else
-						true
+						return true
 					end
 				else
-					nil
+					return nil
 				end
 			end
 			
@@ -37,14 +45,14 @@ module Suhyo
 			
 			def order_message
 				if @options.has_key?(:before)
-					str = "before #{options[:before]}"
+					str = "before #{@options[:before]}"
 					if @other_content_index.nil?
-						str << " but #{options[:before]} was not foudn"
+						str << " but #{@options[:before]} was not foudn"
 					end
 				elsif @options.has_key?(:after)
-					str = "after #{options[:after]}"
+					str = "after #{@options[:after]}"
 					if @other_content_index.nil?
-						str << " but #{options[:after]} was not foudn"
+						str << " but #{@options[:after]} was not foudn"
 					end
 				else
 					nil
@@ -53,7 +61,10 @@ module Suhyo
 		end
 		
 		# Like Webrat's +contain+ matcher, except it checks that one bit of text comes before or after another.
-		# Useful for testing sort order, for example. 
+		# Can be used to test sort order in an integration test. Usage:
+		#
+		#   response.should contain_in_order('ABC', :before => 'DEF')
+		#   response.should contain_in_order('DEF', :after => 'ABC')
 		def contain_in_order(content, options = {})
 			HaveOrderedContent.new(content, options)
 		end

data/spec/view_matchers_spec.rb

@@ -37,6 +37,44 @@ describe Suhyo::ViewMatchers do
 		end
 	end
 	
+	describe '#contain_in_order' do
+		context 'matching before' do
+			it 'matches when the content is in the right order' do
+				'<p>Foo</p><p>Bar</p>'.should contain_in_order('Foo', :before => 'Bar')
+			end
+			
+			it 'does not match when the content is in the reverse order' do
+				'<p>Bar</p><p>Foo</p>'.should_not contain_in_order('Foo', :before => 'Bar')
+			end
+			
+			it 'does not match when the first content is missing' do
+				'<p>...</p><p>Bar</p>'.should_not contain_in_order('Foo', :before => 'Bar')
+			end
+			
+			it 'does not match when the second content is missing' do
+				'<p>Foo</p><p>...</p>'.should_not contain_in_order('Foo', :before => 'Bar')
+			end
+		end
+		
+		context 'matching after' do
+			it 'matches when the content is in the right order' do
+				'<p>Foo</p><p>Bar</p>'.should contain_in_order('Bar', :after => 'Foo')
+			end
+			
+			it 'does not match when the content is in the reverse order' do
+				'<p>Bar</p><p>Foo</p>'.should_not contain_in_order('Bar', :after => 'Foo')
+			end
+			
+			it 'does not match when the first content is missing' do
+				'<p>Foo</p><p>...</p>'.should_not contain_in_order('Bar', :after => 'Foo')
+			end
+			
+			it 'does not match when the second content is missing' do
+				'<p>...</p><p>Bar</p>'.should_not contain_in_order('Bar', :after => 'Foo')
+			end
+		end
+	end
+	
 	describe '#have_restful_form' do
 		def restful_form(method)
 			case method

data/suhyo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{suhyo}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jarrett"]
-  s.date = %q{2010-03-11}
+  s.date = %q{2010-03-12}
   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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: suhyo
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - jarrett
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -06:00
+date: 2010-03-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency