typhoeus 0.6.1 → 0.6.2

data/CHANGELOG.md

@@ -2,7 +2,22 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.1...master)
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.2...master)
+
+## 0.6.2
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.1...v0.6.2)
+
+Enhancements:
+
+* Reintroduce a global cache.
+* `Request#handled_response` falls back to the original response.
+  ([turnerking](https://github.com/turnerking), [\#272](https://github.com/typhoeus/typhoeus/pull/272))
+* When `Errors::NoStub` is raised the `url` is displayed.
+  ([dschneider](https://github.com/dschneider), [\#276](https://github.com/typhoeus/typhoeus/pull/276))
+* Make `Request#hash` consistent.
+* Add `.rvmrc` and `ctags` to `.gitignore`.
+  ([ryankindermann](https://github.com/ryankinderman), [\#274](https://github.com/typhoeus/typhoeus/pull/274))
 
 ## 0.6.1
 
@@ -24,6 +39,8 @@ Enhancements:
 Bugfixes:
 
 * Corrected ssl options for the faraday adapter.
+* The before hook now correctly returns the response.
+  ([Mattias Putman](https://github.com/challengee), [\#268](https://github.com/typhoeus/typhoeus/pull/268))
 * Benchmark is working again.
 
 ## 0.5.4

data/README.md

@@ -1,4 +1,4 @@
-# Typhoeus [![Build Status](https://secure.travis-ci.org/typhoeus/typhoeus.png)](http://travis-ci.org/typhoeus/typhoeus) [<img src="https://codeclimate.com/github/typhoeus/typhoeus.png" height="13" width="89" />](https://codeclimate.com/github/typhoeus/typhoeus)
+# Typhoeus [![Build Status](https://secure.travis-ci.org/typhoeus/typhoeus.png)](http://travis-ci.org/typhoeus/typhoeus) [![Code Climate](https://codeclimate.com/github/typhoeus/typhoeus.png)](https://codeclimate.com/github/typhoeus/typhoeus)
 
 Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
 

data/lib/typhoeus/config.rb

@@ -43,5 +43,13 @@ module Typhoeus
     #
     # @see http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTVERBOSE
     attr_accessor :verbose
+
+    # Defines wether requests are cached.
+    #
+    # @return [ Object ]
+    #
+    # @see Typhoeus::Hydra::Cacheable
+    # @see Typhoeus::Request::Cacheable
+    attr_accessor :cache
   end
 end

data/lib/typhoeus/easy_factory.rb

@@ -51,7 +51,7 @@ module Typhoeus
         easy.http_request(
           request.base_url,
           request.options.fetch(:method, :get),
-          request.options.reject{|k,_| k==:method}
+          request.options.reject{ |k,_| [:method, :cache_ttl].include?(k) }
         )
       rescue Ethon::Errors::InvalidOption => e
         help = provide_help(e.message.match(/:\s(\w+)/)[1])

data/lib/typhoeus/errors/no_stub.rb

@@ -5,7 +5,7 @@ module Typhoeus
     # and making a real request.
     class NoStub < TyphoeusError
       def initialize(request)
-        super("The connection is blocked and no stub defined.")
+        super("The connection is blocked and no stub defined: #{request.url}")
       end
     end
   end

data/lib/typhoeus/hydra.rb

@@ -1,5 +1,6 @@
 require 'typhoeus/hydra/addable'
 require 'typhoeus/hydra/before'
+require 'typhoeus/hydra/cacheable'
 require 'typhoeus/hydra/block_connection'
 require 'typhoeus/hydra/memoizable'
 require 'typhoeus/hydra/queueable'
@@ -41,6 +42,7 @@ module Typhoeus
     include Hydra::Addable
     include Hydra::Runnable
     include Hydra::Memoizable
+    include Hydra::Cacheable
     include Hydra::BlockConnection
     include Hydra::Stubbable
     include Hydra::Before

data/lib/typhoeus/hydra/cacheable.rb

@@ -0,0 +1,13 @@
+module Typhoeus
+  class Hydra
+    module Cacheable
+      def add(request)
+        if request.cacheable? && response = Typhoeus::Config.cache.get(request)
+          request.finish(response)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/typhoeus/pool.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Typhoeus
 
   # The easy pool stores already initialized
@@ -8,15 +10,7 @@ module Typhoeus
   module Pool
     extend self
 
-    # Return the easy pool.
-    #
-    # @example Return easy pool.
-    #   hydra.easy_pool
-    #
-    # @return [ Array<Ethon::Easy> ] The easy pool.
-    def easies
-      @easies ||= []
-    end
+    @mutex = Mutex.new
 
     # Releases easy into pool. The easy handle is
     # resetted before it gets back in.
@@ -25,7 +19,7 @@ module Typhoeus
     #   hydra.release_easy(easy)
     def release(easy)
       easy.reset
-      easies << easy
+      @mutex.synchronize { easies << easy }
     end
 
     # Return an easy from pool.
@@ -35,17 +29,30 @@ module Typhoeus
     #
     # @return [ Ethon::Easy ] The easy.
     def get
-      easies.pop || Ethon::Easy.new
+      @mutex.synchronize { easies.pop } || Ethon::Easy.new
     end
 
     def clear
-      easies.clear
+      @mutex.synchronize { easies.clear }
     end
 
     def with_easy(&block)
       easy = get
       yield easy
-      release easy
+    ensure
+      release(easy) if easy
+    end
+
+    private
+
+    # Return the easy pool.
+    #
+    # @example Return easy pool.
+    #   hydra.easy_pool
+    #
+    # @return [ Array<Ethon::Easy> ] The easy pool.
+    def easies
+      @easies ||= []
     end
   end
 end

data/lib/typhoeus/request.rb

@@ -1,6 +1,7 @@
 require 'typhoeus/request/actions'
 require 'typhoeus/request/before'
 require 'typhoeus/request/block_connection'
+require 'typhoeus/request/cacheable'
 require 'typhoeus/request/callbacks'
 require 'typhoeus/request/marshal'
 require 'typhoeus/request/memoizable'
@@ -26,6 +27,7 @@ module Typhoeus
     include Request::Operations
     include Request::Responseable
     include Request::Memoizable
+    include Request::Cacheable
     include Request::BlockConnection
     include Request::Stubbable
     include Request::Before
@@ -146,7 +148,7 @@ module Typhoeus
     #
     # @api private
     def hash
-      [ self.class, self.base_url, self.options ].hash
+      Digest::MD5.hexdigest("#{self.class.name}#{base_url}#{options}").to_i(16)
     end
 
     private

data/lib/typhoeus/request/cacheable.rb

@@ -0,0 +1,26 @@
+module Typhoeus
+  class Request
+    module Cacheable
+      def response=(response)
+        Typhoeus::Config.cache.set(self, response) if cacheable?
+        super
+      end
+
+      def cacheable?
+        Typhoeus::Config.cache
+      end
+
+      def run
+        if cacheable? && response = Typhoeus::Config.cache.get(self)
+          finish(response)
+        else
+          super
+        end
+      end
+
+      def cache_ttl
+        options[:cache_ttl]
+      end
+    end
+  end
+end

data/lib/typhoeus/response.rb

@@ -26,10 +26,8 @@ module Typhoeus
     # @return [ Hash ]
     attr_accessor :options
 
-    # The handled response.
-    #
-    # @return [ String ]
-    attr_accessor :handled_response
+    # Set the handled response.
+    attr_writer :handled_response
 
     # @api private
     attr_writer :mock
@@ -54,5 +52,14 @@ module Typhoeus
     def mock
       defined?(@mock) ? @mock : options[:mock]
     end
+
+    # Returns the handled_response if it has
+    # been defined otherwise returns the response
+    #
+    # @return [ Object ] The result of callbacks
+    #   done on the response or the original response.
+    def handled_response
+      @handled_response || self
+    end
   end
 end

data/lib/typhoeus/response/informations.rb

@@ -15,6 +15,18 @@ module Typhoeus
         options[:return_code]
       end
 
+      # Returns a string describing the return.
+      #
+      # @example Get return_message.
+      #   response.return_message
+      #
+      # @return [ String ] The return_message.
+      #
+      # @since 0.6.2
+      def return_message
+        Ethon::Curl.easy_strerror(return_code)
+      end
+
       # Return the http response body.
       #
       # @example Get response_body.

data/lib/typhoeus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.5.10
 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:
@@ -50,6 +50,7 @@ files:
 - lib/typhoeus/hydra/addable.rb
 - lib/typhoeus/hydra/before.rb
 - lib/typhoeus/hydra/block_connection.rb
+- lib/typhoeus/hydra/cacheable.rb
 - lib/typhoeus/hydra/memoizable.rb
 - lib/typhoeus/hydra/queueable.rb
 - lib/typhoeus/hydra/runnable.rb
@@ -60,6 +61,7 @@ files:
 - lib/typhoeus/request/actions.rb
 - lib/typhoeus/request/before.rb
 - lib/typhoeus/request/block_connection.rb
+- lib/typhoeus/request/cacheable.rb
 - lib/typhoeus/request/callbacks.rb
 - lib/typhoeus/request/marshal.rb
 - lib/typhoeus/request/memoizable.rb
@@ -92,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1775342987634416595
+      hash: -431775000708918631
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: