strelka 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0b5c7ba99043fe79888689e95d555001a5ea70f
-  data.tar.gz: 2f113c4c3820c8b8fbf607dccc3e70e312899c55
+  metadata.gz: 0b14749495dff16df191c5371094312f513e7b6c
+  data.tar.gz: 5db0407a3325455375fa0fbce72257e23cf32a5c
 SHA512:
-  metadata.gz: e164cf5a1ad00a8093263ff9138f2a87d64998ac3f9154fb323237a922bf78c88f4f54f70d282c1847c642ae3ec1eec3d32ec6b0a9bc5ad43a55d3a1b950cd36
-  data.tar.gz: f141b866194eb71af3344a09f1b9ecfee65a1d8f6a48c989166e57a6e1024698b4aed3beb7fd642b9a284d4f422d21c760cf7b02588e5e50e264f984c2080ea9
+  metadata.gz: 2b36ed3558f2cac0228536ea0251e696038b8e2f9711355512704145196c42745c2261df604c5aa9d2cc1eb66c4670142c92f2eef9f9d704487556ef3857ed08
+  data.tar.gz: 129997e0bdad8b2962b083627902917d1e8c2948133910dbc2aa1e947733b9d0b18b8472c7ed6b5af79760b66254ff70606d8d6ee80e813ee50b75e0d4c77cd0

data/ChangeLog

@@ -1,13 +1,213 @@
+2014-06-06  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/app/auth.rb, spec/strelka/app/auth_spec.rb:
+	Auth plugin: Add the ability to modify permission sets from the
+	require_perms_for() block.
+	[69fbfc1e2de3] [tip]
+
+2014-06-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Gemfile, Rakefile, lib/strelka/httprequest.rb,
+	lib/strelka/testing.rb, spec/strelka/app/auth_spec.rb,
+	spec/strelka/app/restresources_spec.rb,
+	spec/strelka/app/routing_spec.rb, spec/strelka/discovery_spec.rb,
+	spec/strelka/httpresponse/negotiation_spec.rb,
+	spec/strelka/httpresponse/session_spec.rb,
+	spec/strelka/plugins_spec.rb, spec/strelka_spec.rb:
+	Updated for RSpec 3.0; bumped deps.
+	[04bd8611e28f] [github/master]
+
+2014-02-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.8.0 for changeset 67f75293f04a
+	[d972384198ab]
+
+	* .hgsigs:
+	Added signature for changeset 6aec6fa45324
+	[67f75293f04a] [v0.8.0]
+
+	* History.rdoc:
+	Update the history
+	[6aec6fa45324]
+
+2014-02-02  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile:
+	Update dependencies.
+	[4ddae11c28b8]
+
+2014-01-22  Mahlon E. Smith  <mahlon@laika.com>
+
+	* lib/strelka/httprequest.rb:
+	Don't modify the original request URI object when calling
+	HttpRequest#base_uri.
+	[6e2d1e0e89d1]
+
+2014-01-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app.rb:
+	Add a convenience method for fetching a default app instance to
+	Strelka::App
+	[0e6e0e0be5e7]
+
+2014-01-13  Michael Granger  <ged@FaerieMUD.org>
+
+	* spec/strelka/app/auth_spec.rb, spec/strelka/app/filters_spec.rb,
+	spec/strelka/app/parameters_spec.rb,
+	spec/strelka/app/restresources_spec.rb,
+	spec/strelka/app/routing_spec.rb,
+	spec/strelka/app/templating_spec.rb,
+	spec/strelka/authprovider/basic_spec.rb,
+	spec/strelka/authprovider/hostaccess_spec.rb,
+	spec/strelka/cookie_spec.rb, spec/strelka/cookieset_spec.rb,
+	spec/strelka/discovery_spec.rb,
+	spec/strelka/httprequest/acceptparams_spec.rb,
+	spec/strelka/httprequest/negotiation_spec.rb,
+	spec/strelka/httprequest/session_spec.rb,
+	spec/strelka/httprequest_spec.rb,
+	spec/strelka/httpresponse/session_spec.rb,
+	spec/strelka/multipartparser_spec.rb,
+	spec/strelka/paramvalidator_spec.rb, spec/strelka/plugins_spec.rb,
+	spec/strelka/session/default_spec.rb,
+	spec/strelka/websocketserver/routing_spec.rb:
+	Fix use of deprecated RSpec syntax.
+	[9f7f4f4dba0b]
+
+	* lib/strelka/authprovider.rb,
+	lib/strelka/httprequest/acceptparams.rb, lib/strelka/mixins.rb,
+	lib/strelka/plugins.rb, lib/strelka/router.rb,
+	lib/strelka/session.rb, spec/strelka/mixins_spec.rb:
+	Merge improvements to the AbstractClass mixin from elsewhere.
+	[96725c68d4ae]
+
+2014-01-02  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka.rb:
+	Merged with bdb098771858
+	[140055f6ee81]
+
+2013-12-02  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* .rvm.gems, lib/strelka.rb, lib/strelka/app/auth.rb,
+	spec/strelka/session/default_spec.rb:
+	Restore access to request parameters from the authentication plugin.
+	[bdb098771858]
+
+2014-01-01  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc, lib/strelka.rb:
+	Bump minor version, update history
+	[2d8433106860]
+
+	* lib/strelka/app/restresources.rb, lib/strelka/httprequest.rb,
+	lib/strelka/httprequest/negotiation.rb,
+	lib/strelka/multipartparser.rb,
+	spec/strelka/app/restresources_spec.rb,
+	spec/strelka/httprequest/negotiation_spec.rb,
+	spec/strelka/httprequest_spec.rb:
+	Fix PUT/POST routes in restresources to be more REST-y; i.e., POST
+	for non-idempotent methods, PUT for idempotent ones.
+	[c91b759e2dfa]
+
+	* .rvmrc:
+	Updated rvmrc; don't autoload the gemset
+	[26dd19cb5b45]
+
+	* .tm_properties:
+	Fix project settings
+	[eae55bb5318e]
+
+2013-12-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/cookie.rb, spec/strelka/cookie_spec.rb:
+	Make Strelka::Cookie raise on malformed cookies
+	[bb16cdc0c251]
+
+2013-11-20  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app/sessions.rb, lib/strelka/session.rb,
+	lib/strelka/session/db.rb:
+	Fix some API docs for sessions
+	[924139279054]
+
+	* lib/strelka/app.rb:
+	Remove config keys that moved to Discovery
+	[c4b52cde2f47]
+
+2013-11-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.7.0 for changeset fb8d0093e8f6
+	[71ad508ff67c]
+
+	* .hgsigs:
+	Added signature for changeset 2caa91898658
+	[fb8d0093e8f6] [v0.7.0]
+
+	* .rvm.gems, History.rdoc, Rakefile, lib/strelka.rb:
+	Bump minor version, update dependencies, update history.
+	[2caa91898658]
+
+	* spec/strelka/discovery_spec.rb:
+	Fix discovery specs
+	[a3898e620a63]
+
+2013-10-21  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app/filters.rb, lib/strelka/app/templating.rb,
+	spec/strelka/app/filters_spec.rb:
+	Make response filters always receive a response
+
+	...even if the handler returns a Symbol, e.g., for the templating
+	plugin.
+	[e8958f7795d9]
+
+2013-10-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app/templating.rb:
+	Add a note about needed documentation to :templating
+	[bc94898e6bdd]
+
+	* Plugins.rdoc, lib/strelka/app/auth.rb, lib/strelka/app/errors.rb,
+	lib/strelka/app/filters.rb, lib/strelka/app/negotiation.rb,
+	lib/strelka/app/parameters.rb, lib/strelka/app/routing.rb,
+	lib/strelka/app/sessions.rb, lib/strelka/app/templating.rb,
+	lib/strelka/plugins.rb, lib/strelka/websocketserver/routing.rb,
+	spec/strelka/plugins_spec.rb:
+	Change filter plugin order; change run_before/run_after to
+	run_outside/run_inside.
+
+	- Backward-compatibility maintained with an alias.
+	[0027480d474e]
+
+2013-10-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/paramvalidator.rb, spec/strelka/paramvalidator_spec.rb:
+	Consider empty string as no value for parameter validation. (fixes
+	#8)
+	[662737a841c4]
+
+2013-10-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	Update the project URL and copyright date in the README
+	[8ab80d544db2]
+
+	* .hoerc, Manifest.txt:
+	Remove runtime data from examples dir from the manifest
+	[0c9efdac0829]
+
 2013-10-15  Michael Granger  <ged@faeriemud.org>
 
 	* Close branch rdolgushin/ideasrdoc-russian-woof-fix-1381879886956
-	[dedc90b70209] [tip] <rdolgushin/ideasrdoc-russian-woof-fix-1381879886956>
+	[dedc90b70209] <rdolgushin/ideasrdoc-russian-woof-fix-1381879886956>
 
 	* Merged in rdolgushin/strelka/rdolgushin/ideasrdoc-russian-woof-
 	fix-1381879886956 (pull request #2)
 
 	IDEAS.rdoc: Russian 'woof' fix
-	[ac7fea5af58f] [github/master]
+	[ac7fea5af58f]
 
 2013-10-15  Roman Dolgushin  <rd@roman-dolgushin.ru>
 

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.9.0 [2014-06-06] Mahlon E. Smith <mahlon@martini.nu>
+
+- Auth plugin: Add the ability to modify permission sets from the
+  require_perms_for() block.
+
+
 == v0.8.0 [2014-02-05] Michael Granger <ged@FaerieMUD.org>
 
 Make malformed headers and data consistently error with 400 status rather than

data/Rakefile

@@ -37,7 +37,7 @@ hoespec = Hoe.spec 'strelka' do
 
 	self.dependency 'hoe-deveiate',            '~> 0.3',  :developer
 	self.dependency 'hoe-bundler',             '~> 1.2',  :developer
-	self.dependency 'rspec',                   '~> 2.99.0.beta1',    :developer
+	self.dependency 'rspec',                   '~> 3.0',  :developer
 	self.dependency 'simplecov',               '~> 0.7',  :developer
 	self.dependency 'rdoc-generator-fivefish', '~> 0.2',  :developer
 

data/lib/strelka/app/auth.rb

@@ -621,8 +621,18 @@ module Strelka::App::Auth
 
 		self.log.debug "  positive perm criteria: %p" % [ self.class.positive_perms_criteria ]
 		self.class.positive_perms_criteria.each do |pattern, block, newperms|
-			next unless self.request_matches_criteria( request, pattern, &block )
+			criteria = self.request_matches_criteria( request, pattern, &block )
+			next unless criteria
+
 			newperms = Array( newperms )
+
+			if criteria.is_a?( Symbol )
+				newperms << criteria
+
+			elsif criteria.respond_to?( :first ) && criteria.first.is_a?( Symbol )
+				newperms += criteria
+			end
+
 			newperms << self.default_permission if newperms.empty?
 
 			raise TypeError, "Permissions must be Symbols; got: %p" % [newperms] unless

data/lib/strelka/httprequest.rb

@@ -216,6 +216,7 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 		code = perm ? HTTP::MOVED_PERMANENTLY : HTTP::MOVED_TEMPORARILY
 		finish_with( code, "redirect from #{self.uri.path} to #{uri}", :location => uri )
 	end
+	alias_method :redirect_to, :redirect
 
 
 	#########

data/lib/strelka/testing.rb

@@ -61,6 +61,12 @@ module Strelka::Testing
 		attr_reader :expected_status, :expected_message, :expected_headers
 
 
+		### Matcher API -- return true to enable the use of block expectations.
+		def supports_block_expectations?
+			return true
+		end
+
+
 		### Also expect a header with the given +name+ and +value+ from the response.
 		def and_header( name, value=nil )
 			if name.is_a?( Hash )
@@ -160,13 +166,13 @@ module Strelka::Testing
 
 
 		### Return a message suitable for describing when the matcher fails when it should succeed.
-		def failure_message_for_should
+		def failure_message
 			return "expected response to finish_with %s" % [ @failure ]
 		end
 
 
 		### Return a message suitable for describing when the matcher succeeds when it should fail.
-		def failure_message_for_should_not
+		def failure_message_when_negated
 			return "expected response not to finish_with %s" % [ @failure ]
 		end
 

data/lib/strelka.rb

@@ -24,10 +24,10 @@ module Strelka
 	log_as :strelka
 
 	# Library version constant
-	VERSION = '0.8.0'
+	VERSION = '0.9.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 140055f6ee81 $
+	REVISION = %q$Revision: 406a68302dc6 $
 
 	require 'strelka/constants'
 	require 'strelka/exceptions'

data/spec/strelka/app/auth_spec.rb

@@ -47,7 +47,7 @@ describe Strelka::App::Auth do
 		end
 		app.install_plugins
 
-		expect( @request_factory.get( '/api/v1/verify' ) ).to respond_to( :authenticated? )
+		expect( @request_factory.get('/api/v1/verify') ).to respond_to( :authenticated? )
 	end
 
 
@@ -58,7 +58,7 @@ describe Strelka::App::Auth do
 				plugins :auth
 
 				# Stand in for a real AuthProvider
-				@auth_provider = RSpec::Mocks::Mock
+				@auth_provider = RSpec::Mocks::Double
 
 				def initialize( appid='auth-test', sspec=TEST_SEND_SPEC, rspec=TEST_RECV_SPEC )
 					super
@@ -98,7 +98,8 @@ describe Strelka::App::Auth do
 			expect( @app ).to_not have_auth_criteria()
 		end
 
-		it "sets the authenticated_user attribute of the request to the credentials of the authenticating user" do
+		it "sets the authenticated_user attribute of the request to the credentials " +
+		   "of the authenticating user" do
 			app = @app.new
 			req = @request_factory.get( '/api/v1' )
 
@@ -417,6 +418,55 @@ describe Strelka::App::Auth do
 			expect( app.required_perms_for(req) ).to eq( [ :auth_test ] )
 		end
 
+		it "allows specific required permissions to be returned by the block" do
+			@app.require_perms_for( %r{.*} ) do |req|
+				:write_access if req.verb != :GET
+			end
+			app = @app.new
+
+			req = @request_factory.get( '/api/v1/accounts' )
+			expect( app.required_perms_for(req) ).to eq( [] )
+			req = @request_factory.put( '/api/v1/accounts' )
+			expect( app.required_perms_for(req) ).to eq( [ :write_access ] )
+		end
+
+		it "adds specific required permissions returned by the block to argument permissions" do
+			@app.require_perms_for( %r{.*}, :basic_access ) do |req|
+				:write_access if req.verb != :GET
+			end
+			app = @app.new
+
+			req = @request_factory.get( '/api/v1/accounts' )
+			expect( app.required_perms_for(req) ).to eq( [] )
+			req = @request_factory.put( '/api/v1/accounts' )
+			expect( app.required_perms_for(req) ).to include( :basic_access, :write_access )
+		end
+
+		it "allows specific, multiple required permissions to be returned by the block" do
+			@app.require_perms_for( %r{.*} ) do |req|
+				[ :write_access, :is_handsome ] if req.verb != :GET
+			end
+			app = @app.new
+
+			req = @request_factory.get( '/api/v1/accounts' )
+			expect( app.required_perms_for(req) ).to eq( [] )
+			req = @request_factory.put( '/api/v1/accounts' )
+			expect( app.required_perms_for(req) ).to include( :is_handsome, :write_access )
+		end
+
+		it "adds specific, multiple required permissions returned by the block to argument permissions" do
+			@app.require_perms_for( %r{.*}, :basic_access ) do |req|
+				[ :write_access, :is_handsome ] if req.verb != :GET
+			end
+			app = @app.new
+
+			req = @request_factory.get( '/api/v1/accounts' )
+			expect( app.required_perms_for(req) ).to eq( [] )
+			req = @request_factory.put( '/api/v1/accounts' )
+			expect( app.required_perms_for(req) ).to include( :basic_access, :write_access, :is_handsome )
+		end
+
+
 		it "allows negative perms criteria to be declared with a string" do
 			@app.no_perms_for( '/string' )
 			app = @app.new
@@ -561,7 +611,7 @@ describe Strelka::App::Auth do
 					app.handle( req )
 				end
 
-				it "authenticates and authorizes a request that only matches the auth criteria"do
+				it "authenticates and authorizes a request that only matches the auth criteria" do
 					req = @request_factory.get( '/api/v1/onlyauth' )
 
 					app = @app.new
@@ -716,7 +766,8 @@ describe Strelka::App::Auth do
 
 				app = @app.new
 				allow( app.auth_provider ).to receive( :authenticate ).and_return( :credentials )
-				expect( app.auth_provider ).to receive( :authorize ).with( :credentials, req, [:admin, :upload] )
+				expect( app.auth_provider ).to receive( :authorize ).
+					with( :credentials, req, [:admin, :upload] )
 
 				app.handle( req )
 			end

data/spec/strelka/app/restresources_spec.rb

@@ -76,27 +76,27 @@ describe Strelka::App::RestResources do
 			it "keeps track of what resources are mounted where" do
 				expect( @app.resource_verbs.size ).to eq(  1  )
 				expect( @app.resource_verbs ).to include( 'servers' )
-				@app.resource_verbs[ 'servers' ].
-					should include( :OPTIONS, :GET, :HEAD, :POST, :PUT, :DELETE )
+				expect(@app.resource_verbs[ 'servers' ]).
+					to include( :OPTIONS, :GET, :HEAD, :POST, :PUT, :DELETE )
 			end
 
 			# Reader regular routes
-			it { should have_route(:OPTIONS, 'servers') }
-			it { should have_route(:GET,     'servers') }
-			it { should have_route(:GET,     'servers/:id') }
+			it { is_expected.to have_route(:OPTIONS, 'servers') }
+			it { is_expected.to have_route(:GET,     'servers') }
+			it { is_expected.to have_route(:GET,     'servers/:id') }
 
 			# Writer regular routes
-			it { should have_route(:POST,    'servers') }
-			it { should have_route(:POST,    'servers/:id') }
-			it { should have_route(:PUT,     'servers') }
-			it { should have_route(:PUT,     'servers/:id') }
-			it { should have_route(:DELETE,  'servers') }
-			it { should have_route(:DELETE,  'servers/:id') }
+			it { is_expected.to have_route(:POST,    'servers') }
+			it { is_expected.to have_route(:POST,    'servers/:id') }
+			it { is_expected.to have_route(:PUT,     'servers') }
+			it { is_expected.to have_route(:PUT,     'servers/:id') }
+			it { is_expected.to have_route(:DELETE,  'servers') }
+			it { is_expected.to have_route(:DELETE,  'servers/:id') }
 
 			# Reader composite routes
-			it { should have_route(:GET,     'servers/by_uuid/:uuid') }
-			it { should have_route(:GET,     'servers/:id/hosts') }
-			it { should have_route(:GET,     'servers/:id/filters') }
+			it { is_expected.to have_route(:GET,     'servers/by_uuid/:uuid') }
+			it { is_expected.to have_route(:GET,     'servers/:id/hosts') }
+			it { is_expected.to have_route(:GET,     'servers/:id/filters') }
 
 		end
 
@@ -114,29 +114,29 @@ describe Strelka::App::RestResources do
 			it "keeps track of what resources are mounted where" do
 				expect( @app.resource_verbs.size ).to eq(  1  )
 				expect( @app.resource_verbs ).to include( 'servers' )
-				@app.resource_verbs[ 'servers' ].
-					should include( :OPTIONS, :GET, :HEAD )
-				@app.resource_verbs[ 'servers' ].
-					should_not include( :POST, :PUT, :DELETE )
+				expect(@app.resource_verbs[ 'servers' ]).
+					to include( :OPTIONS, :GET, :HEAD )
+				expect(@app.resource_verbs[ 'servers' ]).
+					not_to include( :POST, :PUT, :DELETE )
 			end
 
 			# Reader regular routes
-			it { should have_route(:OPTIONS, 'servers') }
-			it { should have_route(:GET,     'servers') }
-			it { should have_route(:GET,     'servers/:id') }
+			it { is_expected.to have_route(:OPTIONS, 'servers') }
+			it { is_expected.to have_route(:GET,     'servers') }
+			it { is_expected.to have_route(:GET,     'servers/:id') }
 
 			# Writer regular routes
-			it { should_not have_route(:POST,    'servers') }
-			it { should_not have_route(:POST,    'servers/:id') }
-			it { should_not have_route(:PUT,     'servers') }
-			it { should_not have_route(:PUT,     'servers/:id') }
-			it { should_not have_route(:DELETE,  'servers') }
-			it { should_not have_route(:DELETE,  'servers/:id') }
+			it { is_expected.not_to have_route(:POST,    'servers') }
+			it { is_expected.not_to have_route(:POST,    'servers/:id') }
+			it { is_expected.not_to have_route(:PUT,     'servers') }
+			it { is_expected.not_to have_route(:PUT,     'servers/:id') }
+			it { is_expected.not_to have_route(:DELETE,  'servers') }
+			it { is_expected.not_to have_route(:DELETE,  'servers/:id') }
 
 			# Reader composite routes
-			it { should have_route(:GET,     'servers/by_uuid/:uuid') }
-			it { should have_route(:GET,     'servers/:id/hosts') }
-			it { should have_route(:GET,     'servers/:id/filters') }
+			it { is_expected.to have_route(:GET,     'servers/by_uuid/:uuid') }
+			it { is_expected.to have_route(:GET,     'servers/:id/hosts') }
+			it { is_expected.to have_route(:GET,     'servers/:id/filters') }
 
 		end
 
@@ -517,8 +517,8 @@ describe Strelka::App::RestResources do
 			it "has its metadata inherited by subclasses" do
 				expect( subject.resource_verbs.size ).to eq(  1  )
 				expect( subject.resource_verbs ).to include( 'servers' )
-				subject.resource_verbs[ 'servers' ].
-					should include( :OPTIONS, :GET, :HEAD, :POST, :PUT, :DELETE )
+				expect(subject.resource_verbs[ 'servers' ]).
+					to include( :OPTIONS, :GET, :HEAD, :POST, :PUT, :DELETE )
 			end
 
 		end # supports inheritance

data/spec/strelka/app/routing_spec.rb

@@ -216,10 +216,10 @@ describe Strelka::App::Routing do
 
 			expect( subclass.routes.size ).to eq(  3  )
 
-			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: {}} ])
+			expect(subclass.routes).
+				to include([ :GET, ['info'], {action: @app.instance_method(:GET_info), options: {}} ])
+			expect(subclass.routes).
+				to include([ :GET, ['about'], {action: @app.instance_method(:GET_about), options: {}} ])
 			expect( subclass.routes ).to include(
 				[ :GET, ['origami'], {action: subclass.instance_method(:GET_origami), options: {}} ]
 			)

data/spec/strelka/discovery_spec.rb

@@ -49,7 +49,7 @@ describe Strelka::Discovery do
 		app_path = Pathname( app_file ).expand_path
 		app_class = nil
 
-		expect( Kernel ).to receive( :load ).with( app_path.to_s ).and_return do
+		expect( Kernel ).to receive( :load ).with( app_path.to_s ) do
 			app_class = Class.new( discoverable_class )
 		end
 		expect( described_class.load(app_file) ).to eq( [ app_class ] )
@@ -108,8 +108,7 @@ describe Strelka::Discovery do
 
 		expect( described_class ).to receive( :gem ).with( 'blood-orgy' )
 		expect( Kernel ).to receive( :load ).
-			with( "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ).
-			and_return do
+			with( "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ) do
 				Class.new( discoverable_class )
 				true
 			end

data/spec/strelka/httpresponse/negotiation_spec.rb

@@ -140,15 +140,14 @@ describe Strelka::HTTPResponse::Negotiation do
 		end
 
 		it "transcodes File entity bodies if the charset is not acceptable" do
-			pending "implementation of IO transcoding" do
-				@req.headers.accept_charset = 'koi8-r, koi8-u;q=0.9, utf-8;q=0.8'
+			pending "implementation of IO transcoding"
+			@req.headers.accept_charset = 'koi8-r, koi8-u;q=0.9, utf-8;q=0.8'
 
-				@res.body = File.open( __FILE__, 'r:iso-8859-5' )
-				@res.content_type = 'text/plain'
+			@res.body = File.open( __FILE__, 'r:iso-8859-5' )
+			@res.content_type = 'text/plain'
 
-				expect( @res.negotiated_body.read.encoding ).to eq( Encoding::KOI8_R )
-				expect( @res.header_data ).to match( /accept-charset(?!-)/i )
-			end
+			expect( @res.negotiated_body.read.encoding ).to eq( Encoding::KOI8_R )
+			expect( @res.header_data ).to match( /accept-charset(?!-)/i )
 		end
 
 	end

data/spec/strelka/httpresponse/session_spec.rb

@@ -46,9 +46,8 @@ describe Strelka::HTTPResponse::Session, "-extended response" do
 
 	it "sets its request's session when its session is set" do
 		@res.session = Strelka::Session.create( :default )
-		pending "not sure if it should do this or not" do
-			expect( @req.session ).to be( @res.session )
-		end
+		pending "not sure if it should do this or not"
+		expect( @req.session ).to be( @res.session )
 	end
 
 	context "for a request with no session ID" do

data/spec/strelka/plugins_spec.rb

@@ -91,8 +91,8 @@ describe "Strelka plugin system" do
 
 
 			it "sorts before it in the plugin registry" do
-				Strelka::Pluggable.loaded_plugins.tsort.
-					should order( @plugin.plugin_name ).after( @before_mod.plugin_name )
+				expect(Strelka::Pluggable.loaded_plugins.tsort).
+					to order( @plugin.plugin_name ).after( @before_mod.plugin_name )
 			end
 
 		end
@@ -110,8 +110,8 @@ describe "Strelka plugin system" do
 
 
 			it "sorts after it in the plugin registry" do
-				Strelka::Pluggable.loaded_plugins.tsort.
-					should order( @plugin.plugin_name ).before( @after_mod.plugin_name )
+				expect(Strelka::Pluggable.loaded_plugins.tsort).
+					to order( @plugin.plugin_name ).before( @after_mod.plugin_name )
 			end
 
 		end
@@ -123,8 +123,7 @@ describe "Strelka plugin system" do
 
 		it "requires plugins from a directory based on the name of the loader" do
 			expect( Strelka::Pluggable ).to receive( :require ).
-				with( 'strelka/pluggable/scheduler' ).
-				and_return do
+				with( 'strelka/pluggable/scheduler' ) do
 					Module.new do
 						def self::name; "Strelka::Pluggable::Scheduler"; end
 						extend Strelka::Plugin

data/spec/strelka_spec.rb

@@ -35,8 +35,7 @@ describe Strelka do
 			and_return([ Pathname('data/mox/apps/moxthefox') ])
 
 		expect( Kernel ).to receive( :load ).
-			with( File.expand_path 'data/mox/apps/moxthefox' ).
-			and_return { mox_app = Class.new(Strelka::App) }
+			with( File.expand_path 'data/mox/apps/moxthefox' ) { mox_app = Class.new(Strelka::App) }
 
 		expect( described_class::App('moxthefox') ).to be( mox_app )
 	end

data.tar.gz.sig

@@ -1 +1 @@
-�9u�*_`�&k18���=>HA���
+@

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mahlon E. Smith
@@ -13,7 +13,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTMwMjI3MTY0ODU4WhcNMTQwMjI3MTY0ODU4WjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTQwMzE5MDQzNTI2WhcNMTUwMzE5MDQzNTI2WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
   +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
@@ -24,14 +24,14 @@ cert_chain:
   AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
   qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
   BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  Vlcfyq6GwyE8i0QuFPCeVOwJaneSvcwx316DApjy9/tt2YD2HomLbtpXtji5QXor
-  ON6oln4tWBIB3Klbr3szq5oR3Rc1D02SaBTalxSndp4M6UkW9hRFu5jn98pDB4fq
-  5l8wMMU0Xdmqx1VYvysVAjVFVC/W4NNvlmg+2mEgSVZP5K6Tc9qDh3eMQInoYw6h
-  t1YA6RsUJHp5vGQyhP1x34YpLAaly8icbns/8PqOf7Osn9ztmg8bOMJCeb32eQLj
-  6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
-  /YSusaiDXHKU2O3Akc3htA==
+  TuL1Bzl6TBs1YEzEubFHb9XAPgehWzzUudjDKzTRd+uyZmxnomBqTCQjT5ucNRph
+  3jZ6bhLNooLQxTjIuHodeGcEMHZdt4Yi7SyPmw5Nry12z6wrDp+5aGps3HsE5WsQ
+  Zq2EuyEOc96g31uoIvjNdieKs+1kE+K+dJDjtw+wTH2i63P7r6N/NfPPXpxsFquo
+  wcYRRrHdR7GhdJeT+V8Q8Bi5bglCUGdx+8scMgkkePc98k9osQHypbACmzO+Bqkv
+  c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
+  ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -193,56 +193,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: hoe-highline
+  name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: hoe-deveiate
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -263,14 +263,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -305,14 +305,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.12'
 description: |-
   Strelka is a framework for creating and deploying
   Mongrel2[http://mongrel2.org/] web applications in Ruby.
@@ -496,8 +496,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: strelka
-rubygems_version: 2.2.1
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]