pauldix-typhoeus 0.0.24 → 0.1.0

data/lib/typhoeus.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.dirname(__FILE__))
 
-require 'cgi'
+require 'rack/utils'
 require 'digest/sha2'
 require 'typhoeus/easy'
 require 'typhoeus/multi'
@@ -10,9 +10,11 @@ require 'typhoeus/remote_method'
 require 'typhoeus/remote'
 require 'typhoeus/remote_proxy_object'
 require 'typhoeus/response'
+require 'typhoeus/request'
+require 'typhoeus/hydra'
 
 module Typhoeus
-  VERSION = "0.0.24"
+  VERSION = "0.1.0"
   
   def self.easy_object_pool
     @easy_objects ||= []

data/lib/typhoeus/easy.rb

@@ -104,12 +104,12 @@ module Typhoeus
       params_string = params.keys.collect do |k|
         value = params[k]
         if value.is_a? Hash
-          value.keys.collect {|sk| CGI.escape("#{k}[#{sk}]") + "=" + CGI.escape(value[sk].to_s)}
+          value.keys.collect {|sk| Rack::Utils.escape("#{k}[#{sk}]") + "=" + Rack::Utils.escape(value[sk].to_s)}
         elsif value.is_a? Array
-          key = CGI.escape(k.to_s)
-          value.collect { |v| "#{key}=#{CGI.escape(v.to_s)}" }.join('&')
+          key = Rack::Utils.escape(k.to_s)
+          value.collect { |v| "#{key}=#{Rack::Utils.escape(v.to_s)}" }.join('&')
         else
-          "#{CGI.escape(k.to_s)}=#{CGI.escape(params[k].to_s)}"
+          "#{Rack::Utils.escape(k.to_s)}=#{Rack::Utils.escape(params[k].to_s)}"
         end
       end.flatten.join("&")
       

data/lib/typhoeus/hydra.rb

@@ -0,0 +1,149 @@
+module Typhoeus
+  class Hydra
+    def initialize
+      @multi       = Multi.new
+      @easy_pool   = []
+      @mocks       = []
+      @memoized_requests = {}
+    end
+  
+    def self.hydra
+      @hydra ||= new
+    end
+
+    def queue(request)
+      return if assign_to_mock(request)
+      
+      if request.method == :get
+        if @memoized_requests.has_key? request.url
+          @memoized_requests[request.url] << request
+        else
+          @memoized_requests[request.url] = []
+          get_from_cache_or_queue(request)
+        end
+      else
+        get_from_cache_or_queue(request)
+      end
+    end
+
+    def run
+      @mocks.each do |m|
+        m.requests.each do |request|
+          m.response.request = request
+          handle_request(request, m.response)
+        end
+      end
+      @multi.perform
+      @memoized_requests = {}
+    end
+    
+    def cache_getter(&block)
+      @cache_getter = block
+    end
+    
+    def cache_setter(&block)
+      @cache_setter = block
+    end
+    
+    def on_complete(&block)
+      @on_complete = block
+    end
+    
+    def mock(method, url)
+      @mocks << HydraMock.new(url, method)
+      @mocks.last
+    end
+    
+    def assign_to_mock(request)
+      m = @mocks.detect {|mck| mck.method == request.method && mck.url == request.url}
+      m && m.add_request(request)
+    end
+    private :assign_to_mock
+    
+    def get_from_cache_or_queue(request)
+      if @cache_getter
+        val = @cache_getter.call(request)
+        if val
+          request.response = val
+          request.call_handlers
+        else
+          @multi.add(get_easy_object(request))
+        end
+      else
+        @multi.add(get_easy_object(request))
+      end
+    end
+    private :get_from_cache_or_queue
+        
+    def get_easy_object(request)
+      easy = @easy_pool.pop || Easy.new
+      easy.url          = request.url
+      easy.method       = request.method
+      easy.headers      = request.headers if request.headers
+      easy.request_body = request.body    if request.body
+      easy.timeout      = request.timeout if request.timeout
+      easy.on_success do |easy|
+        handle_request(request, response_from_easy(easy, request))
+        release_easy_object(easy)
+      end
+      easy.on_failure do |easy|
+        handle_request(request, response_from_easy(easy, request))
+        release_easy_object(easy)
+      end
+      easy.set_headers
+      easy
+    end
+    private :get_easy_object
+    
+    def release_easy_object(easy)
+      easy.reset
+      @easy_pool.push easy
+    end
+    private :release_easy_object
+    
+    def handle_request(request, response)
+      request.response = response
+
+      if (request.cache_timeout && @cache_setter)
+        @cache_setter.call(request) 
+      end      
+      @on_complete.call(response) if @on_complete
+      
+      request.call_handlers
+      if requests = @memoized_requests[request.url]
+        requests.each do |r|
+          r.response = response
+          r.call_handlers
+        end
+      end
+    end
+    private :handle_request
+    
+    def response_from_easy(easy, request)
+      Response.new(:code    => easy.response_code,
+                   :headers => easy.response_header,
+                   :body    => easy.response_body,
+                   :time    => easy.total_time_taken,
+                   :request => request)
+    end
+    private :response_from_easy
+  end
+  
+  class HydraMock
+    attr_reader :url, :method, :response, :requests
+    
+    def initialize(url, method)
+      @url      = url
+      @method   = method
+      @requests = []
+    end
+    
+    def add_request(request)
+      @requests << request
+    end
+    
+    def and_return(val)
+      @response = val
+    end
+  end
+end

data/lib/typhoeus/request.rb

@@ -0,0 +1,80 @@
+module Typhoeus
+  class Request
+    attr_accessor :method, :params, :body, :headers, :timeout, :user_agent, :response, :cache_timeout
+    attr_reader   :url
+    
+    def initialize(url, options = {})
+      @method           = options[:method] || :get
+      @params           = options[:params]
+      @body             = options[:body]
+      @timeout          = options[:timeout]
+      @headers          = options[:headers] || {}
+      @user_agent       = options[:user_agent] || Typhoeus::USER_AGENT
+      @cache_timeout    = options[:cache_timeout]
+      @url              = @params ? "#{url}?#{params_string}" : url
+      @on_complete      = nil
+      @after_complete   = nil
+      @handled_response = nil
+    end
+    
+    def host
+      slash_location = @url.index('/', 8)
+      if slash_location
+        @url.slice(0, slash_location)
+      else
+        query_string_location = @url.index('?')
+        return query_string_location ? @url.slice(0, query_string_location) : @url
+      end
+    end
+    
+    def headers
+      @headers["User-Agent"] = @user_agent
+      @headers
+    end
+    
+    def params_string
+      params.keys.sort.collect do |k|
+        value = params[k]
+        if value.is_a? Hash
+          value.keys.collect {|sk| Rack::Utils.escape("#{k}[#{sk}]") + "=" + Rack::Utils.escape(value[sk].to_s)}
+        elsif value.is_a? Array
+          key = Rack::Utils.escape(k.to_s)
+          value.collect { |v| "#{key}=#{Rack::Utils.escape(v.to_s)}" }.join('&')
+        else
+          "#{Rack::Utils.escape(k.to_s)}=#{Rack::Utils.escape(params[k].to_s)}"
+        end
+      end.flatten.join("&")
+    end
+    
+    def on_complete(&block)
+      @on_complete = block
+    end
+    
+    def after_complete(&block)
+      @after_complete = block
+    end
+    
+    def call_handlers
+      if @on_complete
+        @handled_response = @on_complete.call(response)
+        call_after_complete
+      end
+    end
+    
+    def call_after_complete
+       @after_complete.call(@handled_response) if @after_complete
+    end
+    
+    def handled_response=(val)
+      @handled_response = val
+    end
+    
+    def handled_response
+      @handled_response || response
+    end
+    
+    def cache_key
+      Digest::SHA1.hexdigest(url)
+    end
+  end
+end

data/lib/typhoeus/response.rb

@@ -1,17 +1,19 @@
 module Typhoeus
   class Response
+    attr_accessor :request
     attr_reader :code, :headers, :body, :time,
                 :requested_url, :requested_remote_method,
                 :requested_http_method, :start_time
     
     def initialize(params = {})
-      @code                     = params[:code]
-      @headers                  = params[:headers]
-      @body                     = params[:body]
-      @time                     = params[:time]
-      @requested_url            = params[:requested_url]
-      @requested_http_method    = params[:requested_http_method]
-      @start_time               = params[:start_time]
+      @code                  = params[:code]
+      @headers               = params[:headers]
+      @body                  = params[:body]
+      @time                  = params[:time]
+      @requested_url         = params[:requested_url]
+      @requested_http_method = params[:requested_http_method]
+      @start_time            = params[:start_time]
+      @request               = params[:request]
     end
   end
 end

data/spec/typhoeus/response_spec.rb

@@ -27,5 +27,10 @@ describe Typhoeus::Response do
       response = Typhoeus::Response.new(:requested_http_method => :delete)
       response.requested_http_method.should == :delete
     end
+    
+    it "should store an associated request object" do
+      response = Typhoeus::Response.new(:request => "whatever")
+      response.request.should == "whatever"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pauldix-typhoeus
 version: !ruby/object:Gem::Version 
-  version: 0.0.24
+  version: 0.1.0
 platform: ruby
 authors: 
 - Paul Dix
@@ -11,8 +11,17 @@ cert_chain: []
 
 date: 2009-07-03 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.9.0
+    version: 
 description: 
 email: paul@pauldix.net
 executables: []
@@ -38,6 +47,8 @@ files:
 - lib/typhoeus/filter.rb
 - lib/typhoeus/remote_method.rb
 - lib/typhoeus/response.rb
+- lib/typhoeus/hydra.rb
+- lib/typhoeus/request.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/typhoeus/easy_spec.rb