strelka-fancyerrors 0.0.1.pre.15 → 0.0.1

data/History.rdoc

@@ -1,4 +1,4 @@
-== v0.0.1 [2012-05-03] Michael Granger <ged@FaerieMUD.org>
+== v0.0.1 [2012-10-17] Michael Granger <ged@FaerieMUD.org>
 
 Initial release.
 

data/Rakefile

@@ -18,12 +18,13 @@ hoespec = Hoe.spec 'strelka-fancyerrors' do
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'strelka', '~> 0.0.1.pre'
-	self.dependency 'inversion', '~> 0.9'
+	self.dependency 'strelka', '~> 0.0.2'
+	self.dependency 'inversion', '~> 0.11'
+	self.dependency 'loggability', '~> 0.5'
 	self.dependency 'hoe-deveiate', '~> 0.1', :developer
 
 	self.spec_extras[:licenses] = ["BSD"]
-	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Strelka Web Application Toolkit']
+	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Strelka Fancy Error Handler']
 	self.require_ruby_version( '>=1.9.2' )
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )

data/spec/strelka/app/fancyerrors_spec.rb

@@ -9,75 +9,64 @@ BEGIN {
 }
 
 require 'rspec'
-require 'mongrel2/testing'
 require 'strelka'
 require 'strelka/app'
-require 'strelka/logging'
+require 'strelka/constants'
+require 'mongrel2/testing'
+require 'loggability/spechelpers'
 require 'strelka/app/fancyerrors'
 require 'strelka/behavior/plugin'
 
 
-class ArrayLogger
-	### Create a new ArrayLogger that will append content to +array+.
-	def initialize( array )
-		@array = array
-	end
-
-	### Write the specified +message+ to the array.
-	def write( message )
-		@array << message
-	end
-
-	### No-op -- this is here just so Logger doesn't complain
-	def close; end
+### Mock with RSpec
+RSpec.configure do |c|
+	include Strelka::Constants
 
-end # class ArrayLogger
+	c.mock_with( :rspec )
 
+	c.include( Loggability::SpecHelpers )
+	c.include( Mongrel2::SpecHelpers )
+	c.include( Strelka::Constants )
+end
 
-class FancyErrorTestingApp < Strelka::App
-	include Strelka::Constants
 
-	plugins :routing, :fancyerrors
+describe Strelka::App::FancyErrors do
 
+	TEST_SEND_SPEC = 'tcp://127.0.0.1:9997'
+	TEST_RECV_SPEC = 'tcp://127.0.0.1:9996'
 
-	# Set defaults for all arguments to avoid having to provide them every time
-	def initialize( appid='fancyerrors-test', sspec=TEST_SEND_SPEC, rspec=TEST_RECV_SPEC )
-		super
+	before( :all ) do
+		setup_logging()
 	end
 
-	get 'server' do |req|
-		finish_with HTTP::SERVER_ERROR, "This response intentionally left blank."
-	end
+	let( :request_factory ) { Mongrel2::RequestFactory.new(route: '') }
 
-	get 'client' do |req|
-		finish_with HTTP::BAD_REQUEST, "You call that a request?!"
-	end
-end
+	let( :appclass ) do
+		Class.new( Strelka::App ) do
+			include Strelka::Constants
 
+			plugins :routing,
+			        :fancyerrors
 
-describe Strelka::App::FancyErrors do
 
-	TEST_SEND_SPEC = 'tcp://127.0.0.1:9997'
-	TEST_RECV_SPEC = 'tcp://127.0.0.1:9996'
+			# Set defaults for all arguments to avoid having to provide them every time
+			def initialize( appid='fancyerrors-test', sspec=TEST_SEND_SPEC, rspec=TEST_RECV_SPEC )
+				super
+			end
 
-	before( :all ) do
-		Strelka.log.level = Logger::FATAL
-
-		# Only do this when executing from a spec in TextMate
-		if ENV['HTML_LOGGING'] || (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)
-			Thread.current['logger-output'] = []
-			logdevice = ArrayLogger.new( Thread.current['logger-output'] )
-			Strelka.logger = Logger.new( logdevice )
-			# Strelka.logger.level = level
-			Strelka.logger.formatter = Strelka::Logging::HtmlFormatter.new( Strelka.logger )
-			Mongrel2.logger = Strelka.logger
-		end
+			get 'server' do |req|
+				finish_with HTTP::SERVER_ERROR, "This response intentionally left blank."
+			end
 
-		@request_factory = Mongrel2::RequestFactory.new( route: '' )
+			get 'client' do |req|
+				finish_with HTTP::BAD_REQUEST, "You call that a request?!"
+			end
+		end
 	end
 
-	before( :each ) do
-		@app = FancyErrorTestingApp.new
+
+	after( :all ) do
+		reset_logging()
 	end
 
 
@@ -85,26 +74,27 @@ describe Strelka::App::FancyErrors do
 
 
 	it "renders server errors using the server error template" do
-		req = @request_factory.get( '/server' )
-		res = @app.handle( req )
+		req = request_factory.get( '/server' )
+		res = appclass.new.handle( req )
 
-		res.body.should =~ /server error template/i
+		res.body.read.should =~ /server error template/i
 	end
 
 	it "renders client errors using the client error template" do
-		req = @request_factory.get( '/client' )
-		res = @app.handle( req )
+		req = request_factory.get( '/client' )
+		res = appclass.new.handle( req )
 
-		res.body.should =~ /client error template/i
+		res.body.read.should =~ /client error template/i
 	end
 
 	it "renders errors using the existing layout template if one is set" do
-		@app.layout = Inversion::Template.new( '<!-- common layout --><?attr body ?>' )
+		app = appclass.new
+		app.layout = Inversion::Template.new( '<!-- common layout --><?attr body ?>' )
 
-		req = @request_factory.get( '/client' )
-		res = @app.handle( req )
+		req = request_factory.get( '/client' )
+		res = app.handle( req )
 
-		res.body.should =~ /common layout/i
+		res.body.read.should =~ /common layout/i
 	end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka-fancyerrors
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.15
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strelka
@@ -45,7 +45,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1.pre
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1.pre
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: inversion
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: loggability
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +197,7 @@ rdoc_options:
 - -f
 - fivefish
 - -t
-- Strelka Web Application Toolkit
+- Strelka Fancy Error Handler
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement