mizuno 0.6.5 → 0.6.6

data/lib/mizuno/choices.rb

@@ -75,6 +75,12 @@ Choice.options do
         default nil
     end
 
+    option :rewindable do
+        long '--rewindable'
+        desc 'rewindable input behavior per 1.x spec'
+        default false
+    end
+
     separator ''
     separator 'Mizuno-specific options: '
 

data/lib/mizuno/rack_handler.rb

@@ -10,7 +10,6 @@ module Mizuno
     class RackHandler < AbstractHandler
         java_import 'java.io.FileInputStream'
         java_import 'org.eclipse.jetty.continuation.ContinuationSupport'
-        java_import 'org.jruby.rack.servlet.RewindableInputStream'
 
         # Regex for splitting on newlines.
         NEWLINE = /\n/
@@ -133,8 +132,7 @@ module Mizuno
             env['rack.run_once'] = false
 
             # The input stream is a wrapper around the Java InputStream.
-            env['rack.input'] = RewindableInputStream.new( \
-                request.getInputStream).to_io.binmode
+            env['rack.input'] = @server.rewindable(request)
 
             # Force encoding if we're on Ruby 1.9
             env['rack.input'].set_encoding(Encoding.find("ASCII-8BIT")) \

data/lib/mizuno/runner.rb

@@ -226,15 +226,16 @@ module Mizuno
         # error, false otherwise.
         #
         def Runner.wait_for_server(options, timeout = 120)
+            force_time_out_at = Time.now + timeout
+            sleep_interval_for_next_retry = 0.1
+
             begin
-                Net::HTTP.start(options[:host], options[:port]) do |http|
-                    http.read_timeout = timeout
-                    response = http.get("/")
-                    return(response.code.to_i < 500)
-                end
+                response = connect_to_server_as_client(options, timeout)
+                return(response.code.to_i < 500)
             rescue Errno::ECONNREFUSED => error
-                return(false) unless ((timeout -= 0.5) > 0)
-                sleep(0.5)
+                return(false) if (Time.now > force_time_out_at)
+                sleep(sleep_interval_for_next_retry)
+                sleep_interval_for_next_retry *= 2
                 retry
             rescue => error
                 puts "HTTP Error '#{error}'"
@@ -248,15 +249,14 @@ module Mizuno
         # responding, returns false.
         #
         def Runner.wait_for_server_to_die(options, timeout = 120)
+            force_time_out_at = Time.now + timeout
+            sleep_interval_for_next_retry = 0.1
+
             begin
-                while(timeout > 0)
-                    Net::HTTP.start(options[:host], options[:port]) do |http|
-                        http.read_timeout = timeout
-                        response = http.get("/")
-                        puts "**** (die) response: #{response}"
-                    end
-                    timeout -= 0.5
-                    sleep(0.5)
+                while (Time.now < force_time_out_at)
+                    connect_to_server_as_client(options, timeout)
+                    sleep(sleep_interval_for_next_retry)
+                    sleep_interval_for_next_retry *= 2
                 end
                 return(false)
             rescue Errno::ECONNREFUSED => error
@@ -267,6 +267,15 @@ module Mizuno
             end
         end
 
+        def Runner.connect_to_server_as_client(server_options, timeout)
+            options = server_options.dup
+            options[:host] = '127.0.0.1' if options[:host] == "0.0.0.0"
+            Net::HTTP.start(options[:host], options[:port]) do |http|
+                http.read_timeout = timeout
+                http.get("/")
+            end
+        end
+
         #
         # Exit with a message and a status value.
         #

data/lib/mizuno/server.rb

@@ -2,6 +2,7 @@
 # deprecation notice and remove it in later versions.
 
 require 'rack'
+require 'rack/rewindable_input'
 require 'mizuno'
 Mizuno.require_jars(%w(jetty-continuation jetty-http jetty-io jetty-jmx
     jetty-security jetty-server jetty-util servlet-api
@@ -16,6 +17,7 @@ module Mizuno
     class Server
         java_import 'org.eclipse.jetty.server.nio.SelectChannelConnector'
         java_import 'org.eclipse.jetty.util.thread.QueuedThreadPool'
+        java_import 'org.jruby.rack.servlet.RewindableInputStream'
 
         attr_accessor :logger
 
@@ -98,7 +100,7 @@ module Mizuno
             $stderr.printf("%s listening on %s:%s\n", version,
                 connector.host, connector.port) unless options[:quiet]
 
-            # If we're embeded, we're done.
+            # If we're embedded, we're done.
             return if options[:embedded]
 
             # Stop the server when we get The Signal.
@@ -126,5 +128,17 @@ module Mizuno
         def version
             "Mizuno #{Mizuno::VERSION} (Jetty #{Java.org.eclipse.jetty.server.Server.getVersion})"
         end
+
+        #
+        # Wraps the Java InputStream for the level of Rack compliance
+        # desired.
+        #
+        def rewindable(request)
+            input = request.getInputStream
+
+            @options[:rewindable] ?
+                Rack::RewindableInput.new(input.to_io.binmode) :
+                RewindableInputStream.new(input).to_io.binmode
+        end
     end
 end

data/lib/mizuno/version.rb

@@ -1,3 +1,3 @@
 module Mizuno
-    VERSION = "0.6.5"
+    VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mizuno
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack