jruby-http-kit 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56c70ef0759f2822347d81dbe2b63df5943b4b49
-  data.tar.gz: ec17992ca5cce5de410c8e82becb9139892fcd23
+  metadata.gz: e0ee1cfec6c0b083e4e14f40c19c3f1e08de3deb
+  data.tar.gz: 54fd5b14b11c88f35ed72fef3accc1bca81acd3a
 SHA512:
-  metadata.gz: 0f003e0b6387208e134bb99f411c501f0313ffe471898b51ee9c69444416e8fbcbc67dfdfaac7dff6fe36e9f710771b6f47042560c91b1b4f359937c4f6b0448
-  data.tar.gz: 61c684208b24f10fcb11ff71b7779f6fc2d87d070b2bf1f0f9d9f4bcbbd9c8a3d13668c69f292f94253a64c977c03cc1a9d20c735df366582877b47175a00a83
+  metadata.gz: 11ce94806602644409650c87de9285893a8e8870596f7f2dfc0d08f73dfa2a70c4fcf8a3661f7af7d7d1e219ef38bd8275be4719417a2d773aa527605b3400ce
+  data.tar.gz: 86774b516625bf565cedc38f137f449331cbd1c3b937b58bfb9abf977630178ab88e0bccee115356f2310427dce2ba474dcf42cfacceaeb66f00ebd97c59edcb

data/.gitignore

@@ -1,3 +1,5 @@
+.ruby-version
+*.class
 *.sublime-project
 *.sublime-workspace
 *.gem

data/README.md

@@ -4,7 +4,7 @@ jruby-http-kit
 JRuby wrapper for Clojure HTTP Kit library. Just a  proof of a concept for now.
 
 ```
-jruby -s ring_example.rb
+jruby -s ring.rb
 
 curl -v 0.0.0.0:8089
 ```

data/lib/http_kit/version.rb

@@ -1,3 +1,3 @@
 module HttpKit
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/webmachine/adapters/ring.rb

@@ -1,12 +1,33 @@
+require 'webmachine/adapter'
+require 'webmachine/chunked_body'
+
 module Webmachine
   module Adapters
     class Ring < Webmachine::Adapter
 
+      java_import Java::JavaNio::ByteBuffer
+
+      java_import Java::ClojureLang::Keyword
+      java_import Java::ClojureLang::PersistentHashMap
+
+      java_import Java::OrgHttpkit::DynamicBytes
+      java_import Java::OrgHttpkit::HttpUtils
+      java_import Java::OrgHttpkitServer::RingHandler
+      java_import Java::OrgHttpkitServer::HttpServer
+
+
+      STATUS       = Keyword.intern("status")
+      HEADERS      = Keyword.intern("headers")
+      BODY         = Keyword.intern("body")
+      REQUEST_URI  = Keyword.intern("uri")
+      QUERY_STRING = Keyword.intern("query-string")
+      METHOD       = Keyword.intern("request-method")
+
       DEFAULT_OPTIONS = {
-        :port   => 9292,
-        :host   => "0.0.0.0",
-        :threads => 50,
-        :queue_size  => 1000,
+        :port          => 9292,
+        :host          => "0.0.0.0",
+        :threads       => 50,
+        :queue_size    => 1000,
         :worker_prefix => "wm-",
         :max_body_size => 8388608,
         :max_http_line => 4096
@@ -21,16 +42,16 @@ module Webmachine
 
         req_handler = Handler.new(dispatcher)
 
-        @ring_handler = Java::OrgHttpkitServer::RingHandler.new(options[:threads],
-                                                                req_handler,
-                                                                options[:worker_prefix],
-                                                                options[:queue_size])
+        @ring_handler = RingHandler.new(options[:threads],
+                                        req_handler,
+                                        options[:worker_prefix],
+                                        options[:queue_size])
 
-        @server = Java::OrgHttpkitServer::HttpServer.new(options[:host],
-                                                         options[:port].to_i,
-                                                         @ring_handler,
-                                                         options[:max_body_size],
-                                                         options[:max_http_line])
+        @server = HttpServer.new(options[:host],
+                                 options[:port].to_i,
+                                 @ring_handler,
+                                 options[:max_body_size],
+                                 options[:max_http_line])
 
         @server.start()
 
@@ -67,9 +88,7 @@ module Webmachine
 
           dispatcher.dispatch(request, response)
 
-          headers = Java::JavaUtil::HashMap.new(response.headers)
-
-          Ring::RingResponse.create(response.code, headers, response.body)
+          Ring::RingResponse.from_webmachine(response)
         end
       end
 
@@ -79,54 +98,101 @@ module Webmachine
         end
 
         def headers
-          Webmachine::Headers.from_cgi(@request.get(Java::ClojureLang::Keyword.intern("headers")))
+          ruby_headers = {}
+
+          ring_headers = @request.get(Ring::HEADERS)
+          ring_headers.iterator().each do |h|
+            ruby_headers[h[0]] = h[1]
+          end
+
+          Webmachine::Headers[ruby_headers]
         end
 
         def body
-          _body = @request.get( Java::ClojureLang::Keyword.intern("body") )
-          _body = _body.to_io if _body
+          _body = @request.get( Ring::BODY )
+          RingRequest::Body.new(_body.to_io) if _body
         end
 
         def url
-          uri          = @request.get(Java::ClojureLang::Keyword.intern("uri"))
-          query_string = @request.get(Java::ClojureLang::Keyword.intern("query-string"))
-
-          URI.parse("#{uri}?#{query_string}")
+          uri          = @request.get(Ring::REQUEST_URI)
+          query_string = @request.get(Ring::QUERY_STRING)
+          uri << "?#{query_string}" if query_string && query_string != ""
+          URI.parse(uri)
         end
 
         def method
-          @request.get(Java::ClojureLang::Keyword.intern("request-method")).to_s.delete(':').upcase
+          @request.get(Ring::METHOD).to_s.delete(':').upcase
+        end
+      end
+
+      class RingRequest::Body
+        def initialize(body)
+          @body = body
         end
 
-        # Map<Object, Object> m = new TreeMap<Object, Object>();
-#         m.put(SERVER_PORT, req.serverPort);
-#         m.put(SERVER_NAME, req.serverName);
-#         m.put(REMOTE_ADDR, req.getRemoteAddr());
-#         m.put(URI, req.uri);
-#         m.put(SCHEME, HTTP); // only http is supported
-#         m.put(ASYC_CHANNEL, req.channel);
-#         m.put(WEBSOCKET, req.isWebSocket);
-#         m.put(REQUEST_METHOD, req.method.KEY);
-
-#         // key is already lower cased, required by ring spec
-#         m.put(HEADERS, PersistentArrayMap.create(req.headers));
-#         m.put(CONTENT_TYPE, req.contentType);
-#         m.put(CONTENT_LENGTH, req.contentLength);
-#         m.put(CHARACTER_ENCODING, req.charset);
-#         m.put(BODY, req.getBody());
-#         return PersistentArrayMap.create(m);
+        def to_s
+          if @value
+            @value.join
+          else
+            @body.rewind
+            @body.read
+          end
+        end
 
+        def each
+          if @value
+            @value.each {|chunk| yield chunk }
+          else
+            @value = []
+            @body.each {|chunk| @value << chunk; yield chunk }
+          end
+        end
       end
 
       class RingResponse
-        def self.create(code, headers, body)
+        def self.from_webmachine(response)
+          headers = response.headers
+
+          # HTTP-Kit sets its own Content-Length
+          headers.delete("Content-Length")
+
+          headers.each do |k, v|
+            headers[k] = v.join(", ") if v.is_a? Array
+          end
+
+          response_body = if response.body.respond_to?(:call)
+                            Webmachine::ChunkedBody.new([response.body.call])
+                          elsif response.body.respond_to?(:each)
+                            # This might be an IOEncoder with a Content-Length, which shouldn't be chunked.
+                            if response.headers["Transfer-Encoding"] == "chunked"
+                              Webmachine::ChunkedBody.new(response.body)
+                            else
+                              response.body
+                            end
+                          elsif response.body.is_a? IO
+                            response.body.to_outputstream
+                          else
+                            response.body
+                          end
+
+          if response_body.respond_to?(:each)
+            ring_body = ""
+            response_body.each do |chunk|
+              ring_body << chunk.to_s
+            end
+          else
+            ring_body = response_body
+          end
+
+          headers = Java::JavaUtil::HashMap.new(headers)
+
           ring_response = [
-            Java::ClojureLang::Keyword.intern("status")  , code,
-            Java::ClojureLang::Keyword.intern("headers") , headers,
-            Java::ClojureLang::Keyword.intern("body")    , body
+            Ring::STATUS  , response.code,
+            Ring::HEADERS , headers,
+            Ring::BODY    , ring_body
           ]
 
-          return Java::clojure::lang::PersistentHashMap.create(ring_response.to_java)
+          return PersistentHashMap.create(ring_response.to_java)
         end
       end
 

data/src/org/httpkit/HttpUtils.java

@@ -431,9 +431,7 @@ public class HttpUtils {
             if (!CHUNKED.equals(headers.get("Transfer-Encoding"))) {
                 if (bodyBuffer != null) {
                     headers.put(CL, Integer.toString(bodyBuffer.remaining()));
-                } else {
-                    headers.put(CL, "0");
-                }
+                } 
             }
         } catch (IOException e) {
             byte[] b = e.getMessage().getBytes(ASCII);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby-http-kit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dmitriy Rozhkov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,113 +103,49 @@ files:
 - spec/webmachine/ring_adapter_spec.rb
 - src/.classpath
 - src/.project
-- src/org/httpkit/BytesInputStream.class
 - src/org/httpkit/BytesInputStream.java
-- src/org/httpkit/DateFormatter.class
-- src/org/httpkit/DynamicBytes.class
 - src/org/httpkit/DynamicBytes.java
-- src/org/httpkit/HTTPException.class
 - src/org/httpkit/HTTPException.java
-- src/org/httpkit/HeaderMap.class
 - src/org/httpkit/HeaderMap.java
-- src/org/httpkit/HttpMethod.class
 - src/org/httpkit/HttpMethod.java
-- src/org/httpkit/HttpStatus.class
 - src/org/httpkit/HttpStatus.java
-- src/org/httpkit/HttpUtils.class
 - src/org/httpkit/HttpUtils.java
-- src/org/httpkit/HttpVersion.class
 - src/org/httpkit/HttpVersion.java
-- src/org/httpkit/LineReader.class
 - src/org/httpkit/LineReader.java
-- src/org/httpkit/LineTooLargeException.class
 - src/org/httpkit/LineTooLargeException.java
-- src/org/httpkit/PrefixThreadFactory.class
 - src/org/httpkit/PrefixThreadFactory.java
-- src/org/httpkit/PriorityQueue.class
 - src/org/httpkit/PriorityQueue.java
-- src/org/httpkit/ProtocolException.class
 - src/org/httpkit/ProtocolException.java
-- src/org/httpkit/RequestTooLargeException.class
 - src/org/httpkit/RequestTooLargeException.java
-- src/org/httpkit/client/AbortException.class
 - src/org/httpkit/client/AbortException.java
-- src/org/httpkit/client/Decoder.class
 - src/org/httpkit/client/Decoder.java
-- src/org/httpkit/client/Handler.class
-- src/org/httpkit/client/HttpClient.class
 - src/org/httpkit/client/HttpClient.java
-- src/org/httpkit/client/HttpsRequest.class
 - src/org/httpkit/client/HttpsRequest.java
-- src/org/httpkit/client/IFilter$1.class
-- src/org/httpkit/client/IFilter$MaxBodyFilter.class
-- src/org/httpkit/client/IFilter.class
 - src/org/httpkit/client/IFilter.java
-- src/org/httpkit/client/IRespListener.class
 - src/org/httpkit/client/IRespListener.java
-- src/org/httpkit/client/IResponseHandler.class
 - src/org/httpkit/client/IResponseHandler.java
-- src/org/httpkit/client/PersistentConn.class
 - src/org/httpkit/client/PersistentConn.java
-- src/org/httpkit/client/Request.class
 - src/org/httpkit/client/Request.java
-- src/org/httpkit/client/RequestConfig.class
 - src/org/httpkit/client/RequestConfig.java
-- src/org/httpkit/client/RespListener.class
 - src/org/httpkit/client/RespListener.java
-- src/org/httpkit/client/SslContextFactory.class
 - src/org/httpkit/client/SslContextFactory.java
-- src/org/httpkit/client/State.class
-- src/org/httpkit/client/TimeoutException.class
 - src/org/httpkit/client/TimeoutException.java
-- src/org/httpkit/client/TrustManagerFactory$1.class
-- src/org/httpkit/client/TrustManagerFactory.class
-- src/org/httpkit/server/AsyncChannel.class
 - src/org/httpkit/server/AsyncChannel.java
-- src/org/httpkit/server/ClojureRing.class
-- src/org/httpkit/server/Frame$BinaryFrame.class
-- src/org/httpkit/server/Frame$CloseFrame.class
-- src/org/httpkit/server/Frame$PingFrame.class
-- src/org/httpkit/server/Frame$TextFrame.class
-- src/org/httpkit/server/Frame.class
 - src/org/httpkit/server/Frame.java
-- src/org/httpkit/server/HttpAtta.class
 - src/org/httpkit/server/HttpAtta.java
-- src/org/httpkit/server/HttpDecoder$State.class
-- src/org/httpkit/server/HttpDecoder.class
 - src/org/httpkit/server/HttpDecoder.java
-- src/org/httpkit/server/HttpHandler.class
-- src/org/httpkit/server/HttpRequest.class
 - src/org/httpkit/server/HttpRequest.java
-- src/org/httpkit/server/HttpServer.class
 - src/org/httpkit/server/HttpServer.java
-- src/org/httpkit/server/IHandler.class
 - src/org/httpkit/server/IHandler.java
-- src/org/httpkit/server/LinkingRunnable.class
-- src/org/httpkit/server/Rack.class
-- src/org/httpkit/server/RackApplication.class
 - src/org/httpkit/server/RackApplication.java
-- src/org/httpkit/server/RackHandler$1.class
-- src/org/httpkit/server/RackHandler.class
 - src/org/httpkit/server/RackHandler.java
-- src/org/httpkit/server/RackHttpHandler.class
 - src/org/httpkit/server/RackHttpHandler.java
-- src/org/httpkit/server/RespCallback.class
 - src/org/httpkit/server/RespCallback.java
-- src/org/httpkit/server/RingHandler$1.class
-- src/org/httpkit/server/RingHandler.class
 - src/org/httpkit/server/RingHandler.java
-- src/org/httpkit/server/ServerAtta.class
 - src/org/httpkit/server/ServerAtta.java
-- src/org/httpkit/server/WSDecoder$State.class
-- src/org/httpkit/server/WSDecoder.class
 - src/org/httpkit/server/WSDecoder.java
-- src/org/httpkit/server/WSHandler.class
-- src/org/httpkit/server/WsAtta.class
 - src/org/httpkit/server/WsAtta.java
-- src/org/httpkit/timer/CancelableFutureTask.class
 - src/org/httpkit/timer/CancelableFutureTask.java
-- src/org/httpkit/timer/TimerService.class
 - src/org/httpkit/timer/TimerService.java
 homepage: https://github.com/nLight/jruby-http-kit
 licenses: