rufus-jig 0.1.14 → 0.1.15

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = rufus-jig CHANGELOG.txt
 
 
+== rufus-jig - 0.1.15    not yet released
+
+- unified :timeout => sec option and Rufus::Jig::TimeoutError
+- fixed small issue with em-http-request and '/' path
+- Ruote::Couch.new now passes options when doing Rufus::Jig::Http
+
+
 == rufus-jig - 0.1.14    released 2010/02/25
 
 - temporary fallback to net/http for Couch#attach and patron

data/Rakefile

@@ -45,6 +45,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'jeweler'
   gem.add_development_dependency 'patron'
+  gem.add_development_dependency 'em-http-request'
 
   # gemspec spec : http://www.rubygems.org/read/chapter/20
 end

data/TODO.txt

@@ -11,18 +11,17 @@
 [x] couch : attachments
 [o] put_doc(h) where _id is set ?
 [o] :update_rev => true...
+[o] long polling/continuous change (patron ?)
+[x] don't abuse exceptions ! (especially with couch)
+[o] couch.attach
+[o] couch.detach ?
 
-[ ] long polling/continuous change (patron ?)
 [ ] HEAD
-
 [ ] redirections ? (Patron seem to understand them)
-
-[ ] don't abuse exceptions ! (especially with couch)
-
 [ ] patron : http can steal each other's patron session (inside the same thread)
-
 [ ] why not a :force_json ?
 
-[ ] couch.attach
-[ ] couch.detach ?
+[ ] make HttpCore detect do_request
+
+[ ] timeout per request ?
 

data/lib/rufus/jig/adapters/em.rb

@@ -0,0 +1,128 @@
+#--
+# Copyright (c) 2009-2010, Kenneth Kalmer and John Mettraux.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in South Africa and Japan.
+#++
+
+
+class Rufus::Jig::HttpResponse
+
+  def initialize( em_client )
+
+    @original = [ em_client, em_client.response ]
+
+    @status = em_client.response_header.status
+    @headers = response_headers( em_client.response_header )
+    @body = em_client.response
+  end
+
+  protected
+
+  def response_headers( hash )
+
+    hash.inject({}) do |headers, ( key, value )|
+      key = key.downcase.split('_').map { |c| c.capitalize }.join( '-' )
+      headers[ key ] = value
+      headers
+    end
+  end
+end
+
+class Rufus::Jig::Http < Rufus::Jig::HttpCore
+
+  def initialize ( host, port, opts={} )
+
+    super( host, port, opts )
+
+    @options[:user_agent] ||= "#{self.class} #{Rufus::Jig::VERSION} (em)"
+  end
+
+  def variant
+    :em
+  end
+
+  protected
+
+  def do_request ( method, path, data, opts )
+
+    args = {}
+
+    args[:head] = request_headers( opts )
+    args[:body] = data if data
+
+    if to = (opts[:timeout] || @options[:timeout])
+      to = to.to_f
+      args[:timeout] = (to < 1.0) ? (3 * 24 * 3600).to_f : to
+    else
+      args[:timeout] = 5.0 # like Patron
+    end
+
+    em_response( em_request( path ).send( method, args ) )
+  end
+
+  def em_request( uri = '/' )
+    uri = URI.parse( uri )
+    uri = URI::HTTP.build(
+      :host => ( uri.host || @host ),
+      :port => ( uri.port || @port ),
+      :path => uri.path,
+      :query => uri.query
+    )
+
+    EventMachine::HttpRequest.new( uri.to_s )
+  end
+
+  def em_response( em_client )
+    th = Thread.current
+
+    timedout = false
+
+    em_client.errback {
+
+      #th.raise( Rufus::Jig::TimeoutError.new )
+        # works with ruby < 1.9.x
+      th.wakeup
+    }
+
+    em_client.callback {
+      th.wakeup
+    }
+
+    Thread.stop
+
+    # after the wake up...
+
+    raise Rufus::Jig::TimeoutError if em_client.response_header.status == 0
+
+    Rufus::Jig::HttpResponse.new( em_client )
+  end
+
+  def request_headers( options )
+    headers = { 'user-agent' => @options[:user_agent] }
+
+    %w[ Accept If-None-Match Content-Type ].each do |k|
+      headers[k] = options[k] if options.has_key?( k )
+    end
+
+    headers
+  end
+end
+

data/lib/rufus/jig/adapters/net.rb

@@ -0,0 +1,98 @@
+#--
+# Copyright (c) 2009-2010, John Mettraux, jmettraux@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in Japan.
+#++
+
+require 'thread'
+require 'net/http'
+
+
+class Rufus::Jig::HttpResponse
+
+  def initialize (nh_res)
+
+    @original = nh_res
+    @status = nh_res.code.to_i
+    @body = nh_res.body
+    @headers = {}
+    nh_res.each { |k, v|
+      @headers[k.split('-').collect { |s| s.capitalize }.join('-')] = v
+    }
+  end
+end
+
+class Rufus::Jig::Http < Rufus::Jig::HttpCore
+
+  def initialize (host, port, opts={})
+
+    super(host, port, opts)
+
+    @options[:user_agent] ||= "#{self.class} #{Rufus::Jig::VERSION} (net/http)"
+
+    #@mutex = Mutex.new
+  end
+
+  def variant
+    :net
+  end
+
+  protected
+
+  def get_http (opts)
+
+    http = Net::HTTP.new(@host, @port)
+
+    http.open_timeout = 5
+      # connection timeout
+
+    if to = (opts[:timeout] || @options[:timeout])
+      to = to.to_i
+      http.read_timeout = (to < 1) ? nil : to
+    else
+      http.read_timeout = 5 # like Patron
+    end
+
+    http
+  end
+
+  def do_request (method, path, data, opts)
+
+    #@mutex.synchronize do
+
+    path = '/' if path == ''
+
+    req = eval("Net::HTTP::#{method.to_s.capitalize}").new(path)
+
+    req['User-Agent'] = @options[:user_agent]
+    opts.each { |k, v| req[k] = v if k.is_a?(String) }
+
+    req.body = data ? data : ''
+
+    begin
+      Rufus::Jig::HttpResponse.new(get_http(opts).start { |h| h.request(req) })
+    rescue Timeout::Error => te
+      raise Rufus::Jig::TimeoutError
+    end
+    #end
+  end
+end
+

data/lib/rufus/jig/adapters/patron.rb

@@ -0,0 +1,110 @@
+#--
+# Copyright (c) 2009-2010, John Mettraux, jmettraux@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in Japan.
+#++
+
+
+class Rufus::Jig::HttpResponse
+
+  def initialize (patron_res)
+
+    @original = patron_res
+    @status = patron_res.status
+    @headers = patron_res.headers
+    @body = patron_res.body
+  end
+end
+
+class Rufus::Jig::Http < Rufus::Jig::HttpCore
+
+  def initialize (host, port, opts={})
+
+    super(host, port, opts)
+  end
+
+  def close
+
+    # it's not really closing, it's rather making sure the patron
+    # session can get collected as garbage
+
+    Thread.current[key] = nil
+  end
+
+  def variant
+    :patron
+  end
+
+  protected
+
+  def key
+    self.object_id.to_s
+  end
+
+  # One patron session per thread
+  #
+  def get_patron (opts)
+
+    to = (opts[:timeout] || @options[:timeout])
+    to = to.to_i if to
+    to = nil if to && to < 1
+
+    k = key
+
+    patron = Thread.current[k]
+
+    return patron if patron && patron.timeout == to
+
+    if patron.nil?
+      patron = Patron::Session.new
+      patron.base_url = "#{@host}:#{@port}"
+    end
+
+    #patron.connect_timeout = 1
+      # connection timeout defaults to 1 second
+    patron.timeout = to
+
+    patron.headers['User-Agent'] =
+      @options[:user_agent] ||
+      [
+        self.class, Rufus::Jig::VERSION, Thread.current.object_id, '(patron)'
+      ].join(' ')
+
+    Thread.current[k] = patron
+  end
+
+  def do_request (method, path, data, opts)
+
+    opts['Expect'] = '' if (method == :put) && ( ! @options[:expect])
+
+    args = case method
+      when :post, :put then [ path, data, opts ]
+      else [ path, opts ]
+    end
+
+    begin
+      get_patron(opts).send(method, *args)
+    rescue Patron::TimeoutError => te
+      raise Rufus::Jig::TimeoutError
+    end
+  end
+end
+

data/lib/rufus/jig/couch.rb

@@ -72,13 +72,11 @@ module Rufus::Jig
       nil
     end
 
-    def get (doc_or_path)
+    def get (doc_or_path, opts={})
 
       path = doc_or_path.is_a?(Hash) ? doc_or_path['_id'] : doc_or_path
       path = adjust(path)
 
-      opts = {}
-
       if et = etag(path)
         opts[:etag] = et
       end

data/lib/rufus/jig/http.rb

@@ -52,6 +52,16 @@ module Rufus::Jig
     end
   end
 
+  # A common error for all adapters in case of timeout.
+  #
+  class TimeoutError < RuntimeError
+
+    def initialize (message=nil)
+
+      super(message || 'timed out')
+    end
+  end
+
   class HttpResponse
 
     attr_reader :status, :headers, :body
@@ -86,7 +96,8 @@ module Rufus::Jig
 
       @host = host
       @port = port
-      @options = opts
+
+      @options = opts.dup
 
       @cache = LruHash.new((opts[:cache_size] || 35).to_i)
 
@@ -153,13 +164,15 @@ module Rufus::Jig
       path = add_prefix(path, opts)
       path = add_params(path, opts)
 
+      path = '/' if path == ''
+
       cached = from_cache(path, opts)
       opts.delete(:etag) if not cached
 
       opts = rehash_options(opts)
       data = repack_data(data, opts)
 
-      r = send("do_#{method}", path, data, opts)
+      r = do_request(method, path, data, opts)
 
       @last_response = r
 
@@ -291,273 +304,15 @@ end
 
 if defined?(Patron) # gem install patron
 
-  class Rufus::Jig::HttpResponse
-
-    def initialize (patron_res)
-
-      @original = patron_res
-      @status = patron_res.status
-      @headers = patron_res.headers
-      @body = patron_res.body
-    end
-  end
-
-  class Rufus::Jig::Http < Rufus::Jig::HttpCore
-
-    def initialize (host, port, opts={})
-
-      super(host, port, opts)
-    end
-
-    def close
-
-      # it's not really closing, it's rather making sure the patron
-      # session can get collected as garbage
-
-      Thread.current[key] = nil
-    end
-
-    def variant
-      :patron
-    end
-
-    protected
-
-    def key
-      self.object_id.to_s
-    end
-
-    # One patron session per thread
-    #
-    def get_patron
-
-      k = key
-
-      patron = Thread.current[k]
-
-      return patron if patron
-
-      patron = Patron::Session.new
-      patron.base_url = "#{@host}:#{@port}"
-
-      patron.headers['User-Agent'] =
-        @options[:user_agent] ||
-        [
-          self.class, Rufus::Jig::VERSION, Thread.current.object_id, '(patron)'
-        ].join(' ')
-
-      Thread.current[k] = patron
-    end
-
-    def do_get (path, data, opts)
-
-      get_patron.get(path, opts)
-    end
-
-    def do_post (path, data, opts)
-
-      get_patron.post(path, data, opts)
-    end
-
-    def do_put (path, data, opts)
-
-      opts['Expect'] = '' unless @options[:expect]
-
-      get_patron.put(path, data, opts)
-    end
-
-    def do_delete (path, data, opts)
-
-      get_patron.delete(path, opts)
-    end
-  end
-
-elsif defined?( EventMachine::HttpRequest )
-
-  class Rufus::Jig::HttpResponse
-
-    def initialize( em_client )
-
-      @original = [ em_client, em_client.response ]
-
-      @status = em_client.response_header.status
-      @headers = response_headers( em_client.response_header )
-      @body = em_client.response
-    end
-
-    protected
-
-    def response_headers( hash )
-
-      hash.inject({}) do |headers, (key, value)|
-        key = key.downcase.split('_').map { |c| c.capitalize }.join('-')
-        headers[ key ] = value
-        headers
-      end
-    end
-  end
-
-  class Rufus::Jig::Http < Rufus::Jig::HttpCore
-
-    def initialize (host, port, opts={})
-
-      super(host, port, opts)
-
-      @em_host = host
-      @em_port = port
-
-      @em_ua = opts[:user_agent] || "#{self.class} #{Rufus::Jig::VERSION} (em)"
-    end
-
-    def variant
-      :em
-    end
-
-    protected
-
-    def do_get( path, data, opts )
-      http = em_request( path ).get( :head => request_headers(opts) )
-
-      em_response( http )
-    end
-
-    def do_post( path, data, opts )
-      http = em_request( path ).post( :body => data, :head => request_headers(opts) )
-
-      em_response( http )
-    end
-
-    def do_delete( path, data, opts )
-      http = em_request( path ).delete( :head => request_headers( opts ) )
-
-      em_response( http )
-    end
-
-    def do_put( path, data, opts )
-      http = em_request( path ).put( :body => data, :head => request_headers( opts ) )
+  require 'rufus/jig/adapters/patron'
 
-      em_response( http )
-    end
-
-    def em_request( uri = '/' )
-      uri = URI.parse( uri )
-      uri = URI::HTTP.build(
-        :host => ( uri.host || @em_host ),
-        :port => ( uri.port || @em_port ),
-        :path => uri.path,
-        :query => uri.query
-      )
-
-      EventMachine::HttpRequest.new( uri.to_s )
-    end
+elsif defined?(EventMachine::HttpRequest)
 
-    def em_response( em_client )
-      th = Thread.current
-
-      em_client.callback {
-        th.wakeup
-      }
-
-      Thread.stop
-
-      Rufus::Jig::HttpResponse.new( em_client )
-    end
-
-    def request_headers( options )
-      headers = { 'user-agent' => @em_ua }
-
-      %w[ Accept If-None-Match Content-Type ].each do |k|
-        headers[k] = options[k] if options.has_key?( k )
-      end
-
-      headers
-    end
-  end
+  require 'rufus/jig/adapters/em'
 
 else
 
-  require 'thread'
-  require 'net/http'
-
-  class Rufus::Jig::HttpResponse
-
-    def initialize (nh_res)
-
-      @original = nh_res
-      @status = nh_res.code.to_i
-      @body = nh_res.body
-      @headers = {}
-      nh_res.each { |k, v|
-        @headers[k.split('-').collect { |s| s.capitalize }.join('-')] = v
-      }
-    end
-  end
-
-  class Rufus::Jig::Http < Rufus::Jig::HttpCore
-
-    def initialize (host, port, opts={})
-
-      super(host, port, opts)
-
-      @http = Net::HTTP.new(host, port)
-
-      to = opts[:timeout]
-      if to
-        to = to.to_i
-        @http.open_timeout = to
-        @http.read_timeout = to
-      end
-
-      @options[:user_agent] =
-        opts[:user_agent] ||
-        "#{self.class} #{Rufus::Jig::VERSION} (net/http)"
-
-      @mutex = Mutex.new
-    end
-
-    def variant
-      :net
-    end
-
-    protected
-
-    def do_get (path, data, opts)
-
-      do_request(:get, path, data, opts)
-    end
-
-    def do_post (path, data, opts)
-
-      do_request(:post, path, data, opts)
-    end
-
-    def do_put (path, data, opts)
-
-      do_request(:put, path, data, opts)
-    end
-
-    def do_delete (path, data, opts)
-
-      do_request(:delete, path, data, opts)
-    end
-
-    def do_request (method, path, data, opts)
-
-      @mutex.synchronize do
-
-        path = '/' if path == ''
-
-        req = eval("Net::HTTP::#{method.to_s.capitalize}").new(path)
-
-        req['User-Agent'] = options[:user_agent]
-        opts.each { |k, v| req[k] = v if k.is_a?(String) }
-
-        req.body = data ? data : ''
-
-        Rufus::Jig::HttpResponse.new(@http.start { |h| h.request(req) })
-      end
-    end
-  end
+  require 'rufus/jig/adapters/net'
 
 end
 
@@ -579,7 +334,7 @@ class Rufus::Jig::Http
   #
   def self.extract_http (payload_expected, *args)
 
-    http = case args.first
+    host, port = case args.first
 
       when Rufus::Jig::Http
         args.shift
@@ -587,10 +342,10 @@ class Rufus::Jig::Http
       when /^http:\/\//
         u = URI.parse(args.shift)
         args.unshift(u.path)
-        Rufus::Jig::Http.new(u.host, u.port)
+        [ u.host, u.port ]
 
       else
-        Rufus::Jig::Http.new(args.shift, args.shift)
+        [ args.shift, args.shift ]
     end
 
     path = args.shift
@@ -604,6 +359,10 @@ class Rufus::Jig::Http
       ArgumentError.new("option Hash expected, not #{opts.inspect}")
     ) unless opts.is_a?(Hash)
 
+    http = host.is_a?(Rufus::Jig::Http) ?
+      host :
+      Rufus::Jig::Http.new(host, port, opts)
+
     [ http, path, payload, opts ]
   end
 end

data/lib/rufus/jig/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Jig
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end
 end
 

data/rufus-jig.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-jig}
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux", "Kenneth Kalmer"]
-  s.date = %q{2010-02-25}
+  s.date = %q{2010-03-12}
   s.description = %q{
     Json Interwebs Get.
 
@@ -32,6 +32,9 @@ Gem::Specification.new do |s|
      "TODO.txt",
      "lib/rufus-jig.rb",
      "lib/rufus/jig.rb",
+     "lib/rufus/jig/adapters/em.rb",
+     "lib/rufus/jig/adapters/net.rb",
+     "lib/rufus/jig/adapters/patron.rb",
      "lib/rufus/jig/couch.rb",
      "lib/rufus/jig/http.rb",
      "lib/rufus/jig/path.rb",
@@ -47,6 +50,8 @@ Gem::Specification.new do |s|
      "test/ct_4_attachments.rb",
      "test/server.rb",
      "test/test.rb",
+     "test/to.sh",
+     "test/tt_0_get_timeout.rb",
      "test/tweet.png",
      "test/ut_0_http_get.rb",
      "test/ut_1_http_post.rb",
@@ -60,7 +65,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rufus}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{An HTTP client, greedy with JSON content, GETting conditionally.}
   s.test_files = [
     "test/test.rb"
@@ -77,6 +82,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<patron>, [">= 0"])
+      s.add_development_dependency(%q<em-http-request>, [">= 0"])
     else
       s.add_dependency(%q<rufus-lru>, [">= 0"])
       s.add_dependency(%q<rufus-json>, [">= 0"])
@@ -84,6 +90,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<patron>, [">= 0"])
+      s.add_dependency(%q<em-http-request>, [">= 0"])
     end
   else
     s.add_dependency(%q<rufus-lru>, [">= 0"])
@@ -92,6 +99,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<patron>, [">= 0"])
+    s.add_dependency(%q<em-http-request>, [">= 0"])
   end
 end
 

data/test/base.rb

@@ -26,28 +26,17 @@ if transport_library == 'em-http'
   Thread.pass until EM.reactor_running?
 end
 
-#unless $test_server
-#
-#  pss = `ps aux | grep "test\/server.rb"`
-#  puts pss
-#
-#  $test_server = pss.index(' ruby ') || fork do
-#    #exec('ruby test/server.rb')
-#    exec('ruby test/server.rb > /dev/null 2>&1')
-#  end
-#  puts
-#  puts "...test server is at #{$test_server}"
-#  puts
-#  sleep 1
-#end
-
+t = nil
 begin
-  Rufus::Jig::Http.new('127.0.0.1', 4567).get('/document')
+  t = Time.now
+  Rufus::Jig::Http.new('127.0.0.1', 4567).get('/document', :timeout => -1)
 rescue Exception => e
   puts
   p e
   e.backtrace.each { |l| puts l }
   puts
+  puts "(#{Time.now - t} seconds)"
+  puts
   puts "test server not running, please run :"
   puts
   puts "  ruby test/server.rb"

data/test/server.rb

@@ -207,3 +207,12 @@ delete '/a/b/c' do
   'delete'
 end
 
+#
+# TIMEOUT testing
+
+get '/later' do
+
+  sleep 7
+  'later'
+end
+

data/test/to.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+echo
+echo "================================================================================"
+echo "ruby test/ut_7_http_get_timeout.rb -- --patron"
+ruby -v
+echo
+ruby test/ut_7_http_get_timeout.rb -- --patron
+
+echo
+echo "================================================================================"
+echo "ruby test/ut_7_http_get_timeout.rb -- --net"
+ruby -v
+echo
+ruby test/ut_7_http_get_timeout.rb -- --net
+
+echo
+echo "================================================================================"
+echo "ruby test/ut_7_http_get_timeout.rb -- --em"
+ruby -v
+echo
+ruby test/ut_7_http_get_timeout.rb -- --em
+
+echo
+

data/test/tt_0_get_timeout.rb

@@ -0,0 +1,92 @@
+
+#
+# testing rufus-jig
+#
+# Tue Mar  9 11:09:43 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+
+class UtHttpGetTimeoutTest < Test::Unit::TestCase
+
+  #def setup
+  #end
+  def teardown
+    @h.close
+  end
+
+  def test_timeout_after_1
+
+    @h = Rufus::Jig::Http.new('127.0.0.1', 4567, :timeout => 1)
+
+    t = nil
+
+    assert_raise Rufus::Jig::TimeoutError do
+      t = Time.now
+      @h.get('/later')
+    end
+
+    d = Time.now - t; dd = 4.0; assert d < dd, "after #{d} seconds (#{dd})"
+      # grr, em-http-request forces me to use 4.0 (2.0 for the others)
+  end
+
+  def test_timeout_after_5
+
+    @h = Rufus::Jig::Http.new('127.0.0.1', 4567)
+
+    t = nil
+
+    assert_raise Rufus::Jig::TimeoutError do
+      t = Time.now
+      @h.get('/later')
+    end
+
+    d = Time.now - t; dd = 6.0; assert d < dd, "after #{d} seconds (#{dd})"
+  end
+
+  def test_timeout_after_15
+
+    @h = Rufus::Jig::Http.new('127.0.0.1', 4567, :timeout => 15)
+
+    t = Time.now
+
+    r = begin
+      @h.get('/later')
+    rescue Rufus::Jig::TimeoutError => e
+      puts " :( timed out after #{Time.now - t} seconds"
+      flunk
+    end
+
+    assert_equal 'later', r
+    d = Time.now - t; dd = 8.0; assert d < dd, "after #{d} seconds (#{dd})"
+  end
+
+  def test_never_timeout
+
+    @h = Rufus::Jig::Http.new('127.0.0.1', 4567, :timeout => -1)
+
+    t = Time.now
+
+    r = @h.get('/later')
+
+    assert_equal 'later', r
+    d = Time.now - t; dd = 8.0; assert d < dd, "after #{d} seconds (#{dd})"
+  end
+
+  def test_request_timeout_after_1
+
+    @h = Rufus::Jig::Http.new('127.0.0.1', 4567, :timeout => 15)
+
+    t = nil
+
+    assert_raise Rufus::Jig::TimeoutError do
+      t = Time.now
+      @h.get('/later', :timeout => 1)
+    end
+
+    d = Time.now - t; dd = 4.0; assert d < dd, "after #{d} seconds (#{dd})"
+      # grr, em-http-request forces me to use 4.0 (2.0 for the others)
+  end
+end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-jig
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 15
+  version: 0.1.15
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,69 +15,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +09:00
+date: 2010-03-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rufus-lru
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rufus-json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: patron
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id007
 description: "\n    Json Interwebs Get.\n\n    An HTTP client, greedy with JSON content, GETting conditionally.\n\n    Uses Patron and Yajl-ruby whenever possible.\n  "
 email: jmettraux@gmail.com
 executables: []
@@ -92,6 +121,9 @@ files:
 - TODO.txt
 - lib/rufus-jig.rb
 - lib/rufus/jig.rb
+- lib/rufus/jig/adapters/em.rb
+- lib/rufus/jig/adapters/net.rb
+- lib/rufus/jig/adapters/patron.rb
 - lib/rufus/jig/couch.rb
 - lib/rufus/jig/http.rb
 - lib/rufus/jig/path.rb
@@ -107,6 +139,8 @@ files:
 - test/ct_4_attachments.rb
 - test/server.rb
 - test/test.rb
+- test/to.sh
+- test/tt_0_get_timeout.rb
 - test/tweet.png
 - test/ut_0_http_get.rb
 - test/ut_1_http_post.rb
@@ -128,18 +162,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rufus
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: An HTTP client, greedy with JSON content, GETting conditionally.