kirk 0.1.7-java → 0.1.8-java

data/lib/kirk/client.rb

@@ -1,5 +1,25 @@
 module Kirk
   class Client
-    # stuff
+    import org.eclipse.jetty.client.HttpClient
+    import org.eclipse.jetty.client.HttpExchange
+    import java.net.InetSocketAddress
+    import java.util.concurrent.LinkedBlockingQueue
+    import org.eclipse.jetty.client.ContentExchange
+    import java.util.concurrent.AbstractExecutorService
+    import java.util.concurrent.TimeUnit
+    import java.util.concurrent.ThreadPoolExecutor
+    import java.util.concurrent.ExecutorCompletionService
+
+    def self.session
+      Session.new(&Proc.new)
+    end
+
+    private
   end
 end
+
+require 'kirk/client/session'
+require 'kirk/client/response'
+require 'kirk/client/request'
+require 'kirk/client/connection'
+require 'kirk/client/exchange'

data/lib/kirk/client/connection.rb

@@ -0,0 +1,18 @@
+class Kirk::Client
+  class Connection
+    attr_reader :request
+
+    def initialize
+      @request = nil
+      @writing = false
+      @client = HttpClient.new
+      @client.set_connector_type(HttpClient::CONNECTOR_SELECT_CHANNEL);
+      @client.start
+    end
+
+    def process(request)
+      exchange = Exchange.from_request(request)
+      @client.send(exchange)
+    end
+  end
+end

data/lib/kirk/client/exchange.rb

@@ -0,0 +1,33 @@
+class Kirk::Client
+  class Exchange < ContentExchange
+    include java.util.concurrent.Callable
+
+    def initialize(session, handler)
+      @handler = handler
+      @session = session
+      super()
+    end
+
+    def onException(ex)
+      puts ex.inspect
+    end
+
+    def onResponseComplete
+      @session.queue.offer(response)
+      @handler.on_response_complete(response) if @handler
+    end
+
+    def response
+      @response = begin
+                    Response.new(get_response_content, get_response_status)
+                  end
+    end
+
+    def self.from_request(request)
+      exchange = new(request.session, request.handler)
+      exchange.set_method(request.method)
+      exchange.set_url(request.url)
+      exchange
+    end
+  end
+end

data/lib/kirk/client/request.rb

@@ -0,0 +1,12 @@
+class Kirk::Client
+  class Request
+    attr_reader :method, :url, :handler, :session
+
+    def initialize(session, method, url, handler, headers)
+      @session = session
+      @method  = method.to_s.upcase
+      @url     = url
+      @handler = handler
+    end
+  end
+end

data/lib/kirk/client/response.rb

@@ -0,0 +1,10 @@
+class Kirk::Client
+  class Response
+    attr_reader :status, :content
+
+    def initialize(content, status)
+      @content = content
+      @status  = status
+    end
+  end
+end

data/lib/kirk/client/session.rb

@@ -0,0 +1,40 @@
+class Kirk::Client
+  class Session
+
+    attr_reader :responses, :queue
+
+    def initialize
+      @queue = LinkedBlockingQueue.new
+      @executor = ThreadPoolExecutor.new(thread_count, thread_count, 0, TimeUnit::SECONDS, @queue)
+      @connection = Connection.new
+      @requests_count = 0
+      @responses = []
+      yield(self)
+
+      get_responses
+    end
+
+    def request(method, url, handler = nil, headers = nil)
+      request = Request.new(self, method, url, handler, headers)
+      yield request if block_given?
+      queue_request(request)
+      request
+    end
+
+    def thread_count
+      3
+    end
+
+    def queue_request(request)
+      @connection.process(request)
+      @requests_count += 1
+    end
+
+    def get_responses
+      while @requests_count > 0
+        @responses << @queue.take
+        @requests_count -= 1
+      end
+    end
+  end
+end

data/lib/kirk/input_stream.rb

@@ -135,7 +135,7 @@ module Kirk
 
         # Set the new buffer limit to the amount that is going
         # to be read
-        @buffer.position(@read).limit(@read + missing)
+        @buffer.limit(@read + missing).position(@read)
 
         # Read into the buffer
         len = @io.read(@buffer)

data/lib/kirk/version.rb

@@ -1,4 +1,4 @@
 module Kirk
   NAME    = "kirk".freeze
-  VERSION = "0.1.7".freeze
+  VERSION = "0.1.8".freeze
 end

metadata

@@ -2,7 +2,7 @@
 name: kirk
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.1.8
 platform: java
 authors: 
   - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-02-17 00:00:00 -08:00
 default_executable: kirk
 dependencies: []
 
@@ -43,6 +43,11 @@ files:
   - lib/kirk/applications/hot_deployable.rb
   - lib/kirk/applications/rack.rb
   - lib/kirk/applications/redeploy_client.rb
+  - lib/kirk/client/connection.rb
+  - lib/kirk/client/exchange.rb
+  - lib/kirk/client/request.rb
+  - lib/kirk/client/response.rb
+  - lib/kirk/client/session.rb
   - lib/rack/handler/kirk.rb
   - lib/kirk/native.jar
   - lib/kirk/jetty/jetty-client-7.2.2.v20101205.jar
@@ -75,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: kirk
-rubygems_version: 1.5.0
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: A JRuby Rack Server Based on Jetty