mizuno 0.6.4 → 0.6.5

data/.gitignore

@@ -1,6 +1,8 @@
 *.sw?
 *.DS_Store
 *.gem
+.rbenv-version
+.rvm
 Gemfile.lock
 archive/
 doc/

data/lib/mizuno/rack/chunked.rb

@@ -8,6 +8,22 @@ module Rack
     class Chunked
         include Rack::Utils
 
+        class Body
+            include Rack::Utils
+
+            def initialize(body)
+                @body = body
+            end
+
+            def each(&block)
+                @body.each(&block)
+            end
+
+            def close
+                @body.close if @body.respond_to?(:close)
+            end
+        end
+
         def initialize(app)
             @app = app
         end

data/lib/mizuno/{rack_servlet.rb → rack_handler.rb}

@@ -2,18 +2,12 @@ require 'stringio'
 require 'rack/response'
 
 #
-# Wraps a Rack application in a Java servlet.
-#
-# Relevant documentation:
-#
-#     http://rack.rubyforge.org/doc/SPEC.html
-#     http://java.sun.com/j2ee/sdk_1.3/techdocs/api/javax
-#         /servlet/http/HttpServlet.html
+# Wraps a Rack application in a Jetty handler.
 #
 module Mizuno
-    java_import 'javax.servlet.http.HttpServlet'
+    java_import 'org.eclipse.jetty.server.handler.AbstractHandler'
 
-    class RackServlet < HttpServlet
+    class RackHandler < AbstractHandler
         java_import 'java.io.FileInputStream'
         java_import 'org.eclipse.jetty.continuation.ContinuationSupport'
         java_import 'org.jruby.rack.servlet.RewindableInputStream'
@@ -28,18 +22,22 @@ module Mizuno
 
         #
         # Sets the Rack application that handles requests sent to this
-        # servlet container.
+        # Jetty handler.
         #
         def rackup(app)
             @app = app
         end
 
+        java_signature %{@Override void handle(String target,
+            Request baseRequest, HttpServletRequest request,
+            HttpServletResponse response) throws IOException, ServletException}
+
         #
-        # Takes an incoming request (as a Java Servlet) and dispatches it to
-        # the rack application setup via [rackup].  All this really involves
-        # is translating the various bits of the Servlet API into the Rack
-        # API on the way in, and translating the response back on the way
-        # out.
+        # Takes an incoming request (as a HttpServletRequest) and dispatches
+        # it to the rack application setup via [rackup]. All this really
+        # involves is translating the various bits of the Servlet API into
+        # the Rack API on the way in, and translating the response back on
+        # the way out.
         #
         # Also, we implement a common extension to the Rack api for
         # asynchronous request processing.  We supply an 'async.callback' 
@@ -49,7 +47,7 @@ module Mizuno
         # When 'async.callback' gets a response with empty headers and an
         # empty body, we declare the async response finished.
         #
-        def service(request, response)
+        def handle(target, base_request, request, response)
             handle_exceptions(response) do
                 # Turn the ServletRequest into a Rack env hash
                 env = servlet_to_rack(request)
@@ -144,7 +142,7 @@ module Mizuno
 
             # Populate the HTTP headers.
             request.getHeaderNames.each do |header_name|
-                header = header_name.upcase.tr('-', '_')
+                header = header_name.to_s.upcase.tr('-', '_')
                 env["HTTP_#{header}"] = request.getHeader(header_name)
             end
 
@@ -229,7 +227,10 @@ module Mizuno
                 end
                 input_stream.close
             else
-                body.each { |l| output.write(l.to_java_bytes) }
+                body.each do |chunk|
+                    output.write(chunk.to_java_bytes)
+                    output.flush
+                end
             end
 
             # Close the body if we're supposed to.

data/lib/mizuno/reloader.rb

@@ -141,7 +141,7 @@ module Mizuno
                 return unless file
                 stat = File.stat(file)
                 stat.file? ? stat.mtime.to_i : nil
-            rescue Errno::ENOENT, Errno::ENOTDIR
+            rescue Errno::ENOENT, Errno::ENOTDIR, Errno::ESRCH
                 nil
             end
         end

data/lib/mizuno/server.rb

@@ -4,18 +4,16 @@
 require 'rack'
 require 'mizuno'
 Mizuno.require_jars(%w(jetty-continuation jetty-http jetty-io jetty-jmx
-    jetty-security jetty-server jetty-servlet jetty-servlets jetty-util
-    servlet-api rewindable-input-stream))
+    jetty-security jetty-server jetty-util servlet-api
+    rewindable-input-stream))
 require 'mizuno/version'
 require 'mizuno/rack/chunked'
-require 'mizuno/rack_servlet'
+require 'mizuno/rack_handler'
 require 'mizuno/logger'
 require 'mizuno/reloader'
 
 module Mizuno
     class Server
-        java_import 'org.eclipse.jetty.servlet.ServletContextHandler'
-        java_import 'org.eclipse.jetty.servlet.ServletHolder'
         java_import 'org.eclipse.jetty.server.nio.SelectChannelConnector'
         java_import 'org.eclipse.jetty.util.thread.QueuedThreadPool'
 
@@ -85,23 +83,17 @@ module Mizuno
             Runner.setgid(options) if options[:group]
             Runner.setuid(options) if options[:user]
 
-            # Servlet handler.
-            app_handler = ServletContextHandler.new(nil, "/", 
-                ServletContextHandler::NO_SESSIONS)
-
             # Optionally wrap with Mizuno::Reloader.
             threshold = (ENV['RACK_ENV'] == 'production' ? 10 : 1)
             app = Mizuno::Reloader.new(app, threshold) \
                 if options[:reloadable]
 
             # The servlet itself.
-            rack_servlet = RackServlet.new(self)
-            rack_servlet.rackup(app)
-            holder = ServletHolder.new(rack_servlet)
-            app_handler.addServlet(holder, "/")
+            rack_handler = RackHandler.new(self)
+            rack_handler.rackup(app)
 
             # Add the context to the server and start.
-            @server.set_handler(app_handler)
+            @server.set_handler(rack_handler)
             @server.start
             $stderr.printf("%s listening on %s:%s\n", version,
                 connector.host, connector.port) unless options[:quiet]

data/lib/mizuno/version.rb

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

metadata

@@ -1,102 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: mizuno
 version: !ruby/object:Gem::Version
+  version: 0.6.5
   prerelease:
-  version: 0.6.4
 platform: ruby
 authors:
 - Don Werve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000Z
+date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  version_requirements: &2056 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2056
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: ffi
-  version_requirements: &2074 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2074
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: choice
-  version_requirements: &2090 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
     none: false
-  requirement: *2090
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: childprocess
-  version_requirements: &2106 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.6
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.6
     none: false
-  requirement: *2106
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2122 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
     none: false
-  requirement: *2122
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  version_requirements: &2140 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
     none: false
-  requirement: *2140
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: json_pure
-  version_requirements: &2156 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
     none: false
-  requirement: *2156
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  version_requirements: &2172 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
-  requirement: *2172
   prerelease: false
   type: :development
 description: Jetty-powered running shoes for JRuby/Rack.
@@ -113,34 +155,63 @@ files:
 - Gemfile
 - mizuno.gemspec
 - bin/mizuno
-- lib/mizuno.rb
-- lib/mizuno/choices.rb
-- lib/mizuno/client.rb
-- lib/mizuno/client_exchange.rb
-- lib/mizuno/client_response.rb
-- lib/mizuno/logger.rb
-- lib/mizuno/rack_servlet.rb
-- lib/mizuno/reloader.rb
-- lib/mizuno/runner.rb
-- lib/mizuno/server.rb
-- lib/mizuno/version.rb
-- lib/mizuno/rack/chunked.rb
-- lib/rack/handler/mizuno.rb
-- lib/java/jetty-client-8.1.3.v20120416.jar
-- lib/java/jetty-continuation-8.1.3.v20120416.jar
-- lib/java/jetty-http-8.1.3.v20120416.jar
-- lib/java/jetty-io-8.1.3.v20120416.jar
-- lib/java/jetty-jmx-8.1.3.v20120416.jar
-- lib/java/jetty-security-8.1.3.v20120416.jar
-- lib/java/jetty-server-8.1.3.v20120416.jar
-- lib/java/jetty-servlet-8.1.3.v20120416.jar
-- lib/java/jetty-servlets-8.1.3.v20120416.jar
-- lib/java/jetty-util-8.1.3.v20120416.jar
-- lib/java/log4j-1.2.16.jar
-- lib/java/rewindable-input-stream.jar
-- lib/java/servlet-api-3.0.jar
-- lib/java/slf4j-api-1.6.4.jar
-- lib/java/slf4j-log4j12-1.6.4.jar
+- !binary |-
+  bGliL21penVuby5yYg==
+- !binary |-
+  bGliL21penVuby9jaG9pY2VzLnJi
+- !binary |-
+  bGliL21penVuby9jbGllbnQucmI=
+- !binary |-
+  bGliL21penVuby9jbGllbnRfZXhjaGFuZ2UucmI=
+- !binary |-
+  bGliL21penVuby9jbGllbnRfcmVzcG9uc2UucmI=
+- !binary |-
+  bGliL21penVuby9sb2dnZXIucmI=
+- !binary |-
+  bGliL21penVuby9yYWNrX2hhbmRsZXIucmI=
+- !binary |-
+  bGliL21penVuby9yZWxvYWRlci5yYg==
+- !binary |-
+  bGliL21penVuby9ydW5uZXIucmI=
+- !binary |-
+  bGliL21penVuby9zZXJ2ZXIucmI=
+- !binary |-
+  bGliL21penVuby92ZXJzaW9uLnJi
+- !binary |-
+  bGliL21penVuby9yYWNrL2NodW5rZWQucmI=
+- !binary |-
+  bGliL3JhY2svaGFuZGxlci9taXp1bm8ucmI=
+- !binary |-
+  bGliL2phdmEvamV0dHktY2xpZW50LTguMS4zLnYyMDEyMDQxNi5qYXI=
+- !binary |-
+  bGliL2phdmEvamV0dHktY29udGludWF0aW9uLTguMS4zLnYyMDEyMDQxNi5q
+  YXI=
+- !binary |-
+  bGliL2phdmEvamV0dHktaHR0cC04LjEuMy52MjAxMjA0MTYuamFy
+- !binary |-
+  bGliL2phdmEvamV0dHktaW8tOC4xLjMudjIwMTIwNDE2Lmphcg==
+- !binary |-
+  bGliL2phdmEvamV0dHktam14LTguMS4zLnYyMDEyMDQxNi5qYXI=
+- !binary |-
+  bGliL2phdmEvamV0dHktc2VjdXJpdHktOC4xLjMudjIwMTIwNDE2Lmphcg==
+- !binary |-
+  bGliL2phdmEvamV0dHktc2VydmVyLTguMS4zLnYyMDEyMDQxNi5qYXI=
+- !binary |-
+  bGliL2phdmEvamV0dHktc2VydmxldC04LjEuMy52MjAxMjA0MTYuamFy
+- !binary |-
+  bGliL2phdmEvamV0dHktc2VydmxldHMtOC4xLjMudjIwMTIwNDE2Lmphcg==
+- !binary |-
+  bGliL2phdmEvamV0dHktdXRpbC04LjEuMy52MjAxMjA0MTYuamFy
+- !binary |-
+  bGliL2phdmEvbG9nNGotMS4yLjE2Lmphcg==
+- !binary |-
+  bGliL2phdmEvcmV3aW5kYWJsZS1pbnB1dC1zdHJlYW0uamFy
+- !binary |-
+  bGliL2phdmEvc2VydmxldC1hcGktMy4wLmphcg==
+- !binary |-
+  bGliL2phdmEvc2xmNGotYXBpLTEuNi40Lmphcg==
+- !binary |-
+  bGliL2phdmEvc2xmNGotbG9nNGoxMi0xLjYuNC5qYXI=
 homepage: http://github.com/matadon/mizuno
 licenses: []
 post_install_message:
@@ -151,7 +222,8 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -161,9 +233,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: Rack handler for Jetty 8 on JRuby. Features multithreading, event-driven I/O, and async support.
 test_files: []
-...