typhoeus 0.5.2 → 0.5.3

data/CHANGELOG.md

@@ -2,7 +2,20 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.5.2...master)
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.5.3...master)
+
+## 0.5.3
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.5.2...v0.5.3)
+
+Enhancements:
+
+* When checking options in Expecation#matches? also consider Request#options.
+
+Bugfixes:
+
+* Do not break backwards compatibility with case insensitive headers access.
+* Make sure hydra behaves correct in case of before hooks.
 
 ## 0.5.2
 

data/lib/typhoeus/expectation.rb

@@ -117,8 +117,7 @@ module Typhoeus
     #
     # @api private
     def matches?(request)
-      url_match?(request.url) &&
-        (options ? options.all?{ |k,v| request.original_options[k] == v } : true)
+      url_match?(request.url) && options_match?(request)
     end
 
     # Return canned responses.
@@ -152,6 +151,12 @@ module Typhoeus
 
     private
 
+    # Check wether the options matches the request options.
+    # I checks options and original options.
+    def options_match?(request)
+      (options ? options.all?{ |k,v| request.original_options[k] == v || request.options[k] == v } : true)
+    end
+
     # Check wether the url matches the request url.
     # The url can be a string, regex or nil. String and
     # regexp were checked, nil is always true. Else false.

data/lib/typhoeus/hydra/runnable.rb

@@ -11,8 +11,12 @@ module Typhoeus
       #
       # @return [ Symbol ] Return value from multi.perform.
       def run
-        queued_requests.pop(max_concurrency).map do |request|
-          add(request)
+        number_requests = 0
+        loop do
+          break if number_requests == max_concurrency || queued_requests.empty?
+          number_requests += queued_requests.pop(max_concurrency).map do |request|
+            add(request)
+          end.size
         end
         multi.perform
       end

data/lib/typhoeus/response/header.rb

@@ -28,6 +28,12 @@ module Typhoeus
         end
       end
 
+      def [](key)
+        self.each do |k, v|
+          return v if k.downcase == key.downcase
+        end
+      end
+
       private
 
       # Processes line and saves the result.
@@ -35,10 +41,9 @@ module Typhoeus
       # @return [ void ]
       def process_line(header)
         key, value = header.split(':', 2).map(&:strip)
-        key = key.downcase
         if self.has_key?(key)
           self[key] = [self[key]] unless self[key].is_a? Array
-          self[key] << value
+          self[key].push(value)
         else
           self[key] = value
         end

data/lib/typhoeus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2893915302486658705
+      hash: 419611758295813081
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: