mongrel2 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb56e425208f200087682a31c176f7dd70cb0728
-  data.tar.gz: 6a50e163b3e0e4ce66bdee6a4adb7612e65ae920
+  metadata.gz: 19e6d36ed1c0911195e57b4f2b9d9f850a020bfc
+  data.tar.gz: 1c3e75b1dd52df44b0a449ed8d118cefff39b9d8
 SHA512:
-  metadata.gz: 5cb87b9487590c9f54aacdb5696b3873b18be485bde271cfc690103d47c4f80f70d55d7294e40ae12e6e2057a4f0335a7be7691d2227561d1cd5d90d564d01e5
-  data.tar.gz: 3e81e6cbf784b5e49307bde6286fafdbbec5938addc6b94612e8110900189c0b4c09dc7455eaa8f5dad552ffea8e6df3fc4d3a5b1098ad1f0281c6fe5fd84f53
+  metadata.gz: 4986951f6ed2d88f6b41b5ab75f26e1f683416742881efd6a6308f37f27fe27419916ef97fede3b456aac9c5522f6f0bb6596429417ae0fb4d92521ca56a64c0
+  data.tar.gz: fefccfdcd4c937c29a545443639084e83db3691f9c4cfc3352caabca2ff6b9d4eeb4bdef72ebcf4e1b636f5db56bfa00cbf940b003d45a918152f7c41f04555c

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-�2gfZ�І�Y��>���'�/�#����W%�/hа���z�P2�ٰ��r���{����Dr_	>:��ܕ	1��L]��՚۲��g55|QP���(j�<=�R,lK� ��'��{ʻ�+Y1R�>M/�o�H̿�0���J慸��<���,��"�9�h�}���VZ�r���~��,Y���]���q{�P��MCٰ�a�����`�c�{�pD�k_B�%֣X�Rhʱ��#�(b��G.�CR��zz�6L<<WS
+���p���{��wXw?�q:
+���Xܜ��A�����gn���j�-.�P�c}y��E;�^����u�B#WT���.�!�D��C�ZW���f2�ْ��+
V�R#��&�]KT���x~C4���lO_%�B@y�"q��hC��%��D�4�L����mn@�Y$(��ؾj�������j�;���%A�
����o{�Q���/<*+�wɝcB�T�FY�G6
���fr��� Q�ox&<�6�iWH���

data/.simplecov

@@ -0,0 +1,14 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+$stderr.puts "\n\n>>> Enabling coverage report.\n\n"
+
+SimpleCov.start do
+	add_filter 'spec'
+	add_group "Config Classes" do |file|
+		file.filename =~ %r{lib/mongrel2/config(\.rb|/.*)$}
+	end
+	add_group "Needing tests" do |file|
+		file.covered_percent < 90
+	end
+end

data/ChangeLog

@@ -1,3 +1,37 @@
+2014-01-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, .simplecov, Manifest.txt, Rakefile,
+	lib/mongrel2/config.rb, lib/mongrel2/handler.rb, spec/helpers.rb,
+	spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/server_spec.rb, spec/mongrel2/config_spec.rb,
+	spec/mongrel2/handler_spec.rb, spec/mongrel2/httpresponse_spec.rb,
+	spec/mongrel2/table_spec.rb:
+	Config introspection and cleanup.
+
+	- Add Mongrel2::Config.mimetypes for fetching Mongrel2's mime-types
+	table.
+	- Add more config introspection to the Mongrel2::Handler class.
+	- Fix spec syntax deprecated in RSpec 3.
+	[d0e689f9de52] [tip]
+
+	* lib/mongrel2/xmlrequest.rb, spec/mongrel2/xmlrequest_spec.rb:
+	Use LibXML instead of Nokogiri for XML request type
+	[243c94859e5f]
+
+2013-11-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.40.0 for changeset aadd49593b0f
+	[91e4453b14ca]
+
+	* .hgsigs:
+	Added signature for changeset 1d6f5f4d6b60
+	[aadd49593b0f] [v0.40.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump minor version, update history.
+	[1d6f5f4d6b60]
+
 2013-10-31  Michael Granger  <ged@FaerieMUD.org>
 
 	* .rvm.gems, Gemfile, Rakefile, lib/mongrel2.rb,
@@ -5,7 +39,7 @@
 	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]
+	[a463a301914c]
 
 2013-10-11  Michael Granger  <ged@FaerieMUD.org>
 
@@ -83,7 +117,7 @@
 	spec/mongrel2/config/dsl_spec.rb,
 	spec/mongrel2/config/xrequest_spec.rb:
 	Add support for 1.8.1's "X-Requests"
-	[ce2c1f560e76]
+	[ce2c1f560e76] [github/master]
 
 	* .hgtags:
 	Added tag v0.38.0 for changeset 94a931fa3c89
@@ -712,7 +746,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]
+	[e2384875455d] [github/master@default]
 
 	* .tm_properties, data/mongrel2/bootstrap.html, examples/.env,
 	examples/Procfile, examples/async-upload.rb, examples/config.rb,

data/History.rdoc

@@ -1,3 +1,13 @@
+== v0.41.0 [2014-02-02] Michael Granger <ged@FaerieMUD.org>
+
+- Convert back to rbczmq for modern mongrel2s
+- Config introspection and cleanup.
+  - Add Mongrel2::Config.mimetypes for fetching Mongrel2's mime-types
+    table.
+  - Add more config introspection to the Mongrel2::Handler class.
+- Use LibXML instead of Nokogiri for XML request type
+
+
 == v0.40.0 [2013-10-31] Michael Granger <ged@FaerieMUD.org>
 
 - Move back to the zmq library, as rbczmq was too unstable.

data/Manifest.txt

@@ -1,5 +1,6 @@
 .autotest
 .gemtest
+.simplecov
 ChangeLog
 DSL.rdoc
 History.rdoc
@@ -79,4 +80,5 @@ spec/mongrel2/request_spec.rb
 spec/mongrel2/response_spec.rb
 spec/mongrel2/table_spec.rb
 spec/mongrel2/websocket_spec.rb
+spec/mongrel2/xmlrequest_spec.rb
 spec/mongrel2_spec.rb

data/Rakefile

@@ -27,15 +27,15 @@ hoespec = Hoe.spec 'mongrel2' do
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'nokogiri',   '~> 1.5'
-	self.dependency 'sequel',     '~> 4.2'
-	self.dependency 'tnetstring', '~> 0.3'
-	self.dependency 'yajl-ruby',  '~> 1.0'
-	self.dependency 'trollop',    '~> 2.0'
-	self.dependency 'sysexits',   '~> 1.1'
-	self.dependency 'zmq',        '~> 2.1'
+	self.dependency 'sequel',      '~> 4.2'
+	self.dependency 'tnetstring',  '~> 0.3'
+	self.dependency 'yajl-ruby',   '~> 1.0'
+	self.dependency 'trollop',     '~> 2.0'
+	self.dependency 'sysexits',    '~> 1.1'
+	self.dependency 'rbczmq',     '~> 1.7'
 	self.dependency 'loggability','~> 0.5'
-	self.dependency 'sqlite3',    '~> 1.3'
+	self.dependency 'sqlite3',     '~> 1.3'
+	self.dependency 'libxml-ruby', '~> 2.7'
 
 	self.dependency 'amalgalite',      '~> 1.3', :developer
 	self.dependency 'configurability', '~> 2.0', :developer

data/lib/mongrel2.rb

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

data/lib/mongrel2/config.rb

@@ -154,6 +154,12 @@ module Mongrel2
 		end
 
 
+		### Return a Hash of current mimetypes from the config database keyed by extension.
+		def self::mimetypes
+			return Mongrel2::Config::Mimetype.to_hash( :extension, :mimetype )
+		end
+
+
 		### Return the contents of the configuration schema SQL file.
 		def self::load_config_schema
 			return CONFIG_SQL.read

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( ZMQ::PULL )
-		@request_sock.setsockopt( ZMQ::LINGER, 0 )
+		@request_sock = ctx.socket( :PULL )
+		@request_sock.linger = 0
 		@request_sock.connect( self.sub_addr )
 
 		self.log.info "Connecting PUB response socket (%s)" % [ self.pub_addr ]
-		@response_sock = ctx.socket( ZMQ::PUB )
-		@response_sock.setsockopt( ZMQ::LINGER, 0 )
+		@response_sock = ctx.socket( :PUB )
+		@response_sock.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( ZMQ::REQ )
-		@socket.setsockopt( ZMQ::LINGER, 0 )
+		@socket = @ctx.socket( :REQ )
+		@socket.linger = 0
 		@socket.connect( port.to_s )
 	end
 

data/lib/mongrel2/handler.rb

@@ -101,10 +101,18 @@ class Mongrel2::Handler
 	### Create an instance of the handler using the config from the database with
 	### the given +appid+ and run it.
 	def self::run( appid )
-		self.log.info "Running application %p" % [ appid ]
+		app = self.app_instance_for( appid )
+		self.log.info "Running application %p: %p" % [ appid, app ]
+		app.run
+	end
+
+
+	### Return an instance of the handler configured for the handler in the currently-loaded
+	### Mongrel2 config that corresponds to +appid+.
+	def self::app_instance_for( appid )
 		send_spec, recv_spec = self.connection_info_for( appid )
 		self.log.info "  config specs: %s <-> %s" % [ send_spec, recv_spec ]
-		new( appid, send_spec, recv_spec ).run
+		return new( appid, send_spec, recv_spec )
 	end
 
 
@@ -161,9 +169,42 @@ class Mongrel2::Handler
 
 
 	### Return the Mongrel2::Config::Handler that corresponds to this app's
-	### appid.
+	### appid, and its connection's send_spec and recv_spec.
 	def handler_config
-		return Mongrel2::Config::Handler.by_send_ident( self.app_id ).first
+		return self.configured_handlers.where(
+			send_spec: self.conn.sub_addr,
+			recv_spec: self.conn.pub_addr
+		).first
+	end
+
+
+	### Return the Mongrel2::Config::Handlers that corresponds to this app's
+	### appid.
+	def configured_handlers
+		return Mongrel2::Config::Handler.by_send_ident( self.app_id )
+	end
+
+
+	### Return the Mongre2::Config::Routes for this Handler.
+	def configured_routes
+		handlers = self.configured_handlers
+		return Mongrel2::Config::Route.where( target_id: handlers.select(:id) )
+	end
+
+
+	### Return the Mongrel2::Config::Hosts that have routes that point to this
+	### Handler.
+	def configured_hosts
+		routes = self.configured_routes
+		return Mongrel2::Config::Host.where( id: routes.select(:host_id) )
+	end
+
+
+	### Return the Mongrel2::Config::Servers that have hosts that have routes that
+	### point to this Handler.
+	def configured_servers
+		hosts = self.configured_hosts
+		return Mongrel2::Config::Server.where( id: hosts.select(:server_id) )
 	end
 
 

data/lib/mongrel2/xmlrequest.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-require 'nokogiri'
+require 'libxml'
 require 'loggability'
 
 require 'mongrel2/request' unless defined?( Mongrel2::Request )
@@ -22,7 +22,7 @@ class Mongrel2::XMLRequest < Mongrel2::Request
 	def initialize( sender_id, conn_id, path, headers, body, raw=nil )
 		super
 		self.log.debug "Parsing XML request body"
-		@data = Nokogiri::XML( body )
+		@reader = LibXML::XML::Reader.string( body )
 	end
 
 
@@ -30,8 +30,8 @@ class Mongrel2::XMLRequest < Mongrel2::Request
 	public
 	######
 
-	# The parsed request data (a Nokogiri::XML document)
-	attr_reader :data
+	# The parsed request data (a LibXML::Reader object)
+	attr_reader :reader
 
 
 end # class Mongrel2::XMLRequest

data/spec/helpers.rb

@@ -5,19 +5,7 @@ require_relative 'constants'
 require_relative 'matchers'
 
 # SimpleCov test coverage reporting; enable this using the :coverage rake task
-if ENV['COVERAGE']
-	$stderr.puts "\n\n>>> Enabling coverage report.\n\n"
-	require 'simplecov'
-	SimpleCov.start do
-		add_filter 'spec'
-		add_group "Config Classes" do |file|
-			file.filename =~ %r{lib/mongrel2/config(\.rb|/.*)$}
-		end
-		add_group "Needing tests" do |file|
-			file.covered_percent < 90
-		end
-	end
-end
+require 'simplecov' if ENV['COVERAGE']
 
 begin
 	require 'configurability'

data/spec/mongrel2/config/dsl_spec.rb

@@ -71,7 +71,7 @@ describe Mongrel2::Config::DSL do
 			end
 
 			expect( result ).to be_a( Mongrel2::Config::Server )
-			expect( result.hosts ).to have( 1 ).member
+			expect( result.hosts.size ).to eq(  1  )
 			host = result.hosts.first
 
 			expect( host ).to be_a( Mongrel2::Config::Host )
@@ -109,13 +109,13 @@ describe Mongrel2::Config::DSL do
 			end
 
 			expect( result ).to be_a( Mongrel2::Config::Server )
-			expect( result.hosts ).to have( 2 ).members
+			expect( result.hosts.size ).to eq(  2  )
 			host1, host2 = result.hosts
 
 			expect( host1 ).to be_a( Mongrel2::Config::Host )
 			expect( host1.name ).to eq( 'brillianttaste' )
 			expect( host1.matching ).to eq( '*.brillianttasteinthefoodmouth.com' )
-			expect( host1.routes ).to have( 6 ).members
+			expect( host1.routes.size ).to eq(  6  )
 			expect( host1.routes ).to all_be_a( Mongrel2::Config::Route )
 
 			expect( host1.routes[0].path ).to eq( '/images' )
@@ -151,7 +151,7 @@ describe Mongrel2::Config::DSL do
 
 			expect( host2 ).to be_a( Mongrel2::Config::Host )
 			expect( host2.name ).to eq( 'deveiate.org' )
-			expect( host2.routes ).to have( 1 ).member
+			expect( host2.routes.size ).to eq(  1  )
 			expect( host2.routes.first ).to be_a( Mongrel2::Config::Route )
 		end
 
@@ -176,7 +176,7 @@ describe Mongrel2::Config::DSL do
 			)
 
 			expect( result ).to be_an( Array )
-			expect( result ).to have( 3 ).members
+			expect( result.size ).to eq(  3  )
 			expect( result ).to all_be_a( Mongrel2::Config::Setting )
 			expect( result[0].key ).to eq( 'zeromq.threads' )
 			expect( result[0].value ).to eq( '8' )
@@ -204,7 +204,7 @@ describe Mongrel2::Config::DSL do
 			)
 
 			expect( result ).to be_an( Array )
-			expect( result ).to have( 2 ).members
+			expect( result.size ).to eq(  2  )
 			expect( result ).to all_be_a( Mongrel2::Config::Mimetype )
 			expect( result[0].extension ).to eq( '.md' )
 			expect( result[0].mimetype ).to eq( 'text/x-markdown' )
@@ -228,7 +228,7 @@ describe Mongrel2::Config::DSL do
 				filter '/usr/lib/mongrel2/null.so'
 			end
 
-			expect( result.filters ).to have( 1 ).member
+			expect( result.filters.size ).to eq(  1  )
 			expect( result.filters.first ).to be_a( Mongrel2::Config::Filter )
 			expect( result.filters.first.settings ).to eq( {} )
 		end
@@ -240,7 +240,7 @@ describe Mongrel2::Config::DSL do
 					min_size: 1000
 			end
 
-			expect( result.filters ).to have( 1 ).member
+			expect( result.filters.size ).to eq(  1  )
 			expect( result.filters.first ).to be_a( Mongrel2::Config::Filter )
 			expect( result.filters.first.settings ).
 				to eq({ 'extensions' => ["*.html", "*.txt"], 'min_size' => 1000 })
@@ -255,7 +255,7 @@ describe Mongrel2::Config::DSL do
 				xrequest '/usr/lib/mongrel2/null.so'
 			end
 
-			expect( result.xrequests ).to have( 1 ).member
+			expect( result.xrequests.size ).to eq(  1  )
 			expect( result.xrequests.first ).to be_a( Mongrel2::Config::XRequest )
 			expect( result.xrequests.first.settings ).to eq( {} )
 		end
@@ -267,7 +267,7 @@ describe Mongrel2::Config::DSL do
 					min_size: 1000
 			end
 
-			expect( result.xrequests ).to have( 1 ).member
+			expect( result.xrequests.size ).to eq(  1  )
 			expect( result.xrequests.first ).to be_a( Mongrel2::Config::XRequest )
 			expect( result.xrequests.first.settings ).
 				to eq({ 'extensions' => ["*.html", "*.txt"], 'min_size' => 1000 })

data/spec/mongrel2/config/server_spec.rb

@@ -107,9 +107,9 @@ describe Mongrel2::Config::Server do
 	end
 
 	it "has a predicate that understands the use_ssl value" do
-		expect( @server.use_ssl ).to be_false()
+		expect( @server.use_ssl ).to be_falsey()
 		@server.use_ssl = true
-		expect( @server.use_ssl ).to be_true()
+		expect( @server.use_ssl ).to be_truthy()
 	end
 
 end

data/spec/mongrel2/config_spec.rb

@@ -45,7 +45,7 @@ describe Mongrel2::Config do
 		Mongrel2::Config.init_database
 		Mongrel2::Config::Server.truncate
 
-		s = Mongrel2::Config::Server.create(
+		Mongrel2::Config::Server.create(
 			uuid: TEST_UUID,
 			access_log: '/log/access.log',
 			error_log: '/log/error.log',
@@ -53,7 +53,7 @@ describe Mongrel2::Config do
 			default_host: 'localhost',
 			port: 8275
 		  )
-		expect( Mongrel2::Config.servers ).to have( 1 ).member
+		expect( Mongrel2::Config.servers.size ).to eq(  1  )
 		expect( Mongrel2::Config.servers.first.uuid ).to eq( TEST_UUID )
 	end
 
@@ -62,7 +62,7 @@ describe Mongrel2::Config do
 		Mongrel2::Config::Setting.dataset.truncate
 		Mongrel2::Config::Setting.create( key: 'control_port', value: 'ipc://var/run/control.sock' )
 		expect( Mongrel2::Config.settings ).to respond_to( :[] )
-		expect( Mongrel2::Config.settings ).to have( 1 ).member
+		expect( Mongrel2::Config.settings.size ).to eq(  1  )
 		expect( Mongrel2::Config.settings[ :control_port ] ).to eq( 'ipc://var/run/control.sock' )
 	end
 
@@ -72,9 +72,9 @@ describe Mongrel2::Config do
 
 	it "knows whether or not its database has been initialized" do
 		Mongrel2::Config.db = Mongrel2::Config.in_memory_db
-		expect( Mongrel2::Config.database_initialized? ).to be_false()
+		expect( Mongrel2::Config.database_initialized? ).to be_falsey()
 		Mongrel2::Config.init_database!
-		expect( Mongrel2::Config.database_initialized? ).to be_true()
+		expect( Mongrel2::Config.database_initialized? ).to be_truthy()
 	end
 
 	it "doesn't re-initialize the database if the non-bang version of init_database is used" do

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( ZMQ::PULL ).and_return( request_sock )
-		expect( request_sock ).to receive( :setsockopt ).with( ZMQ::LINGER, 0 )
+		expect( @ctx ).to receive( :socket ).with( :PULL ).and_return( request_sock )
+		expect( request_sock ).to receive( :linger= ).with( 0 )
 		expect( request_sock ).to receive( :connect ).with( TEST_SEND_SPEC )
 
-		expect( @ctx ).to receive( :socket ).with( ZMQ::PUB ).and_return( response_sock )
-		expect( response_sock ).to receive( :setsockopt ).with( ZMQ::LINGER, 0 )
+		expect( @ctx ).to receive( :socket ).with( :PUB ).and_return( response_sock )
+		expect( response_sock ).to receive( :linger= ).with( 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", :setsockopt => nil, :connect => nil )
-			@response_sock = double( "response socket", :setsockopt => nil, :connect => nil )
+			@request_sock = double( "request socket", :linger= => nil, :connect => nil )
+			@response_sock = double( "response socket", :linger= => nil, :connect => nil )
 
-			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( @ctx ).to receive( :socket ).with( :PULL ).and_return( @request_sock )
+			allow( @ctx ).to receive( :socket ).with( :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", :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 )
+			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 )
 
 			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, :setsockopt => nil )
-		allow( @ctx ).to receive( :socket ).with( ZMQ::REQ ).and_return( @socket )
+		@socket = double( "ZMQ REQ socket", :connect => nil, :linger= => nil )
+		allow( @ctx ).to receive( :socket ).with( :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", :setsockopt => nil, :connect => nil, :close => nil )
-		@response_sock = double( "response socket", :setsockopt => nil, :connect => nil, :close => nil )
+		@request_sock = double( "request socket", :linger= => nil, :connect => nil, :close => nil )
+		@response_sock = double( "response socket", :linger= => nil, :connect => nil, :close => nil )
 
-		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( @ctx ).to receive( :socket ).with( :PULL ).and_return( @request_sock )
+		allow( @ctx ).to receive( :socket ).with( :PUB ).and_return( @response_sock )
 
 		allow( ZMQ ).to receive( :select ).and_return([ [@request_sock], [], [] ])
 
@@ -132,7 +132,7 @@ describe Mongrel2::Handler do
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::HTTPRequest )
 		expect( response ).to be_a( Mongrel2::HTTPResponse )
@@ -145,7 +145,7 @@ describe Mongrel2::Handler do
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::JSONRequest )
 		expect( response ).to be_nil()
@@ -163,7 +163,7 @@ describe Mongrel2::Handler do
 
 		res = json_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::JSONRequest )
 		expect( response ).to be_a( Mongrel2::Response )
@@ -175,7 +175,7 @@ describe Mongrel2::Handler do
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::XMLRequest )
 		expect( response ).to be_nil()
@@ -193,7 +193,7 @@ describe Mongrel2::Handler do
 
 		res = xml_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::XMLRequest )
 		expect( response ).to be_a( Mongrel2::Response )
@@ -211,7 +211,7 @@ describe Mongrel2::Handler do
 
 		res = ws_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::WebSocket::ClientHandshake )
 		expect( response ).to be_a( Mongrel2::WebSocket::ServerHandshake )
@@ -229,7 +229,7 @@ describe Mongrel2::Handler do
 
 		res = ws_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::WebSocket::Frame )
 		expect( response ).to be_a( Mongrel2::WebSocket::Frame )
@@ -243,7 +243,7 @@ describe Mongrel2::Handler do
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::HTTPRequest )
 		expect( response ).to be_a( Mongrel2::HTTPResponse )
@@ -256,7 +256,7 @@ describe Mongrel2::Handler do
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::JSONRequest )
 		expect( response ).to be_nil()
@@ -274,7 +274,7 @@ describe Mongrel2::Handler do
 
 		res = disconnect_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( request ).to be_a( Mongrel2::JSONRequest )
 		expect( response ).to be_nil()
@@ -287,7 +287,7 @@ describe Mongrel2::Handler do
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
-		expect( res.transactions ).to have( 1 ).member
+		expect( res.transactions.size ).to eq(  1  )
 		request, response = res.transactions.first
 		expect( response ).to be_nil()
 	end

data/spec/mongrel2/httpresponse_spec.rb

@@ -85,7 +85,7 @@ describe Mongrel2::HTTPResponse do
 		expect( @response ).to_not be_handled()
 		expect( @response.body ).to be_a( StringIO )
 		expect( @response.body.size ).to eq( 0 )
-		expect( @response.headers ).to have(1).keys
+		expect( @response.headers.size ).to eq( 1 )
 	end
 
 	it "sets its status line to 200 OK if the body is set and the status hasn't yet been set" do

data/spec/mongrel2/table_spec.rb

@@ -63,7 +63,7 @@ describe Mongrel2::Table do
 	it "should create an array value and append when appending to an existing key" do
 		@table[:indian_meal] = 'pork sausage'
 		@table.append( 'Indian-MEAL' => 'pinecones' )
-		expect( @table['Indian-Meal'] ).to have(2).members
+		expect( @table['Indian-Meal'].size ).to eq( 2 )
 		expect( @table['Indian-Meal'] ).to include('pinecones')
 		expect( @table['Indian-Meal'] ).to include('pork sausage')
 	end
@@ -74,7 +74,7 @@ describe Mongrel2::Table do
 
 		table = Mongrel2::Table.new({ :bob => :dan, 'Bob' => :dan_too })
 
-		expect( table[:bob] ).to have(2).members
+		expect( table[:bob].size ).to eq( 2 )
 		expect( table['Bob'] ).to include( :dan )
 		expect( table['bob'] ).to include( :dan_too )
 		end
@@ -156,7 +156,7 @@ describe Mongrel2::Table do
 			values << [ header, value ]
 		end
 
-		expect( values.flatten ).to have(8).members
+		expect( values.flatten.size ).to eq( 8 )
 		expect( values.transpose[0] ).to include( 'Thai-Food', 'With-Absinthe', 'A-Number-Of-Some-Sort' )
 		expect( values.transpose[1] ).to include( 'normally good', 'seldom hot enough', 'questionable', '2' )
 	end

data/spec/mongrel2/xmlrequest_spec.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+require_relative '../helpers'
+
+require 'rspec'
+
+require 'tnetstring'
+require 'tmpdir'
+require 'tempfile'
+
+require 'mongrel2'
+require 'mongrel2/xmlrequest'
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe Mongrel2::XMLRequest do
+
+	let( :factory ) { Mongrel2::RequestFactory.new(route: '/form') }
+
+
+	it "can parse an XML request message" do
+
+		message = make_xml_request()
+		req = Mongrel2::Request.parse( message )
+
+		expect( req ).to be_a( Mongrel2::XMLRequest )
+		expect( req.sender_id ).to eq( TEST_UUID )
+		expect( req.conn_id ).to eq( TEST_ID )
+
+		expect( req.headers ).to be_a( Mongrel2::Table )
+		expect( req.headers['pattern'] ).to eq( TEST_XML_HEADERS['PATH'] )
+	end
+
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,22 +30,8 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -117,19 +103,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: zmq
+  name: rbczmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +144,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -305,6 +305,7 @@ extra_rdoc_files:
 files:
 - .autotest
 - .gemtest
+- .simplecov
 - ChangeLog
 - DSL.rdoc
 - History.rdoc
@@ -384,6 +385,7 @@ files:
 - spec/mongrel2/response_spec.rb
 - spec/mongrel2/table_spec.rb
 - spec/mongrel2/websocket_spec.rb
+- spec/mongrel2/xmlrequest_spec.rb
 - spec/mongrel2_spec.rb
 homepage: https://bitbucket.org/ged/ruby-mongrel2
 licenses:
@@ -409,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongrel2
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]