rack-mongrel2 0.2.3 → 0.2.4

data/README.md

@@ -22,6 +22,34 @@ I wrote this because I wanted to learn Mongrel2, and I didn't like what was out
 
 Check out the blog post too: http://blog.darkhax.com/2010/10/26/deploying-your-ruby-app-with-mongrel2
 
+## Advanced setup
+
+### Using custom send and receive socket values
+
+The Mongrel2 rack handler defaults the receive socket to `tcp://127.0.0.1:9997` and the send socket to `tcp://127.0.0.1:9996`. 
+
+To use different values set the `RACK_MONGREL2_RECV` and `RACK_MONGREL2_SEND` environment variables. For example: 
+
+    export RACK_MONGREL2_RECV=<mongrel2 handler send_spec value>
+    export RACK_MONGREL2_SEND=<mongrel2 handler recv_spec value>
+    export RACK_MONGREL2_UUID=<mongrel2 handler send_ident value>
+    rails server Mongrel2
+
+If for example your Mongrel2 handler configuration contains:
+
+    ...
+    recv_spec='tcp://127.0.0.1:7771'
+    send_spec='tcp://127.0.0.1:7772',
+    send_ident='42ffdda3-d151-41b1-923f-899ef6fc530a',
+    ...
+
+Then you will need to start your Rails application using:
+
+    export RACK_MONGREL2_RECV=tcp://127.0.0.1:7772
+    export RACK_MONGREL2_SEND=tcp://127.0.0.1:7771
+    export RACK_MONGREL2_UUID=42ffdda3-d151-41b1-923f-899ef6fc530a
+    rails server Mongrel2
+
 ## Thanks!
 
 * [Kevin Williams](https://github.com/kevwil) for PULL, specs, and other things.

data/lib/mongrel2.rb

@@ -10,5 +10,5 @@ end
 
 module Mongrel2
   JSON = Object.const_defined?('Yajl') ? ::Yajl::Parser : ::JSON
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/lib/mongrel2/connection.rb

@@ -4,17 +4,21 @@ require 'mongrel2/response'
 
 module Mongrel2
   class Connection
-    CTX = ZMQ::Context.new(1)
+    @context = nil
+
+    def self.context
+      @context ||= ZMQ::Context.new(1)
+    end
 
     def initialize(uuid, sub, pub)
       @uuid, @sub, @pub = uuid, sub, pub
 
       # Connect to receive requests
-      @reqs = CTX.socket(ZMQ::PULL)
+      @reqs = self.class.context.socket(ZMQ::PULL)
       @reqs.connect(sub)
 
       # Connect to send responses
-      @resp = CTX.socket(ZMQ::PUB)
+      @resp = self.class.context.socket(ZMQ::PUB)
       @resp.connect(pub)
       @resp.setsockopt(ZMQ::IDENTITY, uuid)
     end
@@ -32,7 +36,7 @@ module Mongrel2
 
     def close
       # I think I should be able to just close the context
-      CTX.close rescue nil
+      self.class.context.close rescue nil
     end
   end
-end
+end

data/lib/rack/handler/mongrel2.rb

@@ -7,8 +7,8 @@ module Rack
       class << self
         def run(app, options = {})
           options = {
-            :recv => 'tcp://127.0.0.1:9997' || ENV['RACK_MONGREL2_RECV'],
-            :send => 'tcp://127.0.0.1:9996' || ENV['RACK_MONGREL2_SEND'],
+            :recv => ENV['RACK_MONGREL2_RECV'] || 'tcp://127.0.0.1:9997',
+            :send => ENV['RACK_MONGREL2_SEND'] || 'tcp://127.0.0.1:9996',
             :uuid => ENV['RACK_MONGREL2_UUID']
           }.merge(options)
 
@@ -42,6 +42,7 @@ module Rack
               'rack.run_once' => false,
               'mongrel2.pattern' => req.headers['PATTERN'],
               'REQUEST_METHOD' => req.headers['METHOD'],
+				      'CONTENT_TYPE' => req.headers['content-type'],
               'SCRIPT_NAME' => script_name,
               'PATH_INFO' => req.headers['PATH'].gsub(script_name, ''),
               'QUERY_STRING' => req.headers['QUERY'] || ''
@@ -66,4 +67,4 @@ module Rack
       end
     end
   end
-end
+end

data/rack-mongrel2.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'rack-mongrel2'
-  s.version           = '0.2.3'
-  s.date              = '2011-04-09'
+  s.version           = '0.2.4'
+  s.date              = '2011-08-23'
   s.rubyforge_project = 'rack-mongrel2'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mongrel2
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-09 00:00:00 -06:00
+date: 2011-08-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rack-mongrel2
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: The only Mongrel2 Rack handler you'll ever need.