inversion 0.12.3 → 0.14.0

data/spec/inversion/template/importtag_spec.rb

@@ -1,37 +1,20 @@
 #!/usr/bin/env rspec -cfd -b
 # vim: set noet nosta sw=4 ts=4 :
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent.parent.parent
-	libdir = basedir + 'lib'
+require_relative '../../helpers'
 
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-require 'rspec'
-require 'spec/lib/helpers'
 require 'inversion/template/importtag'
 
 describe Inversion::Template::ImportTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 	it "can import a single attribute" do
 		tag = Inversion::Template::ImportTag.new( 'txn ' )
-		tag.attributes.should == [ :txn ]
+		expect( tag.attributes ).to eq( [ :txn ] )
 	end
 
 	it "can import multiple attributes" do
 		tag = Inversion::Template::ImportTag.new( 'txn, applet' )
-		tag.attributes.should == [ :txn, :applet ]
+		expect( tag.attributes ).to eq( [ :txn, :applet ] )
 	end
 
 
@@ -46,7 +29,7 @@ describe Inversion::Template::ImportTag do
 			outside.subtemplate = @subtemplate
 			outside.foo = 'Froo'
 
-			outside.render.should == 'FrooFroo'
+			expect( outside.render ).to eq( 'FrooFroo' )
 		end
 
 		it "doesn't override values set explicitly on the subtemplate" do
@@ -56,7 +39,7 @@ describe Inversion::Template::ImportTag do
 
 			@subtemplate.foo = 'Frar'
 
-			outside.render.should == 'FrooFrar'
+			expect( outside.render ).to eq( 'FrooFrar' )
 		end
 
 	end
@@ -76,7 +59,7 @@ describe Inversion::Template::ImportTag do
 			outside.foo = 'mission'
 			outside.bar = 'accomplished'
 
-			outside.render.should == 'Mission: Accomplished'
+			expect( outside.render ).to eq( 'Mission: Accomplished' )
 		end
 
 		it "doesn't override values set explicitly on the subtemplate" do
@@ -87,7 +70,7 @@ describe Inversion::Template::ImportTag do
 
 			@subtemplate.bar = 'abandoned'
 
-			outside.render.should == 'Mission: Abandoned'
+			expect( outside.render ).to eq( 'Mission: Abandoned' )
 		end
 
 		it "only imports listed attributes" do
@@ -97,7 +80,7 @@ describe Inversion::Template::ImportTag do
 			outside.bar = 'Just This One'
 			outside.baz = 'And Not This One'
 
-			outside.render.should == 'Attributes: Just this one'
+			expect( outside.render ).to eq( 'Attributes: Just this one' )
 		end
 	end
 

data/spec/inversion/template/includetag_spec.rb

@@ -1,82 +1,67 @@
 #!/usr/bin/env rspec -cfd -b
 # vim: set noet nosta sw=4 ts=4 :
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent.parent.parent
-	libdir = basedir + 'lib'
-
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
+require_relative '../../helpers'
 
 require 'timeout'
-require 'rspec'
-require 'spec/lib/helpers'
 require 'inversion/template'
 require 'inversion/template/includetag'
 
 describe Inversion::Template::IncludeTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "renders the IncludeTag as an empty string" do
 		included_path = Pathname.pwd + 'included.tmpl'
-		FileTest.stub( :exist? ).with( included_path.to_s ).and_return true
-		IO.stub( :read ).with( included_path.to_s ).and_return( 'there,' )
+		expect( FileTest ).to receive( :exist? ).with( included_path.to_s ).and_return( true )
+		expect( IO ).to receive( :read ).with( included_path.to_s ).and_return( 'there,' )
 
 		tmpl = Inversion::Template.new( "hi <?include included.tmpl ?> handsome!" )
-		tmpl.render.should == "hi there, handsome!"
+		expect( tmpl.render ).to eq( "hi there, handsome!" )
 	end
 
 
 	it "renders debugging comments with the included template path" do
 		included_path = Pathname.pwd + 'included.tmpl'
-		FileTest.stub( :exist? ).with( included_path.to_s ).and_return true
-		IO.stub( :read ).with( included_path.to_s ).and_return( 'there,' )
+		expect( FileTest ).to receive( :exist? ).with( included_path.to_s ).and_return( true )
+		expect( IO ).to receive( :read ).with( included_path.to_s ).and_return( 'there,' )
 
 		tmpl = Inversion::Template.
 			new( "hi <?include included.tmpl ?> handsome!", :debugging_comments => true )
-		tmpl.render.should =~ /Include "included\.tmpl"/
+		expect( tmpl.render ).to match( /Include "included\.tmpl"/ )
 	end
 
 
 	it "appends the nodes from a separate template onto the including template" do
 		included_path = Pathname.pwd + 'included.tmpl'
-		FileTest.stub( :exist? ).with( included_path.to_s ).and_return true
-		IO.stub( :read ).with( included_path.to_s ).and_return( 'there,' )
+		expect( FileTest ).to receive( :exist? ).with( included_path.to_s ).and_return( true )
+		expect( IO ).to receive( :read ).with( included_path.to_s ).and_return( 'there,' )
 
 		tmpl = Inversion::Template.new( "hi <?include included.tmpl ?> handsome!" )
-		tmpl.node_tree.should have(4).members
-		tmpl.node_tree[0].should be_a( Inversion::Template::TextNode )
-		tmpl.node_tree[1].should be_a( Inversion::Template::IncludeTag )
-		tmpl.node_tree[2].should be_a( Inversion::Template::TextNode )
-		tmpl.node_tree[3].should be_a( Inversion::Template::TextNode )
+		expect( tmpl.node_tree.size ).to eq( 4 )
+		expect( tmpl.node_tree[0] ).to be_a( Inversion::Template::TextNode )
+		expect( tmpl.node_tree[1] ).to be_a( Inversion::Template::IncludeTag )
+		expect( tmpl.node_tree[2] ).to be_a( Inversion::Template::TextNode )
+		expect( tmpl.node_tree[3] ).to be_a( Inversion::Template::TextNode )
 	end
 
 
 	it "allows the same template to be included multiple times" do
 		included_path = Pathname.pwd + 'included.tmpl'
-		FileTest.stub( :exist? ).with( included_path.to_s ).and_return true
-		IO.stub( :read ).with( included_path.to_s ).and_return( ' hi' )
+		expect( FileTest ).to receive( :exist? ).
+			with( included_path.to_s ).twice.and_return( true )
+		expect( IO ).to receive( :read ).
+			with( included_path.to_s ).twice.and_return( ' hi' )
 
 		tmpl = Inversion::Template.
 			new( "hi<?include included.tmpl ?><?include included.tmpl ?> handsome!" )
-		tmpl.render.should == "hi hi hi handsome!"
+		expect( tmpl.render ).to eq( "hi hi hi handsome!" )
 	end
 
 
 	it "raises exception on include loops" do
 		included_path = Pathname.pwd + 'included.tmpl'
-		FileTest.stub( :exist? ).with( included_path.to_s ).and_return true
-		IO.stub( :read ).with( included_path.to_s ).and_return( "<?include included.tmpl ?>" )
+		expect( FileTest ).to receive( :exist? ).with( included_path.to_s ).and_return( true )
+		expect( IO ).to receive( :read ).with( included_path.to_s ).and_return( "<?include included.tmpl ?>" )
 
 		expect {
 			Inversion::Template.new( "hi <?include included.tmpl ?> handsome!" )
@@ -89,14 +74,14 @@ describe Inversion::Template::IncludeTag do
 		middle_path = Pathname.pwd + 'middle.tmpl'
 		bottom_path = Pathname.pwd + 'bottom.tmpl'
 
-		FileTest.stub( :exist? ).with( top_path.to_s ).and_return true
-		IO.stub( :read ).with( top_path.to_s ).and_return( "<?include middle.tmpl ?>" )
+		expect( FileTest ).to receive( :exist? ).with( top_path.to_s ).and_return( true )
+		expect( IO ).to receive( :read ).with( top_path.to_s ).and_return( "<?include middle.tmpl ?>" )
 
-		FileTest.stub( :exist? ).with( middle_path.to_s ).and_return true
-		IO.stub( :read ).with( middle_path.to_s ).and_return( "<?include bottom.tmpl ?>" )
+		expect( FileTest ).to receive( :exist? ).with( middle_path.to_s ).and_return( true )
+		expect( IO ).to receive( :read ).with( middle_path.to_s ).and_return( "<?include bottom.tmpl ?>" )
 
-		FileTest.stub( :exist? ).with( bottom_path.to_s ).and_return true
-		IO.stub( :read ).with( bottom_path.to_s ).and_return( "<?include top.tmpl ?>" )
+		expect( FileTest ).to receive( :exist? ).with( bottom_path.to_s ).and_return( true )
+		expect( IO ).to receive( :read ).with( bottom_path.to_s ).and_return( "<?include top.tmpl ?>" )
 
 		expect {
 			Inversion::Template.new( "hi <?include top.tmpl ?> handsome!" )

data/spec/inversion/template/node_spec.rb

@@ -1,17 +1,8 @@
 #!/usr/bin/env rspec -cfd -b
 # vim: set noet nosta sw=4 ts=4 :
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent.parent.parent
-	libdir = basedir + 'lib'
+require_relative '../../helpers'
 
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-require 'rspec'
-require 'spec/lib/helpers'
 require 'inversion/template/node'
 
 describe Inversion::Template::Node do
@@ -21,27 +12,27 @@ describe Inversion::Template::Node do
 	it "is an abstract class" do
 		expect {
 			Inversion::Template::Node.new( '' )
-		}.to raise_exception( NoMethodError, /private method `new'/i )
+		}.to raise_error( NoMethodError, /private method `new'/i )
 	end
 
 	it "defaults to using inspect to render itself as a comment" do
 		node = concrete_subclass.new( '' )
-		node.as_comment_body.should == node.inspect
+		expect( node.as_comment_body ).to eq( node.inspect )
 	end
 
 	it "isn't a container" do
 		node = concrete_subclass.new( '' )
-		node.should_not be_a_container()
+		expect( node ).to_not be_a_container()
 	end
 
 	it "knows where it was parsed from if constructed with a position" do
 		node = concrete_subclass.new( '', 4, 12 )
-		node.location.should =~ /line 4, column 12/
+		expect( node.location ).to match( /line 4, column 12/ )
 	end
 
 	it "knows that it was created from an unknown location if created without a position" do
 		node = concrete_subclass.new( '' )
-		node.location.should == 'line ??, column ??'
+		expect( node.location ).to eq( 'line ??, column ??' )
 	end
 
 	it "doesn't raise an exception when the before_appending event callback is called" do

data/spec/inversion/template/pptag_spec.rb

@@ -1,31 +1,14 @@
 #!/usr/bin/env rspec -cfd -b
 # vim: set noet nosta sw=4 ts=4 :
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent.parent.parent
-	libdir = basedir + 'lib'
+require_relative '../../helpers'
 
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-require 'rspec'
-require 'spec/lib/helpers'
 require 'inversion/template/pptag'
 
 describe Inversion::Template::PpTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 	before( :each ) do
-		@attribute_object = mock( "template attribute" )
+		@attribute_object = double( "template attribute" )
 	end
 
 
@@ -33,19 +16,23 @@ describe Inversion::Template::PpTag do
 		template = Inversion::Template.
 			new( 'It looks like: <tt><?pp foo.bar ?></tt>.', :escape_format => :none )
 		template.foo = @attribute_object
-		@attribute_object.should_receive( :bar ).with( no_args() ).
+		expect( @attribute_object ).to receive( :bar ).with( no_args ).
 			and_return({ :a_complex => [:datastructure, :or, :something] })
 
-		template.render.should == "It looks like: <tt>{:a_complex=>[:datastructure, :or, :something]}</tt>."
+		expect(
+			template.render
+		).to eq( "It looks like: <tt>{:a_complex=>[:datastructure, :or, :something]}</tt>." )
 	end
 
 	it "escapes as HTML if the format is set to :html" do
 		template = Inversion::Template.
 			new( 'It looks like: <tt><?pp foo.bar ?></tt>.', :escape_format => :html )
 		template.foo = @attribute_object
-		@attribute_object.should_receive( :bar ).with( no_args() ).
+		expect( @attribute_object ).to receive( :bar ).with( no_args() ).
 			and_return({ :a_complex => [:datastructure, :or, :something] })
 
-		template.render.should == "It looks like: <tt>{:a_complex=&gt;[:datastructure, :or, :something]}</tt>."
+		expect(
+			template.render
+		).to eq( "It looks like: <tt>{:a_complex=&gt;[:datastructure, :or, :something]}</tt>." )
 	end
 end

data/spec/inversion/template/publishtag_spec.rb

@@ -1,17 +1,8 @@
 #!/usr/bin/env rspec -cfd -b
 # vim: set noet nosta sw=4 ts=4 :
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent.parent.parent
-	libdir = basedir + 'lib'
+require_relative '../../helpers'
 
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-require 'rspec'
-require 'spec/lib/helpers'
 require 'inversion/template/publishtag'
 
 describe Inversion::Template::PublishTag do
@@ -29,24 +20,16 @@ describe Inversion::Template::PublishTag do
 	end # class TestSubscriber
 
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "raises a parse error if the body isn't a simple attribute" do
 		expect {
 			Inversion::Template::PublishTag.new( 'a.non-identifier' )
-		}.to raise_exception( Inversion::ParseError, /malformed key/i )
+		}.to raise_error( Inversion::ParseError, /malformed key/i )
 	end
 
 
 	it "doesn't render its contents in the template it's declared in" do
-		Inversion::Template.new( "<?publish foo ?>Some stuff<?end ?>" ).render.should == ''
+		expect( Inversion::Template.new( "<?publish foo ?>Some stuff<?end ?>" ).render ).to eq( '' )
 	end
 
 
@@ -61,7 +44,7 @@ describe Inversion::Template::PublishTag do
 
 		publishtag.render( renderstate )
 
-		subscriber.published_nodes.should == [ 'elveses' ]
+		expect( subscriber.published_nodes ).to eq( [ 'elveses' ] )
 	end
 
 end

data/spec/inversion/template/rescuetag_spec.rb

@@ -1,17 +1,8 @@
 #!/usr/bin/env rspec -cfd -b
 # vim: set noet nosta sw=4 ts=4 :
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent.parent.parent
-	libdir = basedir + 'lib'
+require_relative '../../helpers'
 
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-require 'rspec'
-require 'spec/lib/helpers'
 require 'inversion/template/begintag'
 require 'inversion/template/rescuetag'
 require 'inversion/template/commenttag'
@@ -20,32 +11,24 @@ require 'inversion/renderstate'
 
 describe Inversion::Template::RescueTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 	it "handles a non-existant body" do
 		tag = Inversion::Template::RescueTag.new( nil )
-		tag.exception_types.should == [ ::RuntimeError ]
+		expect( tag.exception_types ).to eq( [ ::RuntimeError ] )
 	end
 
 	it "parses its body into classes" do
 		tag = Inversion::Template::RescueTag.new( 'ScriptError' )
-		tag.exception_types.should == [ ::ScriptError ]
+		expect( tag.exception_types ).to eq( [ ::ScriptError ] )
 	end
 
 	it "handles fully-qualified class names" do
 		tag = Inversion::Template::RescueTag.new( '::ScriptError' )
-		tag.exception_types.should == [ ::ScriptError ]
+		expect( tag.exception_types ).to eq( [ ::ScriptError ] )
 	end
 
 	it "can parse multiple exception class names" do
 		tag = Inversion::Template::RescueTag.new( '::ScriptError, Inversion::ParseError' )
-		tag.exception_types.should == [ ::ScriptError, Inversion::ParseError ]
+		expect( tag.exception_types ).to eq( [ ::ScriptError, Inversion::ParseError ] )
 	end
 
 	it "can be appended to a 'begin' tag" do
@@ -58,8 +41,8 @@ describe Inversion::Template::RescueTag do
 
 		parserstate << begintag << rescuetag << textnode << endtag
 
-		parserstate.tree.should == [ begintag, endtag ]
-		begintag.rescue_clauses.should == [ [[::RuntimeError], [textnode]] ]
+		expect( parserstate.tree ).to eq( [ begintag, endtag ] )
+		expect( begintag.rescue_clauses ).to eq( [ [[::RuntimeError], [textnode]] ] )
 	end
 
 	it "can be appended to a 'comment' tag" do
@@ -71,8 +54,8 @@ describe Inversion::Template::RescueTag do
 
 		parserstate << commenttag << rescuetag << endtag
 
-		parserstate.tree.should == [ commenttag, endtag ]
-		commenttag.subnodes.should include( rescuetag )
+		expect( parserstate.tree ).to eq( [ commenttag, endtag ] )
+		expect( commenttag.subnodes ).to include( rescuetag )
 	end
 
 	it "raises an error if it's about to be appended to anything other than a 'begin' or " +
@@ -83,7 +66,7 @@ describe Inversion::Template::RescueTag do
 
 		expect {
 			parserstate << Inversion::Template::RescueTag.new
-		}.to raise_exception( Inversion::ParseError, /'for' tags can't have 'rescue' clauses/i )
+		}.to raise_error( Inversion::ParseError, /'for' tags can't have 'rescue' clauses/i )
 	end
 
 
@@ -93,14 +76,14 @@ describe Inversion::Template::RescueTag do
 
 		expect {
 			parserstate << Inversion::Template::RescueTag.new
-		}.to raise_exception( Inversion::ParseError, /orphaned 'rescue' tag/i )
+		}.to raise_error( Inversion::ParseError, /orphaned 'rescue' tag/i )
 	end
 
 
 	it "doesn't render as anything by itself" do
 		renderstate = Inversion::RenderState.new
 		tag = Inversion::Template::RescueTag.new
-		tag.render( renderstate ).should be_nil()
+		expect( tag.render( renderstate ) ).to be_nil()
 	end
 
 end