Structrue files under m2r namespace.

Bring some sanity to LOAD_PATH. Alias M2R to Mongrel2 namespace for
compatibility.

Author: mostlyobvious

lib/m2r.rb

@@ -1,6 +1,6 @@
-require 'connection'
-require 'request'
-require 'handler'
+require 'rubygems'
 
-module Mongrel2
+module M2R
 end
+
+Mongrel2 = M2R

lib/connection.rb renamed to lib/m2r/connection.rb

@@ -1,19 +1,10 @@
-# On OSX:
-# sudo port install zmq
-# sudo gem install zmq
-# RUBY_ENGINE = 'ruby'
-require 'rubygems'
-gem 'ffi-rzmq'
-gem 'json'
+require 'm2r/request'
 require 'ffi-rzmq'
 require 'json'
 
-$: << File.dirname(__FILE__)
-require 'request'
-
 CTX = ZMQ::Context.new(1)
 
-module Mongrel2
+module M2R
   # A Connection object manages the connection between your handler
   # and a Mongrel2 server (or servers).  It can receive raw requests
   # or JSON encoded requests whether from HTTP or MSG request types,
@@ -156,5 +147,5 @@ def http_response(body, code, headers)
       504 => 'Gateway Timeout',
       505 => 'HTTP Version Not Supported'
     }
-  end # class Connection
-end # mod Mongrel2
+  end
+end

lib/fiber_handler.rb renamed to lib/m2r/fiber_handler.rb

@@ -1,4 +1,6 @@
-module Mongrel2
+require 'm2r/handler'
+
+module M2R
   class FiberHandler < Handler
     def initialize(*args)
       raise "This handler is just around for testing. don't use it, it'll suck."

lib/handler.rb renamed to lib/m2r/handler.rb

@@ -1,9 +1,11 @@
-module Mongrel2
+require 'm2r/connection'
+
+module M2R
   class Handler
     attr_accessor :connection
     def initialize(sender_uuid, subscribe_address, publish_address)
-      @connection = Mongrel2::Connection.new(sender_uuid,
-                      subscribe_address, publish_address)
+      @connection = M2R::Connection.new(sender_uuid,
+                                        subscribe_address, publish_address)
     end
 
     # Callback for when the handler is waiting for a request

lib/request.rb renamed to lib/m2r/request.rb

@@ -1,4 +1,6 @@
-module Mongrel2
+require 'm2r'
+
+module M2R
   class Request
     attr_reader :sender, :conn_id, :path, :headers, :body
     def initialize(sender, conn_id, path, headers, body)
@@ -39,6 +41,6 @@ def disconnect?
     end
     alias :is_disconnect :disconnect?
 
-  end # class Request
-end # mod Mongrel2
+  end
+end
 

lib/m2r/version.rb

@@ -1,3 +1,3 @@
-module Mongrel2
+module M2R
   VERSION = '0.0.3'
 end

m2r.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.name             = "m2r"
   gem.date             = "2010-10-23"
   gem.require_path     = "lib"
-  gem.version          = Mongrel2::VERSION
+  gem.version          = M2R::VERSION
 
   gem.add_dependency "ffi-rzmq", "~> 0.9.3"
   gem.add_dependency "ffi",      ">= 1.0.0"