typhoeus 0.5.0.pre → 0.5.0.rc

data/lib/typhoeus/{responses → response}/header.rb

@@ -1,8 +1,10 @@
 module Typhoeus
-  module Responses
+  class Response
 
     # This class represents the response header.
     # It can be accessed like a hash.
+    #
+    # @api private
     class Header < Hash
       # Create a new header.
       #
@@ -15,16 +17,6 @@ module Typhoeus
         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.
@@ -45,6 +37,18 @@ module Typhoeus
           end
         end
       end
+
+      private
+
+      # Returns the raw header or empty string.
+      #
+      # @example Return raw header.
+      #   header.raw
+      #
+      # @return [ String ] The raw header.
+      def raw
+        @raw ||= ''
+      end
     end
   end
 end

data/lib/typhoeus/response/informations.rb

@@ -0,0 +1,205 @@
+module Typhoeus
+  class Response
+
+    # This module contains logic about informations
+    # on a response.
+    module Informations
+
+      # Return libcurls return value.
+      #
+      # @example Get return_code.
+      #   response.return_code
+      #
+      # @return [ Symbol ] The return_code.
+      def return_code
+        options[:return_code]
+      end
+
+      # Return the http response body.
+      #
+      # @example Get response_body.
+      #   response.response_body
+      #
+      # @return [ String ] The response_body.
+      def response_body
+        options[:response_body] || options[:body]
+      end
+      alias :body :response_body
+
+      # Return the http response headers.
+      #
+      # @example Get response_headers.
+      #   response.response_headers
+      #
+      # @return [ String ] The response_headers.
+      def response_headers
+        options[:response_headers]
+      end
+
+      # Return the last received HTTP, FTP or SMTP response code.
+      # The value will be zero if no server response code has
+      # been received. Note that a proxy's CONNECT response should
+      # be read with http_connect_code and not this.
+      #
+      # @example Get response_code.
+      #   response.response_code
+      #
+      # @return [ Integer ] The response_code.
+      def response_code
+        options[:response_code] || options[:code]
+      end
+      alias :code :response_code
+
+      # Return the available http auth methods.
+      # Bitmask indicating the authentication method(s)
+      # available.
+      #
+      # @example Get httpauth_avail.
+      #   response.httpauth_avail
+      #
+      # @return [ Integer ] The bitmask.
+      def httpauth_avail
+        options[:httpauth_avail]
+      end
+
+
+      # Return the total time in seconds for the previous
+      # transfer, including name resolving, TCP connect etc.
+      #
+      # @example Get total_time.
+      #   response.total_time
+      #
+      # @return [ Float ] The total_time.
+      def total_time
+        options[:total_time] || options[:time]
+      end
+      alias :time :total_time
+
+      # Return the time, in seconds, it took from the start
+      # until the first byte is received by libcurl. This
+      # includes pretransfer time and also the time the
+      # server needs to calculate the result.
+      #
+      # @example Get starttransfer_time.
+      #   response.starttransfer_time
+      #
+      # @return [ Float ] The starttransfer_time.
+      def starttransfer_time
+        options[:starttransfer_time] || options[:start_transfer_time]
+      end
+      alias :start_transfer_time :starttransfer_time
+
+      # Return the time, in seconds, it took from the start
+      # until the SSL/SSH connect/handshake to the remote
+      # host was completed. This time is most often very near
+      # to the pre transfer time, except for cases such as HTTP
+      # pippelining where the pretransfer time can be delayed
+      # due to waits in line for the pipeline and more.
+      #
+      # @example Get appconnect_time.
+      #   response.appconnect_time
+      #
+      # @return [ Float ] The appconnect_time.
+      def appconnect_time
+        options[:appconnect_time] || options[:app_connect_time]
+      end
+      alias :app_connect_time :appconnect_time
+
+      # Return the time, in seconds, it took from the start
+      # until the file transfer is just about to begin. This
+      # includes all pre-transfer commands and negotiations
+      # that are specific to the particular protocol(s) involved.
+      # It does not involve the sending of the protocol-
+      # specific request that triggers a transfer.
+      #
+      # @example Get pretransfer_time.
+      #  response.pretransfer_time
+      #
+      # @return [ Float ] The pretransfer_time.
+      def pretransfer_time
+        options[:pretransfer_time]
+      end
+
+      # Return the time, in seconds, it took from the start
+      # until the connect to the remote host (or proxy) was completed.
+      #
+      # @example Get connect_time.
+      #   response.connect_time
+      #
+      # @return [ Float ] The connect_time.
+      def connect_time
+        options[:connect_time]
+      end
+
+      # Return the time, in seconds, it took from the
+      # start until the name resolving was completed.
+      #
+      # @example Get namelookup_time.
+      #   response.namelookup_time
+      #
+      # @return [ Float ] The namelookup_time.
+      def namelookup_time
+        options[:namelookup_time] || options[:name_lookup_time]
+      end
+      alias :name_lookup_time :namelookup_time
+
+      # Return the last used effective url.
+      #
+      # @example Get effective_url.
+      #   response.effective_url
+      #
+      # @return [ String ] The effective_url.
+      def effective_url
+        options[:effective_url]
+      end
+
+      # Return the string holding the IP address of the most recent
+      # connection done with this curl handle. This string
+      # may be IPv6 if that's enabled.
+      #
+      # @example Get primary_ip.
+      #   response.primary_ip
+      #
+      # @return [ String ] The primary_ip.
+      def primary_ip
+        options[:primary_ip]
+      end
+
+      # Return the total number of redirections that were
+      # actually followed
+      #
+      # @example Get redirect_count.
+      #   response.redirect_count
+      #
+      # @return [ Integer ] The redirect_count.
+      def redirect_count
+        options[:redirect_count]
+      end
+
+      # Returns the response header.
+      #
+      # @example Return headers.
+      #   response.headers
+      #
+      # @return [ Typhoeus::Header ] The response header.
+      def headers
+        return nil if response_headers.nil? && @headers.nil?
+        @headers ||= Response::Header.new(response_headers.split("\r\n\r\n").last)
+      end
+      alias :headers_hash :headers
+
+      # Return all redirections in between as multiple
+      # responses with header.
+      #
+      # @example Return redirections.
+      #   response.redirections
+      #
+      # @return [ Array<Typhoeus::Response> ] The redirections
+      def redirections
+        return [] unless response_headers
+        response_headers.split("\r\n\r\n")[0..-2].map{ |h| Response.new(:response_headers => h) }
+      end
+    end
+  end
+end
+

data/lib/typhoeus/{responses → response}/status.rb

@@ -1,5 +1,5 @@
 module Typhoeus
-  module Responses
+  class Response
 
     # This module contains logic about the http
     # status.
@@ -13,6 +13,7 @@ module Typhoeus
       # @return [ String ] The message.
       def status_message
         return @status_message if defined?(@status_message) && @status_message
+        return options[:status_message] unless options[:status_message].nil?
 
         # 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):
@@ -45,7 +46,7 @@ module Typhoeus
       #
       # @return [ Boolean ] Return true if successful, false else.
       def success?
-        (200..299).include?(response_code)
+        return_code == :ok && response_code >= 200 && response_code < 300
       end
 
       # Return wether the response is modified.
@@ -55,22 +56,24 @@ module Typhoeus
       #
       # @return [ Boolean ] Return true if modified, false else.
       def modified?
-        response_code != 304
+        return_code == :ok && response_code != 304
       end
 
       # Return wether the response is timed out.
       #
-      # @example Return if the response timed out..
-      #  response.time_out?
+      # @example Return if the response timed out.
+      #  response.timed_out?
       #
       # @return [ Boolean ] Return true if timed out, false else.
       def timed_out?
-        return_code == 28
+        [:operation_timedout, :couldnt_connect].include?(return_code)
       end
 
+      private
+
       # :nodoc:
       def first_header_line
-        @first_header_line ||= response_header.to_s.split("\n").first
+        @first_header_line ||= response_headers.to_s.split("\n").first
       end
     end
   end

data/lib/typhoeus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre
+  version: 0.5.0.rc
   prerelease: 6
 platform: ruby
 authors:
@@ -11,136 +11,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.4
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.10'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        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
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.0
 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:
@@ -150,24 +38,33 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/typhoeus/config.rb
+- lib/typhoeus/errors/no_stub.rb
+- lib/typhoeus/errors/typhoeus_error.rb
+- lib/typhoeus/errors.rb
+- lib/typhoeus/expectation.rb
+- lib/typhoeus/hydra/before.rb
+- lib/typhoeus/hydra/block_connection.rb
+- lib/typhoeus/hydra/easy_factory.rb
+- lib/typhoeus/hydra/easy_pool.rb
+- lib/typhoeus/hydra/memoizable.rb
+- lib/typhoeus/hydra/queueable.rb
+- lib/typhoeus/hydra/runnable.rb
+- lib/typhoeus/hydra/stubbable.rb
 - lib/typhoeus/hydra.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/actions.rb
+- lib/typhoeus/request/before.rb
+- lib/typhoeus/request/block_connection.rb
+- lib/typhoeus/request/callbacks.rb
+- lib/typhoeus/request/marshal.rb
+- lib/typhoeus/request/memoizable.rb
+- lib/typhoeus/request/operations.rb
+- lib/typhoeus/request/responseable.rb
+- lib/typhoeus/request/stubbable.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/header.rb
+- lib/typhoeus/response/informations.rb
+- lib/typhoeus/response/status.rb
 - lib/typhoeus/response.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
@@ -189,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -87429564240378902
+      hash: -3871520876617813232
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Parallel HTTP library on top of libcurl multi.