inversion 0.12.3 → 0.14.0

data/spec/inversion/template/calltag_spec.rb

@@ -1,29 +1,12 @@
 #!/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/calltag'
 
 describe Inversion::Template::CallTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 	# Since call is just an alias, the attrtag_spec already tests all of
 	# this.
 

data/spec/inversion/template/codetag_spec.rb

@@ -1,32 +1,15 @@
 #!/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/codetag'
 
 describe Inversion::Template::CodeTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "is an abstract class" do
-		Inversion::Template::Tag.should < Inversion::AbstractClass
+		expect( Inversion::Template::Tag ).to be < Inversion::AbstractClass
 	end
 
 
@@ -37,13 +20,12 @@ describe Inversion::Template::CodeTag do
 				tag_pattern "$(ident)" do |tag, match|
 					:foo
 				end
-
 			end
 
-			subclass.tag_patterns.should have( 1 ).member
-			subclass.tag_patterns.first[0].
-				should be_an_instance_of( Inversion::Template::CodeTag::TokenPattern )
-			subclass.tag_patterns.first[1].call( :dummy, :king_dummy ).should == :foo
+			expect( subclass.tag_patterns.size ).to eq( 1 )
+			expect( subclass.tag_patterns.first[0] ).
+				to be_an_instance_of( Inversion::Template::CodeTag::TokenPattern )
+			expect( subclass.tag_patterns.first[1].call(:dummy, :king_dummy) ).to eq( :foo )
 		end
 
 	end

data/spec/inversion/template/commenttag_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/commenttag'
 require 'inversion/template/attrtag'
 require 'inversion/template/textnode'
@@ -19,25 +10,16 @@ require 'inversion/renderstate'
 
 describe Inversion::Template::CommentTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
-
 	it "allows any free-form text in its body" do
 		# <?comment Disabled for now ?>...<?end?>
-		Inversion::Template::CommentTag.new( 'Disabled for now' ).
-			should be_a( Inversion::Template::CommentTag )
+		expect( Inversion::Template::CommentTag.new('Disabled for now') ).
+			to be_a( Inversion::Template::CommentTag )
 	end
 
 	it "allows an empty body" do
 		# <?comment ?>...<?end?>
-		Inversion::Template::CommentTag.new( '' ).
-			should be_a( Inversion::Template::CommentTag )
+		expect( Inversion::Template::CommentTag.new('') ).
+			to be_a( Inversion::Template::CommentTag )
 	end
 
 
@@ -49,7 +31,7 @@ describe Inversion::Template::CommentTag do
 		tag << Inversion::Template::AttrTag.new( 'foo', 1, 9 )
 		tag << Inversion::Template::TextNode.new( ' -', 1, 12 )
 
-		tag.as_comment_body.should == 'Commented out 3 nodes on line 1'
+		expect( tag.as_comment_body ).to eq( 'Commented out 3 nodes on line 1' )
 	end
 
 
@@ -61,8 +43,8 @@ describe Inversion::Template::CommentTag do
 		tag << Inversion::Template::AttrTag.new( 'foo', 3, 0 )
 		tag << Inversion::Template::TextNode.new( '- ', 4, 0 )
 
-		tag.as_comment_body.should == "Commented out 3 nodes from line 2 to 4: " +
-			"We couldn't have done it without me"
+		expect( tag.as_comment_body ).
+			to eq( "Commented out 3 nodes from line 2 to 4: We couldn't have done it without me" )
 	end
 
 
@@ -75,7 +57,7 @@ describe Inversion::Template::CommentTag do
 		tag << Inversion::Template::AttrTag.new( 'foo' )
 		tag << Inversion::Template::TextNode.new( ' -' )
 
-		tag.render( render_state ).should == ''
+		expect( tag.render(render_state) ).to eq( '' )
 	end
 
 end

data/spec/inversion/template/configtag_spec.rb

@@ -1,29 +1,18 @@
 #!/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/configtag'
 
 describe Inversion::Template::ConfigTag do
 
 	before( :all ) do
-		setup_logging( :fatal )
 		Inversion::Template.template_paths << 'spec/data'
 	end
 
 	after( :all ) do
 		Inversion::Template.template_paths.delete( 'spec/data' )
-		reset_logging()
 	end
 
 
@@ -31,7 +20,7 @@ describe Inversion::Template::ConfigTag do
 	# <?config comment_end: */ ?>
 	it "can contain a single configuration setting" do
 		tag = Inversion::Template::ConfigTag.new( 'comment_start: /*' )
-		tag.options.should == { :comment_start => '/*' }
+		expect( tag.options ).to eq({ :comment_start => '/*' })
 	end
 
 	# <?config
@@ -67,13 +56,13 @@ describe Inversion::Template::ConfigTag do
 		tag = Inversion::Template::ConfigTag.new( 'comment_start: /*' )
 		state = Inversion::RenderState.new
 
-		expect( tag.render(state) ).to be nil
+		expect( tag.render(state) ).to be_nil
 	end
 
 	it "raises an error on an empty body" do
 		expect {
 			Inversion::Template::ConfigTag.new( '' )
-		}.to raise_exception( Inversion::ParseError, /empty config settings/i )
+		}.to raise_error( Inversion::ParseError, /empty config settings/i )
 	end
 
 
@@ -87,7 +76,7 @@ describe Inversion::Template::ConfigTag do
 		TEMPLATE
 		expect {
 			Inversion::Template.new( source, :ignore_unknown_tags => true )
-		}.to raise_exception( Inversion::ParseError, /unknown tag "what"/i )
+		}.to raise_error( Inversion::ParseError, /unknown tag "what"/i )
 	end
 
 	it "can turn on debugging comments in rendered output" do

data/spec/inversion/template/containertag_spec.rb

@@ -1,29 +1,12 @@
 #!/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/containertag'
 
 describe Inversion::Template::ContainerTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 	context "instances of including classes" do
 
 		before( :each ) do
@@ -34,17 +17,17 @@ describe Inversion::Template::ContainerTag do
 		end
 
 		it "are container tags" do
-			@tag.should be_a_container()
+			expect( @tag ).to be_a_container()
 		end
 
 		it "contain a subnodes array" do
-			@tag.subnodes.should be_an( Array )
+			expect( @tag.subnodes ).to be_an( Array )
 		end
 
 		it "can have other nodes appended to them" do
 			other_node = Inversion::Template::TextNode.new( "foom" )
 			@tag << other_node
-			@tag.subnodes.should include( other_node )
+			expect( @tag.subnodes ).to include( other_node )
 		end
 
 	end

data/spec/inversion/template/defaulttag_spec.rb

@@ -1,58 +1,41 @@
 #!/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/defaulttag'
 
 describe Inversion::Template::DefaultTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "sets a template attribute to a default value" do
 		tmpl = Inversion::Template.new( '<?default foo to 11883 ?><?attr foo ?>' )
-		tmpl.render.should == '11883'
+		expect( tmpl.render ).to eq( '11883' )
 	end
 
 	it "doesn't override a value set on the template as an attribute" do
 		tmpl = Inversion::Template.new( '<?default foo to 11883 ?><?attr foo ?>' )
 		tmpl.foo = 'bar'
-		tmpl.render.should == 'bar'
+		expect( tmpl.render ).to eq( 'bar' )
 	end
 
 	it "can set a template attribute to the result of calling a methodchain" do
 		tmpl = Inversion::Template.
 			new( '<?default width to foo.length ?><?attr foo ?>:<?attr width ?>' )
 		tmpl.foo = 'bar'
-		tmpl.render.should == 'bar:3'
+		expect( tmpl.render ).to eq( 'bar:3' )
 	end
 
 	it "can format the default value" do
 		tmpl = Inversion::Template.
 			new( '<?default width to "[%02d]" % [ foo.length ] ?><?attr foo ?>:<?attr width ?>' )
 		tmpl.foo = 'bar'
-		tmpl.render.should == 'bar:[03]'
+		expect( tmpl.render ).to eq( 'bar:[03]' )
 	end
 
 	it "can render itself as a comment for template debugging" do
 		tag = Inversion::Template::DefaultTag.new( 'width to foo.length' )
-		tag.as_comment_body.should == "Default 'width': { template.foo.length }"
+		expect( tag.as_comment_body ).to eq( "Default 'width': { template.foo.length }" )
 	end
 
 end

data/spec/inversion/template/elsetag_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/iftag'
 require 'inversion/template/elsetag'
 require 'inversion/template/unlesstag'
@@ -21,14 +12,6 @@ require 'inversion/renderstate'
 
 describe Inversion::Template::ElseTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 	it "handles a non-existant body" do
 		Inversion::Template::ElseTag.new( nil )
 	end
@@ -42,7 +25,7 @@ describe Inversion::Template::ElseTag do
 
 		parserstate << iftag << elsetag << endtag
 
-		parserstate.tree.should == [ iftag, endtag ]
+		expect( parserstate.tree ).to eq( [ iftag, endtag ] )
 	end
 
 	it "can be appended to an 'unless' tag" do
@@ -54,8 +37,8 @@ describe Inversion::Template::ElseTag do
 
 		parserstate << unlesstag << elsetag << endtag
 
-		parserstate.tree.should == [ unlesstag, endtag ]
-		unlesstag.subnodes.should include( elsetag )
+		expect( parserstate.tree ).to eq( [ unlesstag, endtag ] )
+		expect( unlesstag.subnodes ).to include( elsetag )
 	end
 
 	it "can be appended to a 'comment' tag" do
@@ -67,8 +50,8 @@ describe Inversion::Template::ElseTag do
 
 		parserstate << commenttag << elsetag << endtag
 
-		parserstate.tree.should == [ commenttag, endtag ]
-		commenttag.subnodes.should include( elsetag )
+		expect( parserstate.tree ).to eq( [ commenttag, endtag ] )
+		expect( commenttag.subnodes ).to include( elsetag )
 	end
 
 	it "raises an error if it's about to be appended to anything other than an 'if', 'unless', " +
@@ -79,7 +62,7 @@ describe Inversion::Template::ElseTag do
 
 		expect {
 			parserstate << Inversion::Template::ElseTag.new
-		}.to raise_exception( Inversion::ParseError, /'for' tags can't have 'else' clauses/i )
+		}.to raise_error( Inversion::ParseError, /'for' tags can't have 'else' clauses/i )
 	end
 
 
@@ -89,14 +72,14 @@ describe Inversion::Template::ElseTag do
 
 		expect {
 			parserstate << Inversion::Template::ElseTag.new
-		}.to raise_exception( Inversion::ParseError, /orphaned 'else' tag/i )
+		}.to raise_error( Inversion::ParseError, /orphaned 'else' tag/i )
 	end
 
 
 	it "doesn't render as anything by itself" do
 		renderstate = Inversion::RenderState.new
 		tag = Inversion::Template::ElseTag.new
-		tag.render( renderstate ).should be_nil()
+		expect( tag.render(renderstate) ).to be_nil()
 	end
 
 end

data/spec/inversion/template/elsiftag_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/iftag'
 require 'inversion/template/elsiftag'
 require 'inversion/template/unlesstag'
@@ -20,14 +11,6 @@ require 'inversion/renderstate'
 
 describe Inversion::Template::ElsifTag do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "can be appended to an 'if' tag" do
 		template    = double( "template object" )
@@ -38,7 +21,7 @@ describe Inversion::Template::ElsifTag do
 
 		parserstate << iftag << elsetag << endtag
 
-		parserstate.tree.should == [ iftag, endtag ]
+		expect( parserstate.tree ).to eq( [ iftag, endtag ] )
 	end
 
 	it "can be appended to a 'comment' tag" do
@@ -50,8 +33,8 @@ describe Inversion::Template::ElsifTag do
 
 		parserstate << commenttag << elsetag << endtag
 
-		parserstate.tree.should == [ commenttag, endtag ]
-		commenttag.subnodes.should include( elsetag )
+		expect( parserstate.tree ).to eq( [ commenttag, endtag ] )
+		expect( commenttag.subnodes ).to include( elsetag )
 	end
 
 	it "raises an error if it's about to be appended to anything other than an 'if' or 'comment' tag" do
@@ -61,7 +44,7 @@ describe Inversion::Template::ElsifTag do
 
 		expect {
 			parserstate << Inversion::Template::ElsifTag.new( 'bar' )
-		}.to raise_exception( Inversion::ParseError, /'unless' tags can't have 'elsif' clauses/i )
+		}.to raise_error( Inversion::ParseError, /'unless' tags can't have 'elsif' clauses/i )
 	end
 
 
@@ -71,14 +54,14 @@ describe Inversion::Template::ElsifTag do
 
 		expect {
 			parserstate << Inversion::Template::ElsifTag.new( 'bar' )
-		}.to raise_exception( Inversion::ParseError, /orphaned 'elsif' tag/i )
+		}.to raise_error( Inversion::ParseError, /orphaned 'elsif' tag/i )
 	end
 
 
 	it "renders as its attribute value if it's a simple attribute" do
 		renderstate = Inversion::RenderState.new( :bar => :the_attribute_value )
 		tag = Inversion::Template::ElsifTag.new( 'bar' )
-		tag.evaluate( renderstate ).should == :the_attribute_value
+		expect( tag.evaluate( renderstate ) ).to eq( :the_attribute_value )
 	end
 
 end