typhoeus 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6141d4a4fce3468605180e9fa209f44dcadb297
-  data.tar.gz: f44b3f1fc22744bee6e552bad735bbeed1acca25
+  metadata.gz: d43b52d7dfc8cb4542b1670f07f43351906129ba
+  data.tar.gz: 3ff1f2870c76247f16ce94c00e7f534dafe6c879
 SHA512:
-  metadata.gz: 22303b457d981211f37f0da3f056d9a78e97be9c907878b9ab3ae497db3f09c0975c1d0b305f30ffd75c308d5fa08ce3aee22314591b0e056cebabd402529195
-  data.tar.gz: 35ca8ddee5fe6122677ea2823b1c9db407e848e2070dc59f78780d88c56fe5d8cf7d6386fe6e0e8d1f5dde624bfec704aa9dad4d34afd95dde922c8f10a863f5
+  metadata.gz: fda1a066fe0e0d0a6c078540d85b87739fe7e24907b92e272dc86d473cc9d6a01bc726047f942efc5a7a1a35da62dcfe2bff10c952469c464174ab1592d1c10c
+  data.tar.gz: d407bebd52067ed31b54e4b72a5d5e8ce65f9d43b9fe17e00fd4e7ae024bff905f95ff268e6ca22d2aad90a8fec440c1d69ae9171c83ed68c832831a5699c703

data/.travis.yml

@@ -1,4 +1,5 @@
 script: "bundle exec rake"
+sudo: false
 rvm:
   - 1.8.7
   - 1.9.2

data/CHANGELOG.md

@@ -2,7 +2,27 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.7.3...master)
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.0.0...master)
+
+## 1.0.0
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.8.0...v1.0.0)
+
+## O.8.0
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.7.3...v0.8.0)
+
+* `EasyFactory`: Reduced object allocations and method calls during deprecated
+    option handling and option sanitization.
+  ([Tasos Laskos](https://github.com/zapotek))
+* `Response` ([Tasos Laskos](https://github.com/zapotek))
+    * `Header`
+        * `#process_pair`: Halved `#set_value` calls.
+        * `#set_value`: Minimized `Hash` accesses.
+        * `#parse`: Use `String#start_with?` instead of `Regexp` match.
+        * `#process_line`: Optimized key/value sanitization.
+    * `Status`
+        * `#timed_out?`: Only return `true` when `#return_code` is `operation_timedout`.
 
 ## 0.7.3
 

data/lib/typhoeus/adapters/faraday.rb

@@ -86,11 +86,15 @@ module Faraday # :nodoc:
 
         req.on_complete do |resp|
           if resp.timed_out?
-            if parallel?(env)
-              # TODO: error callback in async mode
-            else
+            env[:typhoeus_timed_out] = true
+            unless parallel?(env)
               raise Faraday::Error::TimeoutError, "request timed out"
             end
+          elsif resp.response_code == 0
+            env[:typhoeus_connection_failed] = true
+            unless parallel?(env)
+              raise Faraday::Error::ConnectionFailed, resp.return_message
+            end
           end
 
           save_response(env, resp.code, resp.body) do |response_headers|
@@ -137,8 +141,8 @@ module Faraday # :nodoc:
 
       def configure_timeout(req, env)
         env_req = env[:request]
-        req.options[:timeout_ms] = (env_req[:timeout] * 1000)             if env_req[:timeout]
-        req.options[:connecttimeout_ms] = (env_req[:open_timeout] * 1000) if env_req[:open_timeout]
+        req.options[:timeout_ms] = (env_req[:timeout] * 1000).to_i             if env_req[:timeout]
+        req.options[:connecttimeout_ms] = (env_req[:open_timeout] * 1000).to_i if env_req[:open_timeout]
       end
 
       def configure_socket(req, env)

data/lib/typhoeus/easy_factory.rb

@@ -8,6 +8,34 @@ module Typhoeus
   # @api private
   class EasyFactory
 
+    RENAMED_OPTIONS =  {
+          :auth_method => :httpauth,
+          :connect_timeout => :connecttimeout,
+          :encoding => :accept_encoding,
+          :follow_location => :followlocation,
+          :max_redirects => :maxredirs,
+          :proxy_type => :proxytype,
+          :ssl_cacert => :cainfo,
+          :ssl_capath => :capath,
+          :ssl_cert => :sslcert,
+          :ssl_cert_type => :sslcerttype,
+          :ssl_key => :sslkey,
+          :ssl_key_password => :keypasswd,
+          :ssl_key_type => :sslkeytype,
+          :ssl_version => :sslversion,
+      }
+
+    CHANGED_OPTIONS =  {
+          :disable_ssl_host_verification => :ssl_verifyhost,
+          :disable_ssl_peer_verification => :ssl_verifypeer,
+          :proxy_auth_method => :proxyauth,
+      }
+
+    REMOVED_OPTIONS =  Set.new([:cache_key_basis, :cache_timeout, :user_agent])
+
+    SANITIZE_IGNORE  = Set.new([:method, :cache_ttl])
+    SANITIZE_TIMEOUT = Set.new([:timeout_ms, :connecttimeout_ms])
+
     # Returns the request provided.
     #
     # @return [ Typhoeus::Request ]
@@ -69,12 +97,12 @@ module Typhoeus
       sanitized = {:nosignal => true}
       request.options.each do |k,v|
         s = k.to_sym
-        next if [:method, :cache_ttl].include?(s)
-        if new_option = renamed_options[k.to_sym]
+        next if SANITIZE_IGNORE.include?(s)
+        if new_option = RENAMED_OPTIONS[k.to_sym]
           warn("Deprecated option #{k}. Please use #{new_option} instead.")
           sanitized[new_option] = v
         # sanitize timeouts
-        elsif [:timeout_ms, :connecttimeout_ms].include?(s)
+        elsif SANITIZE_TIMEOUT.include?(s)
           if !v.integer?
             warn("Value '#{v}' for option '#{k}' must be integer.")
           end
@@ -134,41 +162,10 @@ module Typhoeus
       end
     end
 
-    def renamed_options
-      {
-        :auth_method => :httpauth,
-        :connect_timeout => :connecttimeout,
-        :encoding => :accept_encoding,
-        :follow_location => :followlocation,
-        :max_redirects => :maxredirs,
-        :proxy_type => :proxytype,
-        :ssl_cacert => :cainfo,
-        :ssl_capath => :capath,
-        :ssl_cert => :sslcert,
-        :ssl_cert_type => :sslcerttype,
-        :ssl_key => :sslkey,
-        :ssl_key_password => :keypasswd,
-        :ssl_key_type => :sslkeytype,
-        :ssl_version => :sslversion,
-      }
-    end
-
-    def changed_options
-      {
-        :disable_ssl_host_verification => :ssl_verifyhost,
-        :disable_ssl_peer_verification => :ssl_verifypeer,
-        :proxy_auth_method => :proxyauth,
-      }
-    end
-
-    def removed_options
-      [:cache_key_basis, :cache_timeout, :user_agent]
-    end
-
     def provide_help(option)
-      if new_option = changed_options[option.to_sym]
+      if new_option = CHANGED_OPTIONS[option.to_sym]
         "\nPlease try #{new_option} instead of #{option}." if new_option
-      elsif removed_options.include?(option.to_sym)
+      elsif REMOVED_OPTIONS.include?(option.to_sym)
         "\nThe option #{option} was removed."
       end
     end

data/lib/typhoeus/expectation.rb

@@ -137,7 +137,7 @@ module Typhoeus
     # @return [ void ]
     def and_return(response=nil, &block)
       new_response = (response.nil? ? block : response)
-      responses.push *new_response
+      responses.push(*new_response)
     end
 
     # Checks whether this expectation matches

data/lib/typhoeus/hydra.rb

@@ -88,7 +88,7 @@ module Typhoeus
     #   Ethon::Multi#initialize
     def initialize(options = {})
       @options = options
-      @max_concurrency = @options.fetch(:max_concurrency, 200)
+      @max_concurrency = Integer(@options.fetch(:max_concurrency, 200))
       @multi = Ethon::Multi.new(options.reject{|k,_| k==:max_concurrency})
     end
   end

data/lib/typhoeus/request.rb

@@ -211,13 +211,9 @@ module Typhoeus
     def set_defaults
       default_user_agent = Config.user_agent || Typhoeus::USER_AGENT
 
-      if @options[:headers]
-        @options[:headers] = {'User-Agent' => default_user_agent}.merge(options[:headers])
-      else
-        @options[:headers] = {'User-Agent' => default_user_agent}
-      end
-      @options[:verbose] = Typhoeus::Config.verbose if @options[:verbose].nil? && !Typhoeus::Config.verbose.nil?
-      @options[:maxredirs] ||= 50
+      options[:headers] = {'User-Agent' => default_user_agent}.merge(options[:headers] || {})
+      options[:verbose] = Typhoeus::Config.verbose if options[:verbose].nil? && !Typhoeus::Config.verbose.nil?
+      options[:maxredirs] ||= 50
     end
   end
 end

data/lib/typhoeus/request/streamable.rb

@@ -27,7 +27,7 @@ module Typhoeus
       #
       # @return [ Boolean ] True if any on_body blocks have been set.
       def streaming?
-        @on_body && @on_body.any?
+        defined?(@on_body) && @on_body.any?
       end
     end
   end

data/lib/typhoeus/response/cacheable.rb

@@ -7,7 +7,7 @@ module Typhoeus
       attr_writer :cached
 
       def cached?
-        !!@cached
+        defined?(@cached) ? !!@cached : false
       end
     end
   end

data/lib/typhoeus/response/header.rb

@@ -32,7 +32,7 @@ module Typhoeus
           end
         when String
           raw.lines.each do |header|
-            next if header.empty? || header =~ /^HTTP\/1.[01]/
+            next if header.empty? || header.start_with?( 'HTTP/1.' )
             process_line(header)
           end
         end
@@ -44,8 +44,8 @@ module Typhoeus
       #
       # @return [ void ]
       def process_line(header)
-        key, value = header.split(':', 2).map(&:strip)
-        process_pair(key, value)
+        key, value = header.split(':', 2)
+        process_pair(key.strip, value.strip)
       end
 
       # Sets key value pair for self and @sanitized.
@@ -53,16 +53,20 @@ module Typhoeus
       # @return [ void ]
       def process_pair(key, value)
         set_value(key, value, self)
-        set_value(key.downcase, value, @sanitized)
+        @sanitized[key.downcase] = self[key]
       end
 
       # Sets value for key in specified hash
       #
       # @return [ void ]
       def set_value(key, value, hash)
-        if hash.has_key?(key)
-          hash[key] = [hash[key]] unless hash[key].is_a? Array
-          hash[key].push(value)
+        current_value = hash[key]
+        if current_value
+          if current_value.is_a? Array
+            current_value << value
+          else
+            hash[key] = [current_value, value]
+          end
         else
           hash[key] = value
         end

data/lib/typhoeus/response/status.rb

@@ -59,14 +59,14 @@ module Typhoeus
         (mock || return_code == :ok) && response_code && response_code != 304
       end
 
-      # Return wether the response is timed out.
+      # Return whether the response is timed out.
       #
       # @example Return if the response timed out.
       #  response.timed_out?
       #
       # @return [ Boolean ] Return true if timed out, false else.
       def timed_out?
-        [:operation_timedout, :couldnt_connect].include?(return_code)
+        return_code == :operation_timedout
       end
 
       private

data/lib/typhoeus/version.rb

@@ -1,5 +1,5 @@
 module Typhoeus
 
   # The current Typhoeus version.
-  VERSION = '0.8.0'
+  VERSION = '1.0.0'
 end

data/spec/typhoeus/hydra/queueable_spec.rb

@@ -83,6 +83,16 @@ describe Typhoeus::Hydra::Queueable do
           hydra.dequeue_many
         end
       end
+
+      context "when max_concurrency is a string" do
+        let(:options) { {:max_concurrency => "2"} }
+        it "adds requests from queue to multi" do
+          expect(hydra).to receive(:add).with(first)
+          expect(hydra).to receive(:add).with(second)
+          expect(hydra).to_not receive(:add).with(third)
+          hydra.dequeue_many
+        end
+      end
     end
   end
 end

data/spec/typhoeus/response/status_spec.rb

@@ -12,22 +12,6 @@ describe Typhoeus::Response::Status do
         expect(response).to be_timed_out
       end
     end
-
-    context "when return code is couldnt_connect" do
-      let(:options) { {:return_code => :couldnt_connect} }
-
-      it "return true" do
-        expect(response).to be_timed_out
-      end
-    end
-
-    context "when return code is not operation_timedout or couldnt_connect" do
-      let(:options) { {:return_code => 14} }
-
-      it "returns false" do
-        expect(response).to_not be_timed_out
-      end
-    end
   end
 
   describe "#status_message" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - David Balatero
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon