typhoeus 0.4.2 → 0.5.0.pre

data/lib/typhoeus/responses/header.rb

@@ -0,0 +1,50 @@
+module Typhoeus
+  module Responses
+
+    # This class represents the response header.
+    # It can be accessed like a hash.
+    class Header < Hash
+      # Create a new header.
+      #
+      # @example Create new header.
+      #   Header.new(raw)
+      #
+      # @param [ String ] raw The raw header.
+      def initialize(raw)
+        @raw = raw
+        parse
+      end
+
+      # Returns the raw header or empty string.
+      #
+      # @example Return raw header.
+      #   header.raw
+      #
+      # @return [ String ] The raw header.
+      def raw
+        @raw ||= ''
+      end
+
+      # Parses the raw header.
+      #
+      # @example Parse header.
+      #   header.parse
+      def parse
+        raw.lines.each do |header|
+          unless header =~ /^HTTP\/1.[01]/
+            parts = header.split(':', 2)
+            unless parts.empty?
+              parts.map(&:strip!)
+              if self.has_key?(parts[0])
+                self[parts[0]] = [self[parts[0]]] unless self[parts[0]].kind_of? Array
+                self[parts[0]] << parts[1]
+              else
+                self[parts[0]] = parts[1]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/typhoeus/responses/informations.rb

@@ -0,0 +1,43 @@
+module Typhoeus
+  module Responses
+
+    # This module contains logic about informations
+    # on a response.
+    module Informations
+
+      # All available informations.
+      AVAILABLE_INFORMATIONS = Ethon::Easies::Informations::AVAILABLE_INFORMATIONS.keys+
+        [:return_code, :response_body, :response_header]
+
+      AVAILABLE_INFORMATIONS.each do |name|
+        define_method(name) do
+          options[name.to_sym]
+        end
+      end
+
+      # Returns the response header.
+      #
+      # @example Return header.
+      #   response.header
+      #
+      # @return [ Header ] The response header.
+      def header
+        return nil unless response_header
+        @header ||= Responses::Header.new(response_header.split("\r\n\r\n").last)
+      end
+
+      # Return all redirections in between as multiple
+      # responses with header.
+      #
+      # @example Return redirections.
+      #   response.redirections
+      #
+      # @return [ Array ] The redirections
+      def redirections
+        return [] unless response_header
+        response_header.split("\r\n\r\n")[0..-2].map{ |h| Response.new(:response_header => h) }
+      end
+    end
+  end
+end
+

data/lib/typhoeus/responses/legacy.rb

@@ -0,0 +1,26 @@
+module Typhoeus
+  module Responses # :nodoc:
+
+    # This module contains logic for providing the
+    # old accessors.
+    module Legacy
+
+      # The legacy mapping.
+      MAPPING = {
+        :body => :response_body,
+        :code => :response_code,
+        :curl_return_code => :return_code,
+        :time => :total_time,
+        :app_connect_time => :appconnect_time,
+        :start_transfer_time => :starttransfer_time,
+        :name_lookup_time => :namelookup_time
+      }
+
+      MAPPING.each do |old, new|
+        define_method(old) do
+          options[new]
+        end
+      end
+    end
+  end
+end

data/lib/typhoeus/responses/status.rb

@@ -0,0 +1,77 @@
+module Typhoeus
+  module Responses
+
+    # This module contains logic about the http
+    # status.
+    module Status
+
+      # Return the status message if present.
+      #
+      # @example Return status message.
+      #   reesponse.status_message
+      #
+      # @return [ String ] The message.
+      def status_message
+        return @status_message if defined?(@status_message) && @status_message
+
+        # HTTP servers can choose not to include the explanation to HTTP codes. The RFC
+        # states this (http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4):
+        # Except when responding to a HEAD request, the server SHOULD include an entity containing
+        # an explanation of the error situation [...]
+        # This means 'HTTP/1.1 404' is as valid as 'HTTP/1.1 404 Not Found' and we have to handle it.
+
+        # Regexp doc: http://rubular.com/r/eAr1oVYsVa
+        if first_header_line != nil and first_header_line[/\d{3} (.*)$/, 1] != nil
+          @status_message = first_header_line[/\d{3} (.*)$/, 1].chomp
+        else
+          @status_message = nil
+        end
+      end
+
+      # Return the http version.
+      #
+      # @example Return http version.
+      #  response.http_version
+      #
+      # @return [ String ] The http version.
+      def http_version
+        @http_version ||= first_header_line ? first_header_line[/HTTP\/(\S+)/, 1] : nil
+      end
+
+      # Return wether the response is a success.
+      #
+      # @example Return if the response was successful.
+      #  response.success?
+      #
+      # @return [ Boolean ] Return true if successful, false else.
+      def success?
+        (200..299).include?(response_code)
+      end
+
+      # Return wether the response is modified.
+      #
+      # @example Return if the response was modified.
+      #  response.modified?
+      #
+      # @return [ Boolean ] Return true if modified, false else.
+      def modified?
+        response_code != 304
+      end
+
+      # Return wether the response is timed out.
+      #
+      # @example Return if the response timed out..
+      #  response.time_out?
+      #
+      # @return [ Boolean ] Return true if timed out, false else.
+      def timed_out?
+        return_code == 28
+      end
+
+      # :nodoc:
+      def first_header_line
+        @first_header_line ||= response_header.to_s.split("\n").first
+      end
+    end
+  end
+end

data/lib/typhoeus/version.rb

@@ -1,3 +1,5 @@
 module Typhoeus
-  VERSION = '0.4.2'
+
+  # The current Typhoeus version.
+  VERSION = '0.5.0.pre'
 end

data/lib/typhoeus.rb

@@ -1,56 +1,42 @@
 require 'digest/sha2'
+require 'ethon'
 
-require 'typhoeus/utils'
-require 'typhoeus/header'
-require 'typhoeus/curl'
-require 'typhoeus/easy'
-require 'typhoeus/form'
-require 'typhoeus/multi'
-require 'typhoeus/filter'
-require 'typhoeus/param_processor'
-require 'typhoeus/remote'
-require 'typhoeus/remote_proxy_object'
-require 'typhoeus/response'
+require 'typhoeus/config'
 require 'typhoeus/request'
+require 'typhoeus/response'
 require 'typhoeus/hydra'
-require 'typhoeus/hydra_mock'
 require 'typhoeus/version'
 
+# Typhoeus is a http client library based on Ethon which
+# wraps libcurl.
+#
+# If you want to make a single request, go with:
+#   Typhoeus.get("www.example.com")
+#
+# When you looking for firing a bunch of requests automatically
+# choose the hydra:
+#
+#   hydra = Typhoeus::Hydra.new
+#   requests = (0..9).map{ Typhoeus::Request.new("www.example.com") }
+#   requests.each{ |request| hydra.queue(request) }
+#   hydra.run
 module Typhoeus
-  def self.easy_object_pool
-    @easy_objects ||= []
-  end
-
-  def self.init_easy_object_pool
-    20.times do
-      easy_object_pool << Typhoeus::Easy.new
-    end
-  end
+  extend self
+  extend Hydras::EasyPool
+  extend Requests::Actions
 
-  def self.release_easy_object(easy)
-    easy.reset
-    easy_object_pool << easy
-  end
-
-  def self.get_easy_object
-    if easy_object_pool.empty?
-      Typhoeus::Easy.new
-    else
-      easy_object_pool.pop
-    end
-  end
-
-  def self.add_easy_request(easy_object)
-    Thread.current[:curl_multi] ||= Typhoeus::Multi.new
-    Thread.current[:curl_multi].add(easy_object)
-  end
+  # The default typhoeus user agent.
+  USER_AGENT = "Typhoeus - https://github.com/typhoeus/typhoeus"
 
-  def self.perform_easy_requests
-    multi = Thread.current[:curl_multi]
-    start_time = Time.now
-    multi.easy_handles.each do |easy|
-      easy.start_time = start_time
-    end
-    multi.perform
+  # Set the Typhoeus configuration options by passing a block.
+  #
+  # @example Set the configuration options.
+  #   Typhoeus.configure do |config|
+  #     config.verbose = true
+  #   end
+  #
+  # @return [ Config ] The configuration object.
+  def configure
+    yield Config
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.5.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - David Balatero
@@ -11,16 +11,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: ethon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,23 +28,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.18'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.18'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +84,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.11.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,7 +92,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +116,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.5.3
 description: Like a modern code version of the mythical beast with 100 serpent heads,
   Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
 email:
@@ -149,31 +149,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/typhoeus/curl.rb
-- lib/typhoeus/easy/auth.rb
-- lib/typhoeus/easy/callbacks.rb
-- lib/typhoeus/easy/ffi_helper.rb
-- lib/typhoeus/easy/infos.rb
-- lib/typhoeus/easy/options.rb
-- lib/typhoeus/easy/proxy.rb
-- lib/typhoeus/easy/ssl.rb
-- lib/typhoeus/easy.rb
-- lib/typhoeus/filter.rb
-- lib/typhoeus/form.rb
-- lib/typhoeus/header.rb
-- lib/typhoeus/hydra/callbacks.rb
-- lib/typhoeus/hydra/connect_options.rb
-- lib/typhoeus/hydra/stubbing.rb
+- lib/typhoeus/config.rb
 - lib/typhoeus/hydra.rb
-- lib/typhoeus/hydra_mock.rb
-- lib/typhoeus/multi.rb
-- lib/typhoeus/param_processor.rb
-- lib/typhoeus/remote.rb
-- lib/typhoeus/remote_method.rb
-- lib/typhoeus/remote_proxy_object.rb
+- lib/typhoeus/hydras/easy_factory.rb
+- lib/typhoeus/hydras/easy_pool.rb
+- lib/typhoeus/hydras/memoizable.rb
+- lib/typhoeus/hydras/queueable.rb
+- lib/typhoeus/hydras/runnable.rb
 - lib/typhoeus/request.rb
+- lib/typhoeus/requests/actions.rb
+- lib/typhoeus/requests/callbacks.rb
+- lib/typhoeus/requests/marshal.rb
+- lib/typhoeus/requests/memoizable.rb
+- lib/typhoeus/requests/operations.rb
+- lib/typhoeus/requests/responseable.rb
 - lib/typhoeus/response.rb
-- lib/typhoeus/utils.rb
+- lib/typhoeus/responses/header.rb
+- lib/typhoeus/responses/informations.rb
+- lib/typhoeus/responses/legacy.rb
+- lib/typhoeus/responses/status.rb
 - lib/typhoeus/version.rb
 - lib/typhoeus.rb
 - CHANGELOG.md
@@ -193,6 +187,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -87429564240378902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: