mongrel2 0.39.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a891b9b342ed29169b81e8d5db135f3cd4d9e1b
-  data.tar.gz: 9467b6614c8df8892d0a6c027dfec33be3824843
+  metadata.gz: cb56e425208f200087682a31c176f7dd70cb0728
+  data.tar.gz: 6a50e163b3e0e4ce66bdee6a4adb7612e65ae920
 SHA512:
-  metadata.gz: 52c633d2fba86266d991f5f7d6cabd735b303406b6f3c96ae734f47a2dfc77e3b45a435a35de6a7abecea03ece007e2ae64e9040c9eff34b58bb60bbb27340a7
-  data.tar.gz: 943c432e477cccb2cde8feac08dd7f8574ee39961830f7f9f465d9b20c83f473e1b2b310854cb3ad7133da5ac1e2e139f12acc111c3a33a9d6a1a112e0eb1f9a
+  metadata.gz: 5cb87b9487590c9f54aacdb5696b3873b18be485bde271cfc690103d47c4f80f70d55d7294e40ae12e6e2057a4f0335a7be7691d2227561d1cd5d90d564d01e5
+  data.tar.gz: 3e81e6cbf784b5e49307bde6286fafdbbec5938addc6b94612e8110900189c0b4c09dc7455eaa8f5dad552ffea8e6df3fc4d3a5b1098ad1f0281c6fe5fd84f53

data/ChangeLog

@@ -1,8 +1,140 @@
+2013-10-31  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Gemfile, Rakefile, lib/mongrel2.rb,
+	lib/mongrel2/connection.rb, lib/mongrel2/control.rb,
+	spec/mongrel2/connection_spec.rb, spec/mongrel2/control_spec.rb,
+	spec/mongrel2/handler_spec.rb:
+	Revert d55e67969b87: move back to the zmq library
+	[a463a301914c] [tip]
+
+2013-10-11  Michael Granger  <ged@FaerieMUD.org>
+
+	* data/mongrel2/config.sql:
+	Drop the xrequest table when creating the config DB.
+
+	Thanks to mahlon@martini.nu for spotting this!
+	[ba164dea6bb6]
+
+2013-09-25  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.39.0 for changeset 0dff8f45e583
+	[2c791af90d0d]
+
+	* .hgsigs:
+	Added signature for changeset 36202f7a03c9
+	[0dff8f45e583] [v0.39.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump minor version and update history.
+	[36202f7a03c9]
+
+	* .rvm.gems, Rakefile:
+	Update deps to sequel 4.2.x
+	[012c74e1d21a]
+
+2013-09-20  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/mongrel2/connection.rb, spec/mongrel2/connection_spec.rb,
+	spec/mongrel2/handler_spec.rb:
+	In ZMQ 3, PUB sockets can't have ZMQ_IDENTITY
+	[09cf99e4baaa]
+
+	* lib/mongrel2/handler.rb:
+	Don't try to close the context if it doesn't need it
+	[a2f00dc38fdb]
+
+	* Gemfile, Rakefile, lib/mongrel2.rb:
+	Move dependencies over to rbczmq.
+	[14bad384503a]
+
+	* Manifest.txt, spec/constants.rb, spec/helpers.rb,
+	spec/lib/constants.rb, spec/lib/helpers.rb, spec/lib/matchers.rb,
+	spec/matchers.rb, spec/mongrel2/config/directory_spec.rb,
+	spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/filter_spec.rb,
+	spec/mongrel2/config/handler_spec.rb,
+	spec/mongrel2/config/host_spec.rb, spec/mongrel2/config/log_spec.rb,
+	spec/mongrel2/config/proxy_spec.rb,
+	spec/mongrel2/config/route_spec.rb,
+	spec/mongrel2/config/server_spec.rb,
+	spec/mongrel2/config/setting_spec.rb,
+	spec/mongrel2/config/statistic_spec.rb,
+	spec/mongrel2/config/xrequest_spec.rb, spec/mongrel2/config_spec.rb,
+	spec/mongrel2/connection_spec.rb, spec/mongrel2/constants_spec.rb,
+	spec/mongrel2/control_spec.rb, spec/mongrel2/handler_spec.rb,
+	spec/mongrel2/httprequest_spec.rb,
+	spec/mongrel2/httpresponse_spec.rb, spec/mongrel2/request_spec.rb,
+	spec/mongrel2/response_spec.rb, spec/mongrel2/table_spec.rb,
+	spec/mongrel2/websocket_spec.rb, spec/mongrel2_spec.rb:
+	Convert specs to new RSpec 'expect' syntax.
+	[070611cc1b20]
+
+	* .rvm.gems, lib/mongrel2/connection.rb, lib/mongrel2/control.rb,
+	spec/mongrel2/connection_spec.rb, spec/mongrel2/control_spec.rb,
+	spec/mongrel2/handler_spec.rb:
+	Replace stagnant zmq library with rbczmq.
+	[d55e67969b87]
+
+2013-09-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* Manifest.txt, data/mongrel2/config.sql, lib/mongrel2/config.rb,
+	lib/mongrel2/config/server.rb, lib/mongrel2/config/xrequest.rb,
+	spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/xrequest_spec.rb:
+	Add support for 1.8.1's "X-Requests"
+	[ce2c1f560e76]
+
+	* .hgtags:
+	Added tag v0.38.0 for changeset 94a931fa3c89
+	[2e7bb3f05151]
+
+	* .hgsigs:
+	Added signature for changeset 0ea16429b0cf
+	[94a931fa3c89] [v0.38.0]
+
+	* History.rdoc, README.rdoc, lib/mongrel2.rb:
+	Bump minor version, update README and History.
+	[0ea16429b0cf]
+
+	* .hgignore, .rvm.gems, Gemfile, Rakefile:
+	Update dependencies, add Gemfile.
+	[a116fb6d0301]
+
+	* data/mongrel2/config.sql, data/mongrel2/mimetypes.sql,
+	lib/mongrel2/config/server.rb, spec/mongrel2/config/dsl_spec.rb:
+	Update to Mongrel2 1.8.1 config schema.
+	[df7f08063108]
+
+2013-09-13  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.37.0 for changeset 9691a05249a8
+	[6f18f139b1e6]
+
+	* .hgsigs:
+	Added signature for changeset cf053ff6b34f
+	[9691a05249a8] [v0.37.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump minor version, update history.
+	[cf053ff6b34f]
+
+	* lib/mongrel2/config.rb, lib/mongrel2/config/host.rb,
+	lib/mongrel2/config/route.rb, lib/mongrel2/connection.rb,
+	lib/mongrel2/control.rb, lib/mongrel2/httpresponse.rb,
+	lib/mongrel2/jsonrequest.rb, lib/mongrel2/request.rb,
+	spec/lib/constants.rb, spec/lib/helpers.rb,
+	spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/httpresponse_spec.rb, spec/mongrel2/websocket_spec.rb:
+	Make explicitly-set 'nil' body also a bodiless response.
+	[21c8b5722a51]
+
 2013-08-09  Michael Granger  <ged@FaerieMUD.org>
 
 	* .rvm.gems:
 	Update rvm gemset versions
-	[b1ca9f2d0588] [tip]
+	[b1ca9f2d0588]
 
 2013-07-01  Michael Granger  <ged@FaerieMUD.org>
 
@@ -84,7 +216,7 @@
 	lib/mongrel2/config/handler.rb, lib/mongrel2/config/server.rb:
 	Updated Config model dataset declarations for Sequel versions >
 	3.42.
-	[d1e574e548fb] [github/master]
+	[d1e574e548fb]
 
 2012-12-21  Michael Granger  <ged@FaerieMUD.org>
 
@@ -580,7 +712,7 @@
 	examples/config.rb, lib/mongrel2/config.rb,
 	lib/mongrel2/httprequest.rb, spec/mongrel2/config_spec.rb:
 	Change Config.settings to a Table, small fixups for async upload.
-	[e2384875455d] [github/master@default]
+	[e2384875455d]
 
 	* .tm_properties, data/mongrel2/bootstrap.html, examples/.env,
 	examples/Procfile, examples/async-upload.rb, examples/config.rb,

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.40.0 [2013-10-31] Michael Granger <ged@FaerieMUD.org>
+
+- Move back to the zmq library, as rbczmq was too unstable.
+- Drop the xrequest table when creating the config DB.
+
+
 == v0.39.0 [2013-09-25] Michael Granger <ged@FaerieMUD.org>
 
 - Replace stagnant zmq library with rbczmq.

data/Rakefile

@@ -33,7 +33,7 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.dependency 'yajl-ruby',  '~> 1.0'
 	self.dependency 'trollop',    '~> 2.0'
 	self.dependency 'sysexits',   '~> 1.1'
-	self.dependency 'rbczmq',     '~> 1.7'
+	self.dependency 'zmq',        '~> 2.1'
 	self.dependency 'loggability','~> 0.5'
 	self.dependency 'sqlite3',    '~> 1.3'
 

data/data/mongrel2/config.sql

@@ -10,6 +10,7 @@ DROP TABLE IF EXISTS mimetype;
 DROP TABLE IF EXISTS setting;
 DROP TABLE IF EXISTS directory;
 DROP TABLE IF EXISTS filter;
+DROP TABLE IF EXISTS xrequest;
 
 CREATE TABLE server (id INTEGER PRIMARY KEY,
     uuid TEXT,

data/lib/mongrel2/connection.rb

@@ -70,13 +70,13 @@ class Mongrel2::Connection
 		self.log.debug "0mq Context is: %p" % [ ctx ]
 
 		self.log.info "Connecting PULL request socket (%s)" % [ self.sub_addr ]
-		@request_sock = ctx.socket( :PULL )
-		@request_sock.linger = 0
+		@request_sock = ctx.socket( ZMQ::PULL )
+		@request_sock.setsockopt( ZMQ::LINGER, 0 )
 		@request_sock.connect( self.sub_addr )
 
 		self.log.info "Connecting PUB response socket (%s)" % [ self.pub_addr ]
-		@response_sock = ctx.socket( :PUB )
-		@response_sock.linger = 0
+		@response_sock = ctx.socket( ZMQ::PUB )
+		@response_sock.setsockopt( ZMQ::LINGER, 0 )
 		@response_sock.connect( self.pub_addr )
 	end
 

data/lib/mongrel2/control.rb

@@ -28,8 +28,8 @@ class Mongrel2::Control
 	def initialize( port=DEFAULT_PORT )
 		check_port( port )
 		@ctx = Mongrel2.zmq_context
-		@socket = @ctx.socket( :REQ )
-		@socket.linger = 0
+		@socket = @ctx.socket( ZMQ::REQ )
+		@socket.setsockopt( ZMQ::LINGER, 0 )
 		@socket.connect( port.to_s )
 	end
 

data/lib/mongrel2.rb

@@ -1,8 +1,7 @@
 # -*- ruby -*-
 #encoding: utf-8
 
-# Ensure this is used instead of 'zmq' if it's also installed
-gem 'rbczmq'
+gem 'zmq'
 
 require 'loggability'
 require 'zmq'
@@ -25,10 +24,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.39.0'
+	VERSION = '0.40.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 36202f7a03c9 $
+	REVISION = %q$Revision: 1d6f5f4d6b60 $
 
 
 	require 'mongrel2/constants'

data/spec/mongrel2/connection_spec.rb

@@ -43,12 +43,12 @@ describe Mongrel2::Connection do
 		request_sock = double( "request socket" )
 		response_sock = double( "response socket" )
 
-		expect( @ctx ).to receive( :socket ).with( :PULL ).and_return( request_sock )
-		expect( request_sock ).to receive( :linger= ).with( 0 )
+		expect( @ctx ).to receive( :socket ).with( ZMQ::PULL ).and_return( request_sock )
+		expect( request_sock ).to receive( :setsockopt ).with( ZMQ::LINGER, 0 )
 		expect( request_sock ).to receive( :connect ).with( TEST_SEND_SPEC )
 
-		expect( @ctx ).to receive( :socket ).with( :PUB ).and_return( response_sock )
-		expect( response_sock ).to receive( :linger= ).with( 0 )
+		expect( @ctx ).to receive( :socket ).with( ZMQ::PUB ).and_return( response_sock )
+		expect( response_sock ).to receive( :setsockopt ).with( ZMQ::LINGER, 0 )
 		expect( response_sock ).to_not receive( :identity= )
 		expect( response_sock ).to receive( :connect ).with( TEST_RECV_SPEC )
 
@@ -63,11 +63,11 @@ describe Mongrel2::Connection do
 	context "after a connection has been established" do
 
 		before( :each ) do
-			@request_sock = double( "request socket", :linger= => nil, :connect => nil )
-			@response_sock = double( "response socket", :linger= => nil, :connect => nil )
+			@request_sock = double( "request socket", :setsockopt => nil, :connect => nil )
+			@response_sock = double( "response socket", :setsockopt => nil, :connect => nil )
 
-			allow( @ctx ).to receive( :socket ).with( :PULL ).and_return( @request_sock )
-			allow( @ctx ).to receive( :socket ).with( :PUB ).and_return( @response_sock )
+			allow( @ctx ).to receive( :socket ).with( ZMQ::PULL ).and_return( @request_sock )
+			allow( @ctx ).to receive( :socket ).with( ZMQ::PUB ).and_return( @response_sock )
 
 			@conn.connect
 		end
@@ -92,10 +92,10 @@ describe Mongrel2::Connection do
 		end
 
 		it "doesn't keep its request and response sockets when duped" do
-			request_sock2 = double( "request socket", :linger= => nil, :connect => nil )
-			response_sock2 = double( "response socket", :linger= => nil, :connect => nil )
-			allow( @ctx ).to receive( :socket ).with( :PULL ).and_return( request_sock2 )
-			allow( @ctx ).to receive( :socket ).with( :PUB ).and_return( response_sock2 )
+			request_sock2 = double( "request socket", :setsockopt => nil, :connect => nil )
+			response_sock2 = double( "response socket", :setsockopt => nil, :connect => nil )
+			allow( @ctx ).to receive( :socket ).with( ZMQ::PULL ).and_return( request_sock2 )
+			allow( @ctx ).to receive( :socket ).with( ZMQ::PUB ).and_return( response_sock2 )
 
 			duplicate = @conn.dup
 

data/spec/mongrel2/control_spec.rb

@@ -18,8 +18,8 @@ describe Mongrel2::Control do
 
 	before( :each ) do
 		@ctx = double( "ZMQ::Context" )
-		@socket = double( "ZMQ REQ socket", :connect => nil, :linger= => nil )
-		allow( @ctx ).to receive( :socket ).with( :REQ ).and_return( @socket )
+		@socket = double( "ZMQ REQ socket", :connect => nil, :setsockopt => nil )
+		allow( @ctx ).to receive( :socket ).with( ZMQ::REQ ).and_return( @socket )
 
 		Mongrel2.instance_variable_set( :@zmq_ctx, @ctx )
 

data/spec/mongrel2/handler_spec.rb

@@ -47,11 +47,11 @@ describe Mongrel2::Handler do
 	# Ensure 0MQ never actually gets called
 	before( :each ) do
 		@ctx = double( '0mq context', close: nil )
-		@request_sock = double( "request socket", :linger= => nil, :connect => nil, :close => nil )
-		@response_sock = double( "response socket", :linger= => nil, :connect => nil, :close => nil )
+		@request_sock = double( "request socket", :setsockopt => nil, :connect => nil, :close => nil )
+		@response_sock = double( "response socket", :setsockopt => nil, :connect => nil, :close => nil )
 
-		allow( @ctx ).to receive( :socket ).with( :PULL ).and_return( @request_sock )
-		allow( @ctx ).to receive( :socket ).with( :PUB ).and_return( @response_sock )
+		allow( @ctx ).to receive( :socket ).with( ZMQ::PULL ).and_return( @request_sock )
+		allow( @ctx ).to receive( :socket ).with( ZMQ::PUB ).and_return( @response_sock )
 
 		allow( ZMQ ).to receive( :select ).and_return([ [@request_sock], [], [] ])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -117,19 +117,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rbczmq
+  name: zmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
@@ -409,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongrel2
-rubygems_version: 2.1.4
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]