m2r 2.1.0.pre → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f0f628d8db7c7de4625f0f42445f377c3ec9f5c
-  data.tar.gz: c356a75ae6cbdc2e7c4eff39e977abd887619cc4
+  metadata.gz: eefcb7c87224158436d3743aae97bc30c44de654
+  data.tar.gz: c2154d75d5200e76f54825270480c3f186954274
 SHA512:
-  metadata.gz: b4afde4794564c45b804289ead01320838d968d4e74a71abf002fdbcbac3c01e6786b01508eb0f63cd7da38004b317078ec396e4fdfc444143cd4c87a0c79a0f
-  data.tar.gz: 1d6dc2ce3668765acc617f5b8e61327db02b41c0aee29883832953b3a219ef89359a31f8a456baecddba81ec5b03f6d04747f7bb42d8d2f92c0af9e493ede2d7
+  metadata.gz: cb3720deb344d3875e7ce7479018f560137fc2f57817249bf55344ef4097905f7d84eb9628be1f0b688d19971b8ef9ae2d6d437062c2b09e8e1bc8071ea916c4
+  data.tar.gz: a9034ebc3fe6f1e3b73b12ed8bd8ef2c4bafcae0b935bbe4b2a98fafa8f71faa773f597af0cb032d61ca4025f974e3ed374580fe068d233e4517a6031a30e6e3

data/.travis.yml

@@ -1,21 +1,14 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 1.9.2
   - 2.0.0
-  - ruby-head
+  - 2.1.0-preview1
   - jruby-19mode
-  - jruby-head
   - rbx-19mode
 
 env:
   - PATH=/opt/mongrel2-1.8.1/bin:$PATH
 
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-
 notifications:
   irc: "irc.freenode.org#mongrel2-ruby"
 

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.1.0
+
+* Retry response delivery when interrupt signal received. Mark connection errors coming from signals.
+* Introduce handler event for interrupt signal.
+* Graceful stop for Rack handler.
+* Extract request parser from request.
+* Introduce MultithreadedHandler to dispatch requests in multiple threads.
+* Update ffi-rzmq dependency.
+* Remove circular require invocations.
+
 ## 2.0.2
 
 * Fixed #55 : Rack response body is closed.

data/lib/m2r/connection.rb

@@ -1,5 +1,3 @@
-require 'm2r'
-
 module M2R
   # Connection for exchanging data with mongrel2
   class Connection

data/lib/m2r/connection_factory.rb

@@ -1,4 +1,3 @@
-require 'm2r'
 require 'ostruct'
 
 module M2R

data/lib/m2r/handler.rb

@@ -1,5 +1,3 @@
-require 'm2r'
-
 module M2R
 
   # Basic handler, scaffold for your own Handler.

data/lib/m2r/request.rb

@@ -1,5 +1,4 @@
 require 'set'
-require 'm2r'
 require 'm2r/http/close'
 require 'm2r/request/base'
 require 'm2r/request/upload'

data/lib/m2r/response.rb

@@ -1,4 +1,3 @@
-require 'm2r'
 require 'm2r/http/close'
 require 'm2r/response/content_length'
 require 'm2r/response/to_request'

data/lib/m2r/response/content_length.rb

@@ -1,5 +1,3 @@
-require 'm2r/response'
-
 module M2R
   class Response
     # Adds Content-Length header based on body size

data/lib/m2r/response/to_request.rb

@@ -1,5 +1,3 @@
-require 'm2r/response'
-
 module M2R
   class Response
 

data/lib/m2r/version.rb

@@ -1,5 +1,5 @@
 module M2R
   # m2r gem version
   # @api public
-  VERSION = '2.1.0.pre'
+  VERSION = '2.1.0'
 end

data/test/support/mongrel_helper.rb

@@ -7,7 +7,19 @@ module MongrelHelper
     check_mongrel
     `cd example && m2sh load -config mongrel2.conf --db config.sqlite`
     self.pid = Process.spawn("bundle exec foreman start --procfile=example/Procfile", pgroup: 0, out: "/dev/null", err: "/dev/null")
-    wait_for_pid('example/tmp/mongrel2.pid')
+    wait_until_mongrel_responsive
+  end
+
+  def wait_until_mongrel_responsive
+    client = Net::HTTP.new('localhost', 6767)
+    timeout(5) do
+      begin
+        client.start
+      rescue Errno::ECONNREFUSED
+        sleep(0.1)
+        retry
+      end
+    end
   end
 
   def teardown
@@ -19,22 +31,4 @@ module MongrelHelper
     skip("You must install mongrel2 to run this test") if `which mongrel2`.empty?
   end
 
-  def read_pid_from_file(pidfile)
-    pid = nil
-    Timeout.timeout(5) do
-      loop do
-        begin
-          pid = File.read(pidfile)
-          break unless pid.empty?
-        rescue Errno::ENOENT
-          sleep(0.25)
-          next
-        end
-      end
-      pid.to_i
-    end
-  rescue Timeout::Error
-    raise "Unable to read PID from file #{pidfile}."
-  end
-  alias :wait_for_pid :read_pid_from_file
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m2r
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre
+  version: 2.1.0
 platform: ruby
 authors:
 - Colin Curtin
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
@@ -311,9 +311,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.5