aeden-jruby-http-reactor 0.3.1 → 0.5.0

data/Rakefile

@@ -29,6 +29,7 @@ begin
     gemspec.description = ""
     gemspec.authors = ["Anthony Eden"]
     gemspec.files.exclude 'docs/**/*'
+    gemspec.files.exclude '.gitignore'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.5.0

data/jruby-http-reactor.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-http-reactor}
-  s.version = "0.3.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Eden"]
-  s.date = %q{2009-09-15}
+  s.date = %q{2009-09-16}
   s.description = %q{}
   s.email = %q{anthonyeden@gmail.com}
   s.extra_rdoc_files = [
@@ -14,8 +14,7 @@ Gem::Specification.new do |s|
      "README.textile"
   ]
   s.files = [
-    ".gitignore",
-     "README.rdoc",
+    "README.rdoc",
      "README.textile",
      "Rakefile",
      "VERSION",

data/lib/http_reactor/client.rb

@@ -9,6 +9,8 @@ module HttpReactor #:nodoc:
     
     HTTP_TARGET_PATH = 'http_target_path'
     HTTP_TARGET_REQUEST = 'http_target_request'
+    IO_REACTOR = "io_reactor"
+    REDIRECT_HISTORY = "redirect_history"
     
     def initialize(request_count, handler_proc)
       @request_count = request_count
@@ -19,6 +21,8 @@ module HttpReactor #:nodoc:
       context.set_attribute(ExecutionContext.HTTP_TARGET_HOST, attachment[:host])
       context.set_attribute(HTTP_TARGET_PATH, attachment[:path])
       context.set_attribute(HTTP_TARGET_REQUEST, attachment[:request])
+      context.set_attribute(IO_REACTOR, attachment[:io_reactor])
+      context.set_attribute(REDIRECT_HISTORY, attachment[:redirect_history] || [])
     end
     
     def finalize_context(context)
@@ -49,12 +53,29 @@ module HttpReactor #:nodoc:
      
     def handle_response(response, context)
       begin
-        @handler_proc.call(HttpReactor::Response.new(response), context)
-      
-        context.setAttribute(RESPONSE_RECEIVED, true)
-
-        # Signal completion of the request execution
-        @request_count.count_down()
+        res = HttpReactor::Response.new(response)
+        case res.code
+        when 301, 302
+          redirect_to = res.headers['Location']
+          redirect_history = context.getAttribute(REDIRECT_HISTORY)
+          if redirect_history.include?(redirect_to)
+            puts "Too many redirects"
+            context.setAttribute(RESPONSE_RECEIVED, true)
+            @request_count.count_down()
+          else
+            puts "Redirecting to #{redirect_to}"
+            redirect_history << redirect_to
+            context.setAttribute(REDIRECT_HISTORY, redirect_history)
+            requests = [HttpReactor::Request.new(URI.parse(redirect_to))]
+            io_reactor = context.getAttribute(IO_REACTOR)
+            HttpReactor::Client.process_requests(requests, io_reactor, @request_count)
+          end
+        else
+          @handler_proc.call(res, context)
+          context.setAttribute(RESPONSE_RECEIVED, true)
+          # Signal completion of the request execution
+          @request_count.count_down()
+        end
       rescue => e
         puts "Error handling response: #{e.message}"
       end
@@ -135,7 +156,6 @@ module HttpReactor #:nodoc:
     def initialize(requests=[], handler_proc=nil, options={}, &block)
       handler_proc = block if block_given?
       handler_proc ||= default_handler_proc
-      session_request_callback = SessionRequestCallback
       
       initialize_options(options)
       
@@ -152,11 +172,11 @@ module HttpReactor #:nodoc:
       
       # We are going to use this object to synchronize between the 
       # I/O event and main threads
-      request_count = java.util.concurrent.CountDownLatch.new(requests.length);
+      request_counter = java.util.concurrent.CountDownLatch.new(requests.length);
 
       handler = BufferingHttpClientHandler.new(
         httpproc,
-        RequestExecutionHandler.new(request_count, handler_proc),
+        RequestExecutionHandler.new(request_counter, handler_proc),
         org.apache.http.impl.DefaultConnectionReuseStrategy.new,
         params
       )
@@ -178,30 +198,39 @@ module HttpReactor #:nodoc:
         puts "Shutdown"
       end
       
+      process_requests(requests, io_reactor, request_counter)
+      
+      # Block until all connections signal
+      # completion of the request execution
+      request_counter.await()
+
+      puts "Shutting down I/O reactor"
+
+      io_reactor.shutdown()
+
+      puts "Done"
+    end
+    
+    def process_requests(requests, io_reactor, request_counter)
+      HttpReactor::Client.process_requests(requests, io_reactor, request_counter)
+    end
+    
+    def self.process_requests(requests, io_reactor, request_counter)
       requests.each do |request|
         uri = request.uri
         attachment = {
           :host => HttpHost.new(uri.host), 
           :path => uri.request_uri,
-          :request => request
+          :request => request,
+          :io_reactor => io_reactor
         }
         io_reactor.connect(
           java.net.InetSocketAddress.new(uri.host, uri.port), 
           nil, 
           attachment,
-          session_request_callback.new(request_count)
+          SessionRequestCallback.new(request_counter)
         )
       end
-      
-      # Block until all connections signal
-      # completion of the request execution
-      request_count.await()
-
-      puts "Shutting down I/O reactor"
-
-      io_reactor.shutdown()
-
-      puts "Done"
     end
     
     private

data/lib/http_reactor/response.rb

@@ -23,23 +23,39 @@ module HttpReactor #:nodoc:
     
     # Get the response content type
     def content_type
-      @response_impl.entity.content_type.value
+      @content_type ||= @response_impl.entity.content_type.value
     end
     
     # Get the response content length
     def content_length
-      @response_impl.entity.content_length
+      @content_length ||= @response_impl.entity.content_length
+    end
+    
+    def headers
+      @headers ||= begin
+        h = Hash.new
+        @response_impl.all_headers.each do |header|
+          if h[header.name]
+            h[header.name] = [h[header.name], header.value]
+          else
+            h[header.name] = header.value
+          end
+        end
+        h
+      end
     end
     
     # Get the body text
     def body
-      begin
-        io = Java.java_to_ruby(
-          org.jruby.RubyIO.new(JRuby.runtime, entity.content).java_object
-        )
-        io.read
-      rescue Exception => e
-        puts "Error in Response#body: #{e.message}"
+      @body ||= begin
+        begin
+          io = Java.java_to_ruby(
+            org.jruby.RubyIO.new(JRuby.runtime, entity.content).java_object
+          )
+          io.read
+        rescue Exception => e
+          puts "Error in Response#body: #{e.message}"
+        end
       end
     end
   end

data/test/client_test.rb

@@ -5,7 +5,7 @@ require 'mime/types'
 class ClientTest < Test::Unit::TestCase
   def requests
     @requests ||= [
-      'http://www.yahoo.com/', 
+      'http://yahoo.com/', 
       'http://www.google.com/', 
       'http://www.apache.org/',
       'http://anthony.mp/about_me',
@@ -38,14 +38,11 @@ class ClientTest < Test::Unit::TestCase
       puts "request ur: #{context.getAttribute('http_target_request').uri}"
       puts "content-length: #{response.content_length}"
       assert response.body.length > 0
-    end
-  end
-  
-  def test_body
-    HttpReactor::Client.new(requests) do |response, context|
-      if response.code == 200
-        puts response.body
-      end
+      puts "=== HEADERS ==="
+      puts response.headers.inspect
+      # puts "===== BODY ===="
+      # puts response.body
+      # puts "==============="
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aeden-jruby-http-reactor
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Anthony Eden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,7 +23,6 @@ extra_rdoc_files:
 - README.rdoc
 - README.textile
 files: 
-- .gitignore
 - README.rdoc
 - README.textile
 - Rakefile

data/.gitignore

@@ -1,2 +0,0 @@
-rdoc
-pkg