typhoeus 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 258c4fa9fa36f07af4d6b3b5aff63ff005927660
-  data.tar.gz: b6258b32116ff79087392c2e3003ad809a9d5c50
+  metadata.gz: d6141d4a4fce3468605180e9fa209f44dcadb297
+  data.tar.gz: f44b3f1fc22744bee6e552bad735bbeed1acca25
 SHA512:
-  metadata.gz: 482769a76a20585b3c02aa42b356c4316a10e6765c542a777f51ba5d8e0b7723d7657fb2b9a8ba961feea9cf53f36644afcd35d0ff459af46a908e41e71656f7
-  data.tar.gz: 53adcad9bb067d2a10be8ddfb19342924887b02bc140b508ba061d1608b085946d9521f681d5766554fa3dbb3602bd0c312536709854ee64593ccbfc426f3d88
+  metadata.gz: 22303b457d981211f37f0da3f056d9a78e97be9c907878b9ab3ae497db3f09c0975c1d0b305f30ffd75c308d5fa08ce3aee22314591b0e056cebabd402529195
+  data.tar.gz: 35ca8ddee5fe6122677ea2823b1c9db407e848e2070dc59f78780d88c56fe5d8cf7d6386fe6e0e8d1f5dde624bfec704aa9dad4d34afd95dde922c8f10a863f5

data/README.md

@@ -506,6 +506,15 @@ Typhoeus::Config.verbose = true
 Just remember that libcurl prints it’s debug output to the console (to
 STDERR), so you’ll need to run your scripts from the console to see it.
 
+### Default User Agent Header
+
+In many cases, all HTTP requests made by an application require the same User-Agent header set. Instead of supplying it on a per-request basis by supplying a custom header, it is possible to override it for all requests using:
+
+
+```ruby
+Typhoeus::Config.user_agent = "custom user agent"
+```
+
 ### Running the specs
 
 Running the specs should be as easy as:
@@ -514,6 +523,9 @@ Running the specs should be as easy as:
 bundle install
 bundle exec rake
 ```
+## Semantic Versioning
+
+This project conforms to [semver](http://semver.org/).
 
 ## LICENSE
 
@@ -545,4 +557,3 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/typhoeus/typhoeus/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/lib/typhoeus/config.rb

@@ -51,5 +51,12 @@ module Typhoeus
     # @see Typhoeus::Hydra::Cacheable
     # @see Typhoeus::Request::Cacheable
     attr_accessor :cache
+
+    # Defines whether to use a default user agent.
+    #
+    # @return [ String ]
+    #
+    # @see Typhoeus::Request#set_defaults
+    attr_accessor :user_agent
   end
 end

data/lib/typhoeus/request.rb

@@ -209,10 +209,12 @@ module Typhoeus
 
     # Sets default header and verbose when turned on.
     def set_defaults
+      default_user_agent = Config.user_agent || Typhoeus::USER_AGENT
+
       if @options[:headers]
-        @options[:headers] = {'User-Agent' => Typhoeus::USER_AGENT}.merge(options[:headers])
+        @options[:headers] = {'User-Agent' => default_user_agent}.merge(options[:headers])
       else
-        @options[:headers] = {'User-Agent' => Typhoeus::USER_AGENT}
+        @options[:headers] = {'User-Agent' => default_user_agent}
       end
       @options[:verbose] = Typhoeus::Config.verbose if @options[:verbose].nil? && !Typhoeus::Config.verbose.nil?
       @options[:maxredirs] ||= 50

data/lib/typhoeus/version.rb

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

data/spec/typhoeus/config_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Typhoeus::Config do
   let(:config) { Typhoeus::Config }
 
-  [:block_connection, :memoize, :verbose, :cache].each do |name|
+  [:block_connection, :memoize, :verbose, :cache, :user_agent].each do |name|
     it "responds to #{name}" do
       expect(config).to respond_to(name)
     end

data/spec/typhoeus/request_spec.rb

@@ -65,6 +65,27 @@ describe Typhoeus::Request do
       end
     end
 
+    context "when Config.user_agent set" do
+      before { Typhoeus.configure { |config| config.user_agent = "Default" } }
+      after { Typhoeus.configure { |config| config.user_agent = nil } }
+
+      context "with headers" do
+        let(:options) { {:headers => { "User-Agent" => "Fubar" } } }
+
+        it "uses the request options' user agent" do
+          expect(request.options[:headers]["User-Agent"]).to eq("Fubar")
+        end
+      end
+
+      context "without headers" do
+        let(:options) { {:headers => {} } }
+
+        it "uses the global options' user agent" do
+          expect(request.options[:headers]["User-Agent"]).to eq("Default")
+        end
+      end
+    end
+
     context "when Config.verbose set" do
       before { Typhoeus.configure { |config| config.verbose = true} }
       after { Typhoeus.configure { |config| config.verbose = false} }

data/typhoeus.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.license = 'MIT'
 
-  s.add_dependency('ethon', [">= 0.7.4"])
+  s.add_dependency('ethon', [">= 0.8.0"])
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - David Balatero
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.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: