rufus-jig 0.1.0 → 0.1.1

data/CREDITS.txt

@@ -1,3 +1,6 @@
 
-nothing here for now
+== authors
+
+John Mettraux - http://github.com/jmettraux
+Kenneth Kalmer - http://github.com/kennethkalmer
 

data/README.rdoc

@@ -3,10 +3,27 @@
 
 A HTTP client, greedy with JSON content, GETting conditionally.
 
-Uses Patron (http://github.com/toland/patron) and Yajl-ruby (http://github.com/brianmario/yajl-ruby) whenever possible.
+Uses Patron (http://github.com/toland/patron) or em-http-request (http://github.com/igrigorik/em-http-request)
+and Yajl-ruby (http://github.com/brianmario/yajl-ruby) whenever possible.
 
 This library also contains some CouchDB helpers.
 
+To select a HTTP transport layer for rufus-jig, just make sure you have loaded
+the library before loading rufus-jig.
+
+For Patron:
+
+  require 'patron'
+  require 'rufus/jig'
+
+For em-http-request:
+
+  require 'em-http'
+  require 'rufus/jig'
+
+Please not that em-http-request-0.2.2 and earlier don't support the PUT and DELETE
+verbs. Until a newer gem is released you'll need to build the em-http-request gem
+from source.
 
 == examples
 
@@ -52,6 +69,7 @@ posting...
 === Couch helpers
 
 For the real thing : http://github.com/couchrest/couchrest
+There is also the excellent : http://github.com/langalex/couch_potato
 
   require 'patron'
   require 'yajl'
@@ -142,6 +160,10 @@ To test the CouchDB helpers, make you have a running Couch on http:/127.0.0.1:59
 
   ruby test/test.rb --couch
 
+To test the em-http-request HTTP transport, make sure the sinatra server is running and then do:
+
+  ruby test/test.rb -- --em
+
 
 == mailing list
 

data/lib/rufus/jig/http.rb

@@ -52,6 +52,12 @@ module Rufus::Jig
     end
   end
 
+  class HttpResponse
+
+    attr_reader :status, :headers, :body
+    attr_reader :original
+  end
+
   # The base for the Rufus::Jig::Http class.
   #
   class HttpCore
@@ -197,13 +203,22 @@ module Rufus::Jig
 
     def add_prefix (path, opts)
 
-      elts = [ path ]
+      uri = URI.parse( path )
 
-      if path.match(/^[^\/]/) && prefix = @options[:prefix]
-        elts.unshift(prefix)
-      end
+      if !uri.host.nil?
+        return uri.to_s
+
+      else
+        uri.host.nil?
+
+        elts = [ path ]
 
-      Path.join(*elts)
+        if path.match(/^[^\/]/) && prefix = @options[:prefix]
+          elts.unshift(prefix)
+        end
+
+        return Path.join(*elts)
+      end
     end
 
     def add_params (path, opts)
@@ -258,6 +273,17 @@ 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={})
@@ -268,7 +294,8 @@ if defined?(Patron) # gem install patron
       @patron.base_url = "#{host}:#{port}"
 
       @patron.headers['User-Agent'] =
-        opts[:user_agent] || "#{self.class} #{Rufus::Jig::VERSION}"
+        opts[:user_agent] ||
+        "#{self.class} #{Rufus::Jig::VERSION} (patron)"
     end
 
     protected
@@ -285,6 +312,8 @@ if defined?(Patron) # gem install patron
 
     def do_put (path, data, opts)
 
+      opts['Expect'] = '' unless @options[:expect]
+
       @patron.put(path, data, opts)
     end
 
@@ -294,11 +323,175 @@ if defined?(Patron) # gem install patron
     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
+
+    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 ) )
+
+      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
+
+    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
+
 else
 
-  # TODO : use Net:HTTP
+  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)"
+    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
 
-  raise "alternative to Patron not yet integrated :(  gem install patron"
+    def do_request (method, path, data, opts)
+
+      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 { @http.request(req) })
+    end
+  end
 
 end
 

data/lib/rufus/jig.rb

@@ -29,7 +29,7 @@ module Jig
   require 'rufus/jig/http'
   require 'rufus/jig/json'
 
-  VERSION = '0.0.1'
+  VERSION = '0.1.1'
 
   autoload :Couch, 'rufus/jig/couch'
   autoload :CouchError, 'rufus/jig/couch'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-jig
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - John Mettraux
+- Kenneth Kalmer
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 +09:00
+date: 2009-12-04 00:00:00 +09:00
 default_executable: 
 dependencies: []