strelka 0.6.0 → 0.7.0

data/spec/strelka/app/routing_spec.rb

@@ -2,16 +2,10 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/plugins'
 require 'strelka/app/routing'
@@ -35,7 +29,7 @@ describe Strelka::App::Routing do
 	end
 
 
-	it_should_behave_like( "A Strelka::App Plugin" )
+	it_should_behave_like( "A Strelka Plugin" )
 
 
 	describe "an including App" do
@@ -51,124 +45,126 @@ describe Strelka::App::Routing do
 
 
 		it "has an Array of raw routes" do
-			@app.routes.should be_a( Array )
+			expect( @app.routes ).to be_a( Array )
 		end
 
 		it "knows what its route methods are" do
-			@app.route_methods.should == []
+			expect( @app.route_methods ).to eq( [] )
 			@app.class_eval do
 				get() {}
 				post( '/clowns' ) {}
 				options( '/clowns' ) {}
 			end
 
-			@app.route_methods.should == [ :GET, :POST_clowns, :OPTIONS_clowns ]
+			expect( @app.route_methods ).to eq( [ :GET, :POST_clowns, :OPTIONS_clowns ] )
 		end
 
 		# OPTIONS GET/HEAD POST PUT DELETE TRACE CONNECT
 
 		it "can declare a OPTIONS route" do
-			@app.routes.should be_empty()
+			expect( @app.routes ).to be_empty()
 
 			@app.class_eval do
 				options do |req|
 				end
 			end
 
-			@app.routes.should == [
+			expect( @app.routes ).to eq([
 				[ :OPTIONS, [], {action: @app.instance_method(:OPTIONS), options: {}} ]
-			]
+			])
 		end
 
 		it "can declare a GET route" do
-			@app.routes.should be_empty()
+			expect( @app.routes ).to be_empty()
 
 			@app.class_eval do
 				get do |req|
 				end
 			end
 
-			@app.routes.should == [
+			expect( @app.routes ).to eq([
 				[ :GET, [], {action: @app.instance_method(:GET), options: {}} ]
-			]
+			])
 		end
 
 		it "can declare a POST route" do
-			@app.routes.should be_empty()
+			expect( @app.routes ).to be_empty()
 
 			@app.class_eval do
 				post do |req|
 				end
 			end
 
-			@app.routes.should == [
+			expect( @app.routes ).to eq([
 				[ :POST, [], {action: @app.instance_method(:POST), options: {}} ]
-			]
+			])
 		end
 
 		it "can declare a PUT route" do
-			@app.routes.should be_empty()
+			expect( @app.routes ).to be_empty()
 
 			@app.class_eval do
 				put do |req|
 				end
 			end
 
-			@app.routes.should == [[ :PUT, [], {action: @app.instance_method(:PUT), options: {}} ]]
+			expect( @app.routes ).to eq([
+				[ :PUT, [], {action: @app.instance_method(:PUT), options: {}} ]
+			])
 		end
 
 		it "can declare a DELETE route" do
-			@app.routes.should be_empty()
+			expect( @app.routes ).to be_empty()
 
 			@app.class_eval do
 				delete do |req|
 				end
 			end
 
-			@app.routes.should == [
+			expect( @app.routes ).to eq([
 				[ :DELETE, [], {action: @app.instance_method(:DELETE), options: {}} ]
-			]
+			])
 		end
 
 		it "can declare a TRACE route" do
-			@app.routes.should be_empty()
+			expect( @app.routes ).to be_empty()
 
 			@app.class_eval do
 				trace do |req|
 				end
 			end
 
-			@app.routes.should == [
+			expect( @app.routes ).to eq([
 				[ :TRACE, [], {action: @app.instance_method(:TRACE), options: {}} ]
-			]
+			])
 		end
 
 		it "can declare a CONNECT route" do
-			@app.routes.should be_empty()
+			expect( @app.routes ).to be_empty()
 
 			@app.class_eval do
 				connect do |req|
 				end
 			end
 
-			@app.routes.should == [
+			expect( @app.routes ).to eq([
 				[ :CONNECT, [], {action: @app.instance_method(:CONNECT), options: {}} ]
-			]
+			])
 		end
 
 
 
 		it "allows a route to specify a path" do
-			@app.routes.should be_empty()
+			expect( @app.routes ).to be_empty()
 
 			@app.class_eval do
 				get '/info' do |req|
 				end
 			end
 
-			@app.routes.should == [
+			expect( @app.routes ).to eq([
 				[ :GET, ['info'], {action: @app.instance_method(:GET_info), options: {}} ]
-			]
+			])
 		end
 
 		it "allows a route to omit the leading '/' when specifying a path" do
@@ -177,9 +173,9 @@ describe Strelka::App::Routing do
 				end
 			end
 
-			@app.routes.should == [
+			expect( @app.routes ).to eq([
 				[ :GET, ['info'], {action: @app.instance_method(:GET_info), options: {}} ]
-			]
+			])
 		end
 
 		it "allows a route to specify a path via a Regex" do
@@ -188,13 +184,13 @@ describe Strelka::App::Routing do
 				end
 			end
 
-			@app.routes.first[0,2].should == [ :GET, [/\.pdf$/] ]
+			expect( @app.routes.first[0,2] ).to eq( [ :GET, [/\.pdf$/] ] )
 		end
 
 
 		it "uses the Strelka::Router::Default as it's router by default" do
-			@app.routerclass.should == :default
-			@app.new.router.should be_a( Strelka::Router::Default )
+			expect( @app.routerclass ).to eq( :default )
+			expect( @app.new.router ).to be_a( Strelka::Router::Default )
 		end
 
 		it "can specify a different Router class than the default" do
@@ -202,8 +198,8 @@ describe Strelka::App::Routing do
 			@app.class_eval do
 				router MyRouter
 			end
-			@app.routerclass.should equal( MyRouter )
-			@app.new.router.should be_a( MyRouter )
+			expect( @app.routerclass ).to equal( MyRouter )
+			expect( @app.new.router ).to be_a( MyRouter )
 		end
 
 
@@ -218,17 +214,17 @@ describe Strelka::App::Routing do
 				get( '/origami' ) {}
 			end
 
-			subclass.routes.should have( 3 ).members
+			expect( subclass.routes ).to have( 3 ).members
 
 			subclass.routes.
 				should include([ :GET, ['info'], {action: @app.instance_method(:GET_info), options: {}} ])
 			subclass.routes.
 				should include([ :GET, ['about'], {action: @app.instance_method(:GET_about), options: {}} ])
-			subclass.routes.should include(
+			expect( subclass.routes ).to include(
 				[ :GET, ['origami'], {action: subclass.instance_method(:GET_origami), options: {}} ]
 			)
 
-			subclass.routerclass.should == @app.routerclass
+			expect( subclass.routerclass ).to eq( @app.routerclass )
 		end
 
 		describe "that also uses the :parameters plugin" do
@@ -244,9 +240,10 @@ describe Strelka::App::Routing do
 					end
 				end
 
-				@app.routes.should ==
-					[[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
-					   {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]]
+				expect( @app.routes ).to eq([
+					[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
+					  {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]
+				])
 			end
 
 			it "unbinds parameter patterns bound with ^ and $ for the route" do
@@ -256,9 +253,10 @@ describe Strelka::App::Routing do
 					end
 				end
 
-				@app.routes.should ==
-					[[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
-					   {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]]
+				expect( @app.routes ).to eq([
+					[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
+					  {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]
+				])
 			end
 
 			it "unbinds parameter patterns bound with \\A and \\z for the route" do
@@ -268,9 +266,10 @@ describe Strelka::App::Routing do
 					end
 				end
 
-				@app.routes.should ==
-					[[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
-					   {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]]
+				expect( @app.routes ).to eq([
+					[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
+					  {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]
+				])
 			end
 
 			it "unbinds parameter patterns bound with \\Z for the route" do
@@ -280,9 +279,10 @@ describe Strelka::App::Routing do
 					end
 				end
 
-				@app.routes.should ==
-					[[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
-					  {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]]
+				expect( @app.routes ).to eq([
+					[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
+					  {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]
+				])
 			end
 
 			it "merges parameters from the route path into the request's param validator" do
@@ -295,7 +295,7 @@ describe Strelka::App::Routing do
 				req = @request_factory.get( '/userinfo/benthik' )
 				@app.new.handle( req )
 
-				req.params[:username].should == 'benthik'
+				expect( req.params[:username] ).to eq( 'benthik' )
 			end
 
 

data/spec/strelka/app/sessions_spec.rb

@@ -1,15 +1,9 @@
 #!/usr/bin/env ruby
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/plugins'
 require 'strelka/app/sessions'
@@ -33,7 +27,7 @@ describe Strelka::App::Sessions do
 	end
 
 
-	it_should_behave_like( "A Strelka::App Plugin" )
+	it_should_behave_like( "A Strelka Plugin" )
 
 
 	describe "session-class loading" do
@@ -49,12 +43,12 @@ describe Strelka::App::Sessions do
 
 		it "has a default associated session class" do
 			Strelka::App::Sessions.configure
-			Strelka::App::Sessions.session_class.should be( Strelka::Session::Default )
+			expect( Strelka::App::Sessions.session_class ).to be( Strelka::Session::Default )
 		end
 
 		it "is can be configured to use a different session class" do
 			Strelka::App::Sessions.configure( :session_class => 'testing' )
-			Strelka::App::Sessions.session_class.should == @test_session_class
+			expect( Strelka::App::Sessions.session_class ).to eq( @test_session_class )
 		end
 
 	end
@@ -103,11 +97,11 @@ describe Strelka::App::Sessions do
 			@app.session_namespace :indian_gurbles
 			subclass = Class.new( @app )
 
-			subclass.session_namespace.should == @app.session_namespace
+			expect( subclass.session_namespace ).to eq( @app.session_namespace )
 		end
 
 		it "has a default session key that's the same as its appid" do
-			@app.session_namespace.should == @app.default_appid
+			expect( @app.session_namespace ).to eq( @app.default_appid )
 		end
 
 		it "can set its session namespace to something else" do
@@ -115,25 +109,25 @@ describe Strelka::App::Sessions do
 				session_namespace :findizzle
 			end
 
-			@app.session_namespace.should == :findizzle
+			expect( @app.session_namespace ).to eq( :findizzle )
 		end
 
 		it "extends the request and response classes" do
 			@app.install_plugins
-			Strelka::HTTPRequest.should < Strelka::HTTPRequest::Session
-			Strelka::HTTPResponse.should < Strelka::HTTPResponse::Session
+			expect( Strelka::HTTPRequest ).to be < Strelka::HTTPRequest::Session
+			expect( Strelka::HTTPResponse ).to be < Strelka::HTTPResponse::Session
 		end
 
 		it "sets the session namespace on requests" do
 			req = @request_factory.get( '/foom' )
 			res = @app.new.handle( req )
-			req.session_namespace.should == @app.default_appid
+			expect( req.session_namespace ).to eq( @app.default_appid )
 		end
 
 		it "saves the session automatically" do
 			req = @request_factory.get( '/foom' )
 			res = @app.new.handle( req )
-			res.cookies.should include( Strelka::Session::Default.cookie_name )
+			expect( res.cookies ).to include( Strelka::Session::Default.cookie_name )
 		end
 
 	end

data/spec/strelka/app/templating_spec.rb

@@ -2,17 +2,11 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
 require 'inversion'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/plugins'
 require 'strelka/app/templating'
@@ -38,7 +32,7 @@ describe Strelka::App::Templating do
 	end
 
 
-	it_should_behave_like( "A Strelka::App Plugin" )
+	it_should_behave_like( "A Strelka Plugin" )
 
 
 	describe "template discovery" do
@@ -55,27 +49,28 @@ describe Strelka::App::Templating do
 			specs[:karate]      = make_gemspec( 'karate',    '1.0.0', false )
 			specs[:javelin]     = make_gemspec( 'javelin', '1.0.0' )
 
-			expectation = Gem::Specification.should_receive( :each )
-			specs.values.each {|spec| expectation.and_yield(spec) }
+			expect( Gem::Specification ).to receive( :each ).once do |&block|
+				specs.values.each {|spec| block.call(spec) }
+			end
 
 			gymnastics_path  = specs[:gymnastics].full_gem_path
 			cycling_path  = specs[:cycling_new].full_gem_path
 			javelin_path = specs[:javelin].full_gem_path
 
-			Dir.should_receive( :glob ).with( 'data/*/templates' ).
+			expect( Dir ).to receive( :glob ).with( 'data/*/templates' ).
 				and_return([ "data/foom/templates" ])
-			Dir.should_receive( :glob ).with( "#{javelin_path}/data/javelin/templates" ).
+			expect( Dir ).to receive( :glob ).with( "#{javelin_path}/data/javelin/templates" ).
 				and_return([ "#{javelin_path}/data/javelin/templates" ])
-			Dir.should_receive( :glob ).with( "#{gymnastics_path}/data/gymnastics/templates" ).
+			expect( Dir ).to receive( :glob ).with( "#{gymnastics_path}/data/gymnastics/templates" ).
 				and_return([ "#{gymnastics_path}/data/gymnastics/templates" ])
 
-			Dir.should_receive( :glob ).with( "#{cycling_path}/data/cycling/templates" ).
+			expect( Dir ).to receive( :glob ).with( "#{cycling_path}/data/cycling/templates" ).
 				and_return([])
 
 			template_dirs = described_class.discover_template_dirs
 
-			# template_dirs.should have( 4 ).members
-			template_dirs.should include(
+			expect( template_dirs ).to have( 3 ).pathnames
+			expect( template_dirs ).to include(
 				Pathname("data/foom/templates"),
 				Pathname("#{javelin_path}/data/javelin/templates"),
 				Pathname("#{gymnastics_path}/data/gymnastics/templates")
@@ -88,22 +83,23 @@ describe Strelka::App::Templating do
 			specs[:gymnastics]  = make_gemspec( 'gymnastics',  '1.0.0' )
 			specs[:javelin]     = make_gemspec( 'javelin', '1.0.0' )
 
-			expectation = Gem::Specification.should_receive( :each )
-			specs.values.each {|spec| expectation.and_yield(spec) }
+			expect( Gem::Specification ).to receive( :each ).once do |&block|
+				specs.values.each {|spec| block.call(spec) }
+			end
 
 			gymnastics_path = specs[:gymnastics].full_gem_path
 			javelin_path    = specs[:javelin].full_gem_path
 
-			Dir.should_receive( :glob ).with( 'data/*/templates' ).
+			expect( Dir ).to receive( :glob ).with( 'data/*/templates' ).
 				and_return([ "data/foom/templates" ])
-			Dir.should_receive( :glob ).with( "#{javelin_path}/data/javelin/templates" ).
+			expect( Dir ).to receive( :glob ).with( "#{javelin_path}/data/javelin/templates" ).
 				and_return([ "#{javelin_path}/data/javelin/templates" ])
-			Dir.should_receive( :glob ).with( "#{gymnastics_path}/data/gymnastics/templates" ).
+			expect( Dir ).to receive( :glob ).with( "#{gymnastics_path}/data/gymnastics/templates" ).
 				and_return([ "#{gymnastics_path}/data/gymnastics/templates" ])
 
 			Module.new { include Strelka::App::Templating }
 
-			Inversion::Template.template_paths.should include(
+			expect( Inversion::Template.template_paths ).to include(
 				Pathname("data/foom/templates"),
 				Pathname("#{javelin_path}/data/javelin/templates"),
 				Pathname("#{gymnastics_path}/data/gymnastics/templates")
@@ -133,14 +129,14 @@ describe Strelka::App::Templating do
 			@app.layout 'layout.tmpl'
 			subclass = Class.new( @app )
 
-			subclass.template_map.should == @app.template_map
-			subclass.template_map.should_not equal( @app.template_map )
-			subclass.layout_template.should == @app.layout_template
-			subclass.layout_template.should_not equal( @app.layout_template )
+			expect( subclass.template_map ).to eq( @app.template_map )
+			expect( subclass.template_map ).to_not equal( @app.template_map )
+			expect( subclass.layout_template ).to eq( @app.layout_template )
+			expect( subclass.layout_template ).to_not equal( @app.layout_template )
 		end
 
 		it "has a Hash of templates" do
-			@app.templates.should be_a( Hash )
+			expect( @app.templates ).to be_a( Hash )
 		end
 
 		it "can add templates that it wants to use to its templates hash" do
@@ -148,7 +144,7 @@ describe Strelka::App::Templating do
 				templates :main => 'main.tmpl'
 			end
 
-			@app.templates.should == { :main => 'main.tmpl' }
+			expect( @app.templates ).to eq( { :main => 'main.tmpl' } )
 		end
 
 		it "can declare a layout template" do
@@ -156,7 +152,7 @@ describe Strelka::App::Templating do
 				layout 'layout.tmpl'
 			end
 
-			@app.layout.should == 'layout.tmpl'
+			expect( @app.layout ).to eq( 'layout.tmpl' )
 		end
 
 		describe "instance" do
@@ -178,7 +174,7 @@ describe Strelka::App::Templating do
 
 
 			it "can load declared templates by mentioning the symbol" do
-				@app.new.template( :main ).should be_a( Inversion::Template )
+				expect( @app.new.template( :main ) ).to be_a( Inversion::Template )
 			end
 
 			it "can respond with just a template name" do
@@ -191,8 +187,8 @@ describe Strelka::App::Templating do
 				res = @app.new.handle( @req )
 
 				res.body.rewind
-				res.body.read.should == "A template for testing the Templating plugin.\n"
-				res.status.should == 200
+				expect( res.body.read ).to eq( "A template for testing the Templating plugin.\n" )
+				expect( res.status ).to eq( 200 )
 			end
 
 			it "can respond with just a template instance" do
@@ -205,8 +201,8 @@ describe Strelka::App::Templating do
 				res = @app.new.handle( @req )
 
 				res.body.rewind
-				res.body.read.should == "A template for testing the Templating plugin.\n"
-				res.status.should == 200
+				expect( res.body.read ).to eq( "A template for testing the Templating plugin.\n" )
+				expect( res.status ).to eq( 200 )
 			end
 
 			it "can respond with a Mongrel2::HTTPResponse with a template instance as its body" do
@@ -223,8 +219,8 @@ describe Strelka::App::Templating do
 				res = @app.new.handle( @req )
 
 				res.body.rewind
-				res.body.read.should == "A template for testing the Templating plugin.\n"
-				res.status.should == 200
+				expect( res.body.read ).to eq( "A template for testing the Templating plugin.\n" )
+				expect( res.status ).to eq( 200 )
 			end
 
 
@@ -245,9 +241,9 @@ describe Strelka::App::Templating do
 				res = @app.new.handle( @req )
 
 				res.body.rewind
-				res.body.read.should == "A minimal layout template.\n" +
-					"A template for testing the Templating plugin.\n\n"
-				res.status.should == 200
+				expect( res.body.read ).to eq( "A minimal layout template.\n" +
+					"A template for testing the Templating plugin.\n\n" )
+				expect( res.status ).to eq( 200 )
 			end
 
 			it "doesn't wrap the layout around non-template responses" do
@@ -267,7 +263,7 @@ describe Strelka::App::Templating do
 				res = @app.new.handle( @req )
 
 				res.body.rewind
-				res.body.read.should == "A template for testing the Templating plugin.\n"
+				expect( res.body.read ).to eq( "A template for testing the Templating plugin.\n" )
 			end
 
 		end