strelka 0.15.0 → 0.16.0

data/spec/strelka/discovery_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/discovery'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::Discovery do
+RSpec.describe Strelka::Discovery do
 
 	before( :all ) do
 		@real_discovered_apps = described_class.instance_variable_get( :@discovered_apps )

data/spec/strelka/exceptions_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/exceptions'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka, "exception classes" do
+RSpec.describe Strelka, "exception classes" do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/exceptions' )

data/spec/strelka/httprequest/acceptparams_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/httprequest/acceptparams'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::HTTPRequest, "accept params" do
+RSpec.describe Strelka::HTTPRequest, "accept params" do
 
 
 	describe Strelka::HTTPRequest::MediaType do

data/spec/strelka/httprequest/auth_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/httprequest/auth'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::HTTPRequest::Auth do
+RSpec.describe Strelka::HTTPRequest::Auth do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/service/user' )

data/spec/strelka/httprequest/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'
 
@@ -15,7 +15,7 @@ require 'strelka/httpresponse/negotiation'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::HTTPRequest::Negotiation do
+RSpec.describe Strelka::HTTPRequest::Negotiation do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/service/user' )

data/spec/strelka/httprequest/session_spec.rb

@@ -1,5 +1,6 @@
-# -*- rspec -*-
+# -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -15,7 +16,7 @@ require 'strelka/session/default'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::HTTPRequest::Session, "-extended request" do
+RSpec.describe Strelka::HTTPRequest::Session, "-extended request" do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/service/user' )

data/spec/strelka/httprequest_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/cookie'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::HTTPRequest do
+RSpec.describe Strelka::HTTPRequest do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/directory' )
@@ -54,6 +54,10 @@ describe Strelka::HTTPRequest do
 			expect( @req.base_uri.to_s ).to eq( 'http://localhost:8080/directory' )
 		end
 
+		it "doesn't modify its URI when calculating its base URI" do
+			expect { @req.base_uri }.to_not change { @req.uri }
+		end
+
 		it "knows what the path of the request past its route is" do
 			expect( @req.app_path ).to eq( '/userinfo/ged' )
 		end
@@ -77,6 +81,7 @@ describe Strelka::HTTPRequest do
 				@req.redirect( uri, true )
 			}.to finish_with( HTTP::MOVED_PERMANENTLY, nil, :location => uri )
 		end
+
 	end
 
 

data/spec/strelka/httpresponse/negotiation_spec.rb

@@ -1,5 +1,6 @@
-#!/usr/bin/env ruby
-#encoding: utf-8
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -14,7 +15,7 @@ require 'strelka/httpresponse/negotiation'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::HTTPResponse::Negotiation do
+RSpec.describe Strelka::HTTPResponse::Negotiation do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/service/user' )
@@ -327,7 +328,7 @@ describe Strelka::HTTPResponse::Negotiation do
 		   "acceptable charsets includes ISO8859-1" do
 			@req.headers.accept_charset = 'iso-8859-1, utf-8;q=0.8'
 			@res.content_type = 'text/plain'
-			@res.body = "some stuff".force_encoding( Encoding::ASCII_8BIT )
+			@res.body = "some stuff".dup.force_encoding( Encoding::ASCII_8BIT )
 
 			expect( @res ).to have_acceptable_charset()
 		end
@@ -336,7 +337,7 @@ describe Strelka::HTTPResponse::Negotiation do
 		   "text subtype, and the list of acceptable charsets doesn't include ISO8859-1" do
 			@req.headers.accept_charset = 'iso-8859-15, utf-8;q=0.8'
 			@res.content_type = 'text/plain'
-			@res.body = "some stuff".force_encoding( Encoding::ASCII_8BIT )
+			@res.body = "some stuff".dup.force_encoding( Encoding::ASCII_8BIT )
 
 			expect( @res ).to_not have_acceptable_charset()
 		end

data/spec/strelka/httpresponse/session_spec.rb

@@ -1,5 +1,6 @@
-# -*- rspec -*-
+# -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../../helpers'
 
@@ -16,7 +17,7 @@ require 'strelka/session/default'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::HTTPResponse::Session, "-extended response" do
+RSpec.describe Strelka::HTTPResponse::Session, "-extended response" do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/service/user' )

data/spec/strelka/httpresponse_spec.rb

@@ -1,5 +1,6 @@
-#!/usr/bin/env ruby
-#encoding: utf-8
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../helpers'
 
@@ -11,7 +12,7 @@ require 'strelka/httpresponse'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::HTTPResponse do
+RSpec.describe Strelka::HTTPResponse do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/glossary' )

data/spec/strelka/mixins_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/mixins'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka, "mixins" do
+RSpec.describe Strelka, "mixins" do
 
 
 	describe Strelka::AbstractClass do
@@ -301,5 +301,88 @@ describe Strelka, "mixins" do
 
 	end
 
+
+	describe Strelka::MethodUtilities, 'used to extend a class' do
+
+		let!( :extended_class ) do
+			klass = Class.new
+			klass.extend( Strelka::MethodUtilities )
+			klass
+		end
+
+		it "can declare a class-level attribute reader" do
+			extended_class.singleton_attr_reader :foo
+			expect( extended_class ).to respond_to( :foo )
+			expect( extended_class ).to_not respond_to( :foo= )
+			expect( extended_class ).to_not respond_to( :foo? )
+		end
+
+		it "can declare a class-level attribute writer" do
+			extended_class.singleton_attr_writer :foo
+			expect( extended_class ).to_not respond_to( :foo )
+			expect( extended_class ).to respond_to( :foo= )
+			expect( extended_class ).to_not respond_to( :foo? )
+		end
+
+		it "can declare a class-level attribute reader and writer" do
+			extended_class.singleton_attr_accessor :foo
+			expect( extended_class ).to respond_to( :foo )
+			expect( extended_class ).to respond_to( :foo= )
+			expect( extended_class ).to_not respond_to( :foo? )
+		end
+
+		it "can declare a class-level alias" do
+			def extended_class.foo
+				return "foo"
+			end
+			extended_class.singleton_method_alias( :bar, :foo )
+
+			expect( extended_class.bar ).to eq( 'foo' )
+		end
+
+		it "can declare an instance attribute predicate method" do
+			extended_class.attr_predicate :foo
+			instance = extended_class.new
+
+			expect( instance ).to_not respond_to( :foo )
+			expect( instance ).to_not respond_to( :foo= )
+			expect( instance ).to respond_to( :foo? )
+
+			expect( instance.foo? ).to be_falsey
+
+			instance.instance_variable_set( :@foo, 1 )
+			expect( instance.foo? ).to be_truthy
+		end
+
+		it "can declare an instance attribute predicate and writer" do
+			extended_class.attr_predicate_accessor :foo
+			instance = extended_class.new
+
+			expect( instance ).to_not respond_to( :foo )
+			expect( instance ).to respond_to( :foo= )
+			expect( instance ).to respond_to( :foo? )
+
+			expect( instance.foo? ).to be_falsey
+
+			instance.foo = 1
+			expect( instance.foo? ).to be_truthy
+		end
+
+		it "can declare a class-level attribute predicate and writer" do
+			extended_class.singleton_predicate_accessor :foo
+			expect( extended_class ).to_not respond_to( :foo )
+			expect( extended_class ).to respond_to( :foo= )
+			expect( extended_class ).to respond_to( :foo? )
+		end
+
+		it "can declare a class-level predicate method" do
+			extended_class.singleton_predicate_reader :foo
+			expect( extended_class ).to_not respond_to( :foo )
+			expect( extended_class ).to_not respond_to( :foo= )
+			expect( extended_class ).to respond_to( :foo? )
+		end
+
+	end
+
 end
 

data/spec/strelka/multipartparser_spec.rb

@@ -1,5 +1,6 @@
-#!/usr/bin/env ruby
-#encoding: utf-8
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../helpers'
 
@@ -13,7 +14,7 @@ require 'strelka/multipartparser'
 #####################################################################
 ###	C O N T E X T S
 #####################################################################
-describe Strelka::MultipartParser do
+RSpec.describe Strelka::MultipartParser do
 
 	BOUNDARY = 'sillyBoundary'
 	MIMEPARSER_SPECDIR = Pathname.new( __FILE__ ).dirname.parent
@@ -138,7 +139,7 @@ describe Strelka::MultipartParser do
 	end
 
 
-	JPEG_MAGIC = "\xff\xd8".force_encoding( 'ascii-8bit' )
+	JPEG_MAGIC = "\xff\xd8".b
 
 	it "parses the files from multiple uploads" do
 		socket = load_form( "2_images.form" )

data/spec/strelka/paramvalidator_spec.rb

@@ -1,5 +1,6 @@
-#!/usr/bin/env ruby
-#encoding: utf-8
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require_relative '../helpers'
 
@@ -13,7 +14,12 @@ require 'strelka/paramvalidator'
 #####################################################################
 ###	C O N T E X T S
 #####################################################################
-describe Strelka::ParamValidator do
+RSpec.describe Strelka::ParamValidator do
+
+	# Utility function to make tainted frozen strings out of frozen string literals
+	def tainted( string )
+		return ( +string ).taint.freeze
+	end
 
 
 	before(:each) do
@@ -133,8 +139,7 @@ describe Strelka::ParamValidator do
 		end
 
 		it "untaints valid args if told to do so" do
-			tainted_one = "1"
-			tainted_one.taint
+			tainted_one = tainted( "1" )
 
 			@validator.add( :number, /^\d+$/, :untaint )
 			@validator.validate( 'number' => tainted_one )
@@ -343,10 +348,10 @@ describe Strelka::ParamValidator do
 			@validator.untaint_all_constraints = true
 
 			args = {
-				'recipe[ingredient][rarity]'.taint => 'super-rare'.taint,
-				'recipe[ingredient][name]'.taint => 'nutmeg'.taint,
-				'recipe[ingredient][cost]'.taint => '$0.18'.taint,
-				'recipe[yield]'.taint => '2 loaves'.taint,
+				tainted('recipe[ingredient][rarity]') => tainted('super-rare'),
+				tainted('recipe[ingredient][name]') => tainted('nutmeg'),
+				tainted('recipe[ingredient][cost]') => tainted('$0.18'),
+				tainted('recipe[yield]') => tainted('2 loaves'),
 			}
 			@validator.validate( args )
 
@@ -449,7 +454,7 @@ describe Strelka::ParamValidator do
 
 			it "returns the captures with named captures as a Hash" do
 				@validator.add( :order_number, /(?<category>[[:upper:]]{3})-(?<sku>\d{12})/, :untaint )
-				@validator.validate( 'order_number' => "   JVV-886451300133   ".taint )
+				@validator.validate( 'order_number' => tainted("   JVV-886451300133   ") )
 
 				expect( @validator[:order_number] ).to eq( {:category => 'JVV', :sku => '886451300133'} )
 				expect( @validator[:order_number][:category] ).to_not be_tainted()

data/spec/strelka/plugins_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'
 
@@ -19,7 +19,7 @@ class Strelka::Pluggable
 end
 
 
-describe "Strelka plugin system" do
+RSpec.describe "Strelka plugin system" do
 
 	before( :all ) do
 		@original_registry = Strelka::Pluggable.loaded_plugins.dup
@@ -181,6 +181,28 @@ describe "Strelka plugin system" do
 			expect( app.testing_value ).to eq( :pre_existing_value )
 		end
 
+
+		it "passes a block to the plugin's ::init_block if given" do
+			plugin = Module.new do
+				def self::name; "Strelka::Pluggable::InitBlockTestPlugin"; end
+				def self::configure_block( object, &block )
+					object.block = block
+				end
+				include Strelka::Plugin
+
+				module ClassMethods
+					@block = nil
+					attr_accessor :block
+				end
+			end
+
+			app = Class.new( Strelka::Pluggable )
+			block = Proc.new {}
+			app.register_plugin( plugin, &block )
+
+			expect( app.block ).to be( block )
+		end
+
 	end
 
 

data/spec/strelka/router/default_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/router/default'
 ###	C O N T E X T S
 #####################################################################
 
-describe Strelka::Router::Default do
+RSpec.describe Strelka::Router::Default do
 
 	before( :all ) do
 		@request_factory = Mongrel2::RequestFactory.new( route: '/user' )