RubyGems - rack-mongrel2 - Versions diffs - 0.1.0 → 0.1.1 - Mend

rack-mongrel2 0.1.0 → 0.1.1

Files changed (11) hide show

data/README.rdoc CHANGED Viewed

@@ -1,9 +1,28 @@
 = rack-mongrel2
-Description goes here.
+The only Mongrel2 Rack handler you'll ever need.
+I wrote this because I wanted to learn Mongrel2, and I didn't like what was out there. I copy-pasted a lot of code from Colin Curtin's m2r project (http://github.com/perplexes/m2r), but I also changed and reorganized it into what I believe is a good setup for a proper rubygem. I used the ruby zmq library instead of the ffi version, so we'll see how that works out.
+== How to use
+1. Get mongrel2 installed (http://mongrel2.org/wiki?name=GettingStarted)
+2. Get your config for mongrel2 setup (see example directory)
+3. Add it to your Gemfile
+    gem 'rack-mongrel2', '~> 0.1.0', :require => nil
+4. Run Mongrel2
+5. Run your rails application
+    RACK_MONGREL2_UUID=<my uuid> rails s Mongrel2
+6. Profit!
+I'll write a better blog post soon...
 == Note on Patches/Pull Requests
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/VERSION CHANGED Viewed

data/example/mongrel2.conf ADDED Viewed

@@ -0,0 +1,26 @@
+darkblog2 = Host(name='localhost', routes={
+  '/': Handler(send_spec='tcp://127.0.0.1:9997',
+    send_ident='9539ED88-1B33-4D19-A9F9-283E5BF11AC7',
+    recv_spec='tcp://127.0.0.1:9996',
+    recv_ident='')
+})
+main = Server(
+  uuid='94601E4B-A770-4B7D-930D-CE3A484B5280',
+  chroot='.',
+  access_log='/logs/mongrel2_access.log',
+  error_log='/logs/mongrel2_error.log',
+  pid_file='/tmp/pids/mongrel2.pid',
+  default_host='localhost',
+  name='main',
+  port=8080,
+  hosts=[darkblog2]
+)
+settings = {
+  'zeromq.threads': 1,
+  'control_port': 'ipc://tmp/mongrel2_control'
+}
+servers = [main]

data/example/sinatra/app.rb ADDED Viewed

@@ -0,0 +1,24 @@
+require 'sinatra'
+require 'yajl/json_gem'
+get '*' do
+  items = request.env.map do |k,v|
+    "<li><strong>#{k}</strong>: #{v}</li>\n"
+  end
+  %Q{
+    <html>
+      <head>
+        <title>Sinatra Mongrel2 Test</title>
+      </head>
+      <body>
+        <h1>env</h1>
+        <ul>
+          #{items}
+        </ul>
+        <hr />
+        <h1>Params</h1>
+        #{params.to_json}
+      </body>
+    </html>
+  }
+end

data/example/sinatra/config.ru ADDED Viewed

@@ -0,0 +1,6 @@
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+require 'rack/handler/mongrel2'
+require 'app'
+Rack::Handler::Mongrel2.run Sinatra::Application

data/lib/mongrel2/connection.rb CHANGED Viewed

@@ -6,8 +6,8 @@ module Mongrel2
   class Connection
     CTX = ZMQ::Context.new(1)
-    def initialize(ident, sub, pub, block = true)
-      @ident, @sub, @pub, @block = ident, sub, pub, block
+    def initialize(uuid, sub, pub, block = true)
+      @uuid, @sub, @pub, @block = uuid, sub, pub, block
       # Connect to receive requests
       @reqs = CTX.socket(ZMQ::UPSTREAM)
@@ -16,7 +16,7 @@ module Mongrel2
       # Connect to send responses
       @resp = CTX.socket(ZMQ::PUB)
       @resp.connect(pub)
-      @resp.setsockopt(ZMQ::IDENTITY, ident)
+      @resp.setsockopt(ZMQ::IDENTITY, uuid)
     end
     def recv
@@ -28,8 +28,8 @@ module Mongrel2
     end
     def close
-      @reqs.close rescue nil
-      @resp.close rescue nil
+      # I think I should be able to just close the context
+      CTX.close rescue nil
     end
   end
 end

data/lib/mongrel2/request.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+require 'yajl'
 module Mongrel2
   class Request
     attr_reader :headers, :body, :uuid, :conn_id

data/lib/rack/handler/mongrel2.rb CHANGED Viewed

@@ -16,9 +16,12 @@ module Rack
           conn = ::Mongrel2::Connection.new(options[:uuid], options[:recv], options[:send])
           running = true
-          trap('SIGINT') do
-            running = false
-            conn.close
+          # This doesn't work at all for some reason
+          %w(INT TERM).each do |sig|
+            trap(sig) do
+              running = false
+            end
           end
           while running
@@ -39,13 +42,13 @@ module Rack
               'REQUEST_METHOD' => req.headers['METHOD'],
               'SCRIPT_NAME' => script_name,
               'PATH_INFO' => req.headers['PATH'].gsub(script_name, ''),
-              'QUERY_STRING' => req.headers['QUERY']
+              'QUERY_STRING' => req.headers['QUERY'] || ''
             }
             env['SERVER_NAME'], env['SERVER_PORT'] = req.headers['host'].split(':', 2)
             req.headers.each do |key, val|
               unless key =~ /content_(type|length)/i
-                key = "HTTP_#{key.upcase}"
+                key = "HTTP_#{key.upcase.gsub('-', '_')}"
               end
               env[key] = val
             end

data/rack-mongrel2.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{rack-mongrel2}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]
-  s.date = %q{2010-10-23}
+  s.date = %q{2010-10-24}
   s.description = %q{A Rack handler for the Mongrel2 web server, by Zed Shaw. http://mongrel2.org/}
   s.email = %q{darkhelmet@darkhelmetlive.com}
   s.extra_rdoc_files = [
@@ -26,10 +26,12 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "example/mongrel2.conf",
+     "example/sinatra/app.rb",
+     "example/sinatra/config.ru",
      "lib/mongrel2/connection.rb",
      "lib/mongrel2/request.rb",
      "lib/mongrel2/response.rb",
-     "lib/rack-mongrel2.rb",
      "lib/rack/handler/mongrel2.rb",
      "rack-mongrel2.gemspec",
      "spec/rack-mongrel2_spec.rb",

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rack-mongrel2
 version: !ruby/object:Gem::Version
-  hash: 27
+  hash: 25
   prerelease: false
   segments:
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel Huckstep
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-10-23 00:00:00 -06:00
+date: 2010-10-24 00:00:00 -06:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -117,10 +117,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- example/mongrel2.conf
+- example/sinatra/app.rb
+- example/sinatra/config.ru
 - lib/mongrel2/connection.rb
 - lib/mongrel2/request.rb
 - lib/mongrel2/response.rb
-- lib/rack-mongrel2.rb
 - lib/rack/handler/mongrel2.rb
 - rack-mongrel2.gemspec
 - spec/rack-mongrel2_spec.rb

data/lib/rack-mongrel2.rb DELETED Viewed

File without changes