strelka 0.15.0 → 0.16.0

data/spec/constants.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'strelka' unless defined?( Strelka )
 

data/spec/helpers.rb

@@ -1,13 +1,15 @@
-#!/usr/bin/ruby
-# coding: utf-8
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 BEGIN {
 	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+	basedir = Pathname.new( __FILE__ ).dirname.parent
 
 	srcdir = basedir.parent
 	mongrel2dir = srcdir + 'Mongrel2/lib'
 
+	$stderr.puts "Adding %s to the LOAD_PATH..." % [ mongrel2dir ]
 	$LOAD_PATH.unshift( mongrel2dir.to_s ) unless
 		!mongrel2dir.directory? || $LOAD_PATH.include?( mongrel2dir.to_s )
 }
@@ -104,13 +106,20 @@ end
 RSpec.configure do |config|
 	include Strelka::TestConstants
 
-	config.run_all_when_everything_filtered = true
-	config.filter_run :focus
-	config.order = 'random'
 	config.mock_with( :rspec ) do |mock|
 		mock.syntax = :expect
 	end
 
+	config.disable_monkey_patching!
+	config.example_status_persistence_file_path = "spec/.status"
+	config.filter_run :focus
+	config.filter_run_when_matching :focus
+	config.order = :random
+	config.profile_examples = 5
+	config.run_all_when_everything_filtered = true
+	config.shared_context_metadata_behavior = :apply_to_host_groups
+	# config.warnings = true
+
 	config.extend( Strelka::TestConstants )
 
 	config.include( Loggability::SpecHelpers )

data/spec/strelka/app/auth_spec.rb

@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -17,7 +19,7 @@ require 'strelka/behavior/plugin'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App::Auth do
+RSpec.describe Strelka::App::Auth do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/api/v1' )
@@ -310,7 +312,7 @@ describe Strelka::App::Auth do
 
 			req = @request_factory.get( '/api/v1/foom' )
 			expect( app.request_should_auth?(req) ).to be_truthy()
-			req = @request_factory.post( '/api/v1/foom', :accept => 'text/plain, text/html; q=0.5' )
+			req = @request_factory.post( '/api/v1/foom', '', :accept => 'text/plain, text/html; q=0.5' )
 			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/foom', :accept => 'text/plain, text/html; q=0.5' )
 			expect( app.request_should_auth?(req) ).to be_falsey()

data/spec/strelka/app/errors_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -18,7 +18,7 @@ require 'strelka/behavior/plugin'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App::Errors do
+RSpec.describe Strelka::App::Errors do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '' )

data/spec/strelka/app/filters_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -17,7 +17,7 @@ require 'strelka/behavior/plugin'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App::Filters do
+RSpec.describe Strelka::App::Filters do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '' )

data/spec/strelka/app/negotiation_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -16,7 +16,7 @@ require 'strelka/behavior/plugin'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App::Negotiation do
+RSpec.describe Strelka::App::Negotiation do
 
 
 	before( :all ) do

data/spec/strelka/app/parameters_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -16,7 +16,7 @@ require 'strelka/behavior/plugin'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App::Parameters do
+RSpec.describe Strelka::App::Parameters do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/user' )
@@ -119,7 +119,7 @@ describe Strelka::App::Parameters do
 			end
 
 			it "validates parameters from the request" do
-				req = @request_factory.get( '/user/search?username=anheptoh'.taint )
+				req = @request_factory.get( (+'/user/search?username=anheptoh').taint )
 				@app.new.handle( req )
 
 				expect( req.params ).to be_a( Strelka::ParamValidator )
@@ -135,7 +135,7 @@ describe Strelka::App::Parameters do
 				end
 
 				expect( @app.untaint_all_constraints ).to be_truthy()
-				req = @request_factory.get( '/user/search?username=shereshnaheth'.taint )
+				req = @request_factory.get( (+'/user/search?username=shereshnaheth').taint )
 				@app.new.handle( req )
 
 				expect( req.params[:username] ).to eq( 'shereshnaheth' )
@@ -147,7 +147,7 @@ describe Strelka::App::Parameters do
 					param :message, :printable, :untaint
 				end
 
-				req = @request_factory.get( '/user/search?message=I+love+the+circus.'.taint )
+				req = @request_factory.get( (+'/user/search?message=I+love+the+circus.').taint )
 				@app.new.handle( req )
 
 				expect( req.params[:message] ).to_not be_tainted()

data/spec/strelka/app/restresources_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -18,7 +18,7 @@ require 'mongrel2/config/dsl'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App::RestResources do
+RSpec.describe Strelka::App::RestResources do
 	include Mongrel2::Config::DSL
 
 	before( :all ) do
@@ -32,8 +32,12 @@ describe Strelka::App::RestResources do
 				return self.filter( name: name )
 			end
 		end
-		Mongrel2::Config::Server.subset( :with_ephemeral_ports ) { port > 1024 }
 		Mongrel2::Config::Server.dataset_module( name_selection )
+		Mongrel2::Config::Server.dataset_module do
+			def with_ephemeral_ports
+				return self.where { port > 1024 }
+			end
+		end
 	end
 
 
@@ -287,7 +291,7 @@ describe Strelka::App::RestResources do
 					expect( body.first['uuid'] ).to eq( 'test-server' )
 				end
 
-				it "has a GET route for fetching the resource via a subset" do
+				it "has a GET route for fetching the resource via a dataset module method" do
 					req = @request_factory.get( '/api/v1/servers/with_ephemeral_ports',
 						:accept => 'application/json' )
 					res = @app.new.handle( req )
@@ -407,8 +411,6 @@ describe Strelka::App::RestResources do
 					expect( server.uuid ).to eq( @server_values['uuid'] )
 				end
 
-				it "ignores attributes that aren't in the allowed columns list"
-
 			end # POST routes
 
 

data/spec/strelka/app/routing_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -17,7 +17,7 @@ require 'strelka/behavior/plugin'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App::Routing do
+RSpec.describe Strelka::App::Routing do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '' )
@@ -51,7 +51,7 @@ describe Strelka::App::Routing do
 				options( '/clowns' ) {}
 			end
 
-			expect( @app.route_methods ).to eq( [ :GET, :POST_clowns, :OPTIONS_clowns ] )
+			expect( @app.route_methods ).to include( :GET, :POST_clowns, :OPTIONS_clowns )
 		end
 
 		# OPTIONS GET/HEAD POST PUT DELETE TRACE CONNECT

data/spec/strelka/app/sessions_spec.rb

@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -15,7 +17,7 @@ require 'strelka/behavior/plugin'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App::Sessions do
+RSpec.describe Strelka::App::Sessions do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '' )

data/spec/strelka/app/templating_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -18,7 +18,7 @@ require 'strelka/behavior/plugin'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App::Templating do
+RSpec.describe Strelka::App::Templating do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/user' )

data/spec/strelka/app_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../helpers'
 
@@ -15,7 +15,7 @@ require 'strelka/app'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::App do
+RSpec.describe Strelka::App do
 
 	before( :all ) do
 		@initial_registry = Strelka::App.loaded_plugins.dup
@@ -207,35 +207,16 @@ describe Strelka::App do
 
 	it "uses the app's ID constant for the appid if .run is called without one" do
 		@app.const_set( :ID, 'testing-app' )
-		conn = double( "Mongrel2 connection", close: true )
-		allow( conn ).to receive( :request_sock )
-		allow( CZTop::Poller ).to receive( :new )
-
-		expect( Mongrel2::Handler ).to receive( :connection_info_for ).with( 'testing-app' ).
-			and_return([ TEST_SEND_SPEC, TEST_RECV_SPEC ])
-		expect( Mongrel2::Connection ).to receive( :new ).
-			with( 'testing-app', TEST_SEND_SPEC, TEST_RECV_SPEC ).
-			and_return( conn )
-
-		@app.run
+		expect( @app.default_appid ).to eq( 'testing-app' )
 	end
 
 
-	it "uses the app's name for the appid if .run is called without one and it has no ID constant" do
+	it "uses the app's name for the appid it has no ID constant" do
 		@app.class_eval do
 			def self::name; "My::First::Blog" ; end
 		end
-		conn = double( "Mongrel2 connection", close: true )
-		allow( conn ).to receive( :request_sock )
-		allow( CZTop::Poller ).to receive( :new )
-
-		expect( Mongrel2::Handler ).to receive( :connection_info_for ).with( 'my-first-blog' ).
-			and_return([ TEST_SEND_SPEC, TEST_RECV_SPEC ])
-		expect( Mongrel2::Connection ).to receive( :new ).
-			with( 'my-first-blog', TEST_SEND_SPEC, TEST_RECV_SPEC ).
-			and_return( conn )
 
-		@app.run
+		expect( @app.default_appid ).to eq( 'my-first-blog' )
 	end
 
 

data/spec/strelka/authprovider/basic_spec.rb

@@ -1,5 +1,6 @@
-# -*- rspec -*-
+# -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -14,7 +15,7 @@ require 'strelka/authprovider/basic'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::AuthProvider::Basic do
+RSpec.describe Strelka::AuthProvider::Basic do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/admin' )

data/spec/strelka/authprovider/hostaccess_spec.rb

@@ -1,5 +1,6 @@
-# -*- rspec -*-
+# -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -14,7 +15,7 @@ require 'strelka/authprovider/hostaccess'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::AuthProvider::HostAccess do
+RSpec.describe Strelka::AuthProvider::HostAccess do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/admin' )

data/spec/strelka/authprovider_spec.rb

@@ -1,5 +1,6 @@
-# -*- rspec -*-
+# -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../helpers'
 
@@ -13,7 +14,7 @@ require 'strelka/authprovider'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::AuthProvider do
+RSpec.describe Strelka::AuthProvider do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/admin' )

data/spec/strelka/cli_spec.rb

@@ -1,5 +1,6 @@
-#!/usr/bin/env rspec -cfd
-#encoding: utf-8
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../helpers'
 
@@ -8,7 +9,7 @@ require 'rspec'
 
 require 'strelka/cli'
 
-describe Strelka::CLI do
+RSpec.describe Strelka::CLI do
 
 	before( :all ) do
 		testcommands = Module.new
@@ -75,7 +76,9 @@ describe Strelka::CLI do
 
 		it "doesn't execute the block if dry-run mode *is* enabled" do
 			expect {
-				described_class.run([ '-n', 'test_dryrun' ])
+				Loggability.outputting_to( [] ) do
+					described_class.run([ '-n', 'test_dryrun' ])
+				end
 			}.to_not output( /Ran it!/ ).to_stdout
 		end
 

data/spec/strelka/cookie_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../helpers'
 
@@ -13,7 +13,7 @@ require 'strelka/cookie'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::Cookie do
+RSpec.describe Strelka::Cookie do
 
 	it "parses a 'nil' Cookie header field as an empty Hash" do
 		expect( Strelka::Cookie.parse( nil ) ).to eq( {} )

data/spec/strelka/cookieset_spec.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require_relative '../helpers'
 
@@ -14,7 +14,7 @@ require 'strelka/cookieset'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::CookieSet do
+RSpec.describe Strelka::CookieSet do
 
 	before( :each ) do
 		@cookieset = Strelka::CookieSet.new