mongrel2 0.19.0 → 0.20.1

data/ChangeLog

@@ -1,12 +1,24 @@
 2012-03-28  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.19.0 for changeset ddf2ba151fdc
+	[fc05d13761c5] [tip]
+
+	* .hgsigs:
+	Added signature for changeset a0a3115eb782
+	[ddf2ba151fdc] [v0.19.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump minor version, update history.
+	[a0a3115eb782]
+
 	* lib/mongrel2/httpresponse.rb, spec/mongrel2/httpresponse_spec.rb:
 	Make HTTPResponse default to a 200 status if there's a body.
 
 	If there's a body, and the status hasn't yet been set, assume that
 	it's supposed to be 200 OK. If the body is nil or empty and the
 	status hasn't been set, assume it's a 204 No content.
-	[f1c2834b6d59] [tip]
+	[f1c2834b6d59] [github/master]
 
 	* .hgtags:
 	Added tag v0.18.0 for changeset 4624c640343e
@@ -114,7 +126,7 @@
 	spec/mongrel2/httprequest_spec.rb, spec/mongrel2/request_spec.rb,
 	spec/mongrel2/websocket_spec.rb:
 	Adding WebSocket (RFC6455) support
-	[0db6f3808f5a] [github/master]
+	[0db6f3808f5a]
 
 2012-03-02  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,26 @@
+== v0.20.1 [2012-03-28] Michael Granger <ged@FaerieMUD.org>
+
+- Fix dependencies and the spec that fails when you run against the
+  version of Sequel I was trying to fix in the previous release.
+
+
+== v0.20.0 [2012-03-28] Michael Granger <ged@FaerieMUD.org>
+
+- Fix the config DB for Sequel 3.34.
+
+Note: This fix includes several API changes
+
+- Mongrel2::Config.adapter_method is now .sqlite_adapter, and just
+  returns the name of the appropriate adapter instead of a Method
+  object that returns a Sequel::Database.
+- Mongrel2::Config.pathname is now .dbname, and returns either a URI
+  or a String, depending on how the database handle was created.
+
+These changes also will make it easier to use alternative
+configuration databases, e.g., when I get the PostgreSQL config
+module working, it'll be easier to point the config model at it.
+
+
 == v0.19.0 [2012-03-28] Michael Granger <ged@FaerieMUD.org>
 
 - Make HTTPResponse default to a 200 status if there's a body.

data/Rakefile

@@ -26,7 +26,7 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.dependency 'nokogiri',   '~> 1.5'
-	self.dependency 'sequel',     '~> 3.31'
+	self.dependency 'sequel',     '~> 3.34'
 	self.dependency 'amalgalite', '~> 1.1'
 	self.dependency 'tnetstring', '~> 0.3'
 	self.dependency 'yajl-ruby',  '~> 1.0'
@@ -36,7 +36,7 @@ hoespec = Hoe.spec 'mongrel2' do
 
 	self.dependency 'configurability', '~> 1.0', :developer
 	self.dependency 'simplecov',       '~> 0.6', :developer
-	self.dependency 'rspec',           '~> 2.8', :developer
+	self.dependency 'hoe-deveiate',    '~> 0.1', :developer
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.require_ruby_version( '>= 1.9.2' )

data/lib/mongrel2.rb

@@ -14,10 +14,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 1.9.2 or later. <<<\n\n" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.19.0'
+	VERSION = '0.20.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: a0a3115eb782 $
+	REVISION = %q$Revision: 55a458211cb9 $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/config.rb

@@ -18,10 +18,10 @@ begin
 	require 'amalgalite'
 	# Rude hack to stop Sequel::Model from complaining if it's subclassed before
 	# the first database connection is established. Ugh.
-	Sequel::Model.db = Sequel.amalgalite if Sequel::DATABASES.empty?
+	Sequel::Model.db = Sequel.connect( 'amalgalite:/' ) if Sequel::DATABASES.empty?
 rescue LoadError
 	require 'sqlite3'
-	Sequel::Model.db = Sequel.sqlite if Sequel::DATABASES.empty?
+	Sequel::Model.db = Sequel.connect( 'sqlite:/' ) if Sequel::DATABASES.empty?
 end
 
 
@@ -85,22 +85,20 @@ module Mongrel2
 			lambda {|raw| TNetstring.parse( raw ).first} )
 
 
-		### Return a bound Method object to the Sequel constructor of choice for the
-		### config DB. This is used to choose either 'amalgalite' or 'sqlite3', preferring
-		### the former.
-		def self::adapter_method
+		### Return the name of the Sequel SQLite adapter to use. If the amalgalite library
+		### is available, this will return 'amalgalite', else it returns 'sqlite'.
+		def self::sqlite_adapter
 			if defined?( ::Amalgalite )
-				return Sequel.method( :amalgalite )
+				return 'amalgalite'
 			else
-				return Sequel.method( :sqlite )
+				return 'sqlite'
 			end
 		end
 
 
 		### Return a Sequel::Database for an in-memory database via the available SQLite library
 		def self::in_memory_db
-			# Just calling either .amalgalite or .sqlite returns an in-memory DB
-			return self.adapter_method.call
+			return Sequel.connect( adapter: self.sqlite_adapter )
 		end
 
 
@@ -112,7 +110,7 @@ module Mongrel2
 			config = DEFAULTS.merge( config )
 
 			if config[ :configdb ]
-				self.db = self.adapter_method.call( config[:configdb] )
+				self.db = Sequel.connect( config[:configdb] )
 			end
 		end
 
@@ -197,14 +195,17 @@ module Mongrel2
 		end
 
 
-		### Return a Pathname object for the current database, or nil if the current
+		### Return the name of the current config database, or nil if the current
 		### database is an in-memory one.
-		def self::pathname
-			dburi = URI( self.db.uri )
-			pathname = dburi.path
-			pathname.slice!( 0, 1 ) if pathname.start_with?( '/' )
-			return nil if pathname.empty?
-			return Pathname( pathname )
+		def self::dbname
+			Mongrel2.log.warn "Returning dbname from: %p" % [ self.db.opts ]
+			if self.db.opts[:dbname]
+				return self.db.opts[:dbname]
+			elsif self.db.uri
+				return URI( self.db.uri )
+			else
+				return nil
+			end
 		end
 
 

data/spec/lib/helpers.rb

@@ -117,9 +117,8 @@ module Mongrel2::SpecHelpers
 
 
 	### Set up a Mongrel2 configuration database in memory.
-	def setup_config_db( dbspec=':memory:' )
-		Mongrel2::Config.configure( :configdb => dbspec ) unless
-			Mongrel2::Config.db.uri[ %r{sqlite:/(.*)}, 1 ] == dbspec
+	def setup_config_db
+		Mongrel2::Config.db ||= Mongrel2::Config.in_memory_db
 		Mongrel2::Config.init_database
 		Mongrel2::Config.db.tables.collect {|t| Mongrel2::Config.db[t] }.each( &:truncate )
 	end

data/spec/mongrel2/config/route_spec.rb

@@ -26,8 +26,7 @@ describe Mongrel2::Config::Route do
 
 	before( :all ) do
 		setup_logging()
-		Mongrel2::Config.configure( :configdb => ':memory:' )
-		Mongrel2::Config.init_database
+		setup_config_db()
 	end
 
 	before( :each ) do

data/spec/mongrel2/config_spec.rb

@@ -25,7 +25,7 @@ require 'mongrel2/config'
 describe Mongrel2::Config do
 
 	before( :all ) do
-		setup_logging()
+		setup_logging( :fatal )
 		setup_config_db()
 	end
 
@@ -97,13 +97,14 @@ describe Mongrel2::Config do
 	end
 
 	it "can return the path to the config DB as a Pathname if it's pointing at a file" do
-		Mongrel2::Config.db = Mongrel2::Config.adapter_method[ 'config-spec.sqlite' ]
-		Mongrel2::Config.pathname.should == Pathname( 'config-spec.sqlite' )
+		Mongrel2::Config.db =
+			Sequel.connect( adapter: Mongrel2::Config.sqlite_adapter, dbname: 'config-spec.sqlite' )
+		Mongrel2::Config.dbname.should == 'config-spec.sqlite'
 	end
 
 	it "returns nil if asked for the pathname to an in-memory database" do
 		Mongrel2::Config.db = Mongrel2::Config.in_memory_db
-		Mongrel2::Config.pathname.should be_nil()
+		Mongrel2::Config.dbname.should be_nil()
 	end
 
 	describe "Configurability support", :if => defined?( Configurability ) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70214632899820 !ruby/object:Gem::Requirement
+  requirement: &70237984767300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,21 +48,21 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70214632899820
+  version_requirements: *70237984767300
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70214632897680 !ruby/object:Gem::Requirement
+  requirement: &70237984766360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.31'
+        version: '3.34'
   type: :runtime
   prerelease: false
-  version_requirements: *70214632897680
+  version_requirements: *70237984766360
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70214632896600 !ruby/object:Gem::Requirement
+  requirement: &70237984765540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70214632896600
+  version_requirements: *70237984765540
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70214632895520 !ruby/object:Gem::Requirement
+  requirement: &70237984764780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70214632895520
+  version_requirements: *70237984764780
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70214625392560 !ruby/object:Gem::Requirement
+  requirement: &70237984780340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214625392560
+  version_requirements: *70237984780340
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70214625390540 !ruby/object:Gem::Requirement
+  requirement: &70237984779460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70214625390540
+  version_requirements: *70237984779460
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70214625388540 !ruby/object:Gem::Requirement
+  requirement: &70237984778420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214625388540
+  version_requirements: *70237984778420
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70214625385800 !ruby/object:Gem::Requirement
+  requirement: &70237984777480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,21 +125,21 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70214625385800
+  version_requirements: *70237984777480
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70214625406480 !ruby/object:Gem::Requirement
+  requirement: &70237984776400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70214625406480
+  version_requirements: *70237984776400
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70214625403620 !ruby/object:Gem::Requirement
+  requirement: &70237984775700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,62 +147,62 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70214625403620
+  version_requirements: *70237984775700
 - !ruby/object:Gem::Dependency
-  name: configurability
-  requirement: &70214625401920 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &70237984774680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70214625401920
+  version_requirements: *70237984774680
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70214625399640 !ruby/object:Gem::Requirement
+  name: configurability
+  requirement: &70237984773560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70214625399640
+  version_requirements: *70237984773560
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70214625418940 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &70237984772600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70214625418940
+  version_requirements: *70237984772600
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70214625418020 !ruby/object:Gem::Requirement
+  name: hoe-deveiate
+  requirement: &70237984787820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70214625418020
+  version_requirements: *70237984787820
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70214625417200 !ruby/object:Gem::Requirement
+  requirement: &70237984786680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70214625417200
+  version_requirements: *70237984786680
 description: ! 'Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for
 
   Mongrel2[http://mongrel2.org/].
@@ -221,11 +221,11 @@ executables:
 - m2sh.rb
 extensions: []
 extra_rdoc_files:
-- Manifest.txt
-- examples/README.txt
 - DSL.rdoc
 - History.rdoc
+- Manifest.txt
 - README.rdoc
+- examples/README.txt
 files:
 - .autotest
 - .gemtest