typhoeus 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 209f15af78c352c7b5e54d1ad520d6a147eca869
-  data.tar.gz: 1a0a2f51d4ea855c1f50d35036092a4a736abfee
+  metadata.gz: 0e844646bbdb137fea0fc50cf6c8d618ed1ef675
+  data.tar.gz: f2eef78a13606b8c957cae48afea61fe1118117b
 SHA512:
-  metadata.gz: c4fcf5b5dd53cf4efd1eb01a96ec3f987fb494563f94a32338e9a97004bf2ba83b519499b8793d1f3b7a8fdfe331c1cafdff1c05c296d8c71d59193e19353e66
-  data.tar.gz: f9b2ac78c68e374543404cdbbc34dfd3a64ff113f75bf5101a82fde17b62819ac8daebafc8e39d819cae88b7a94da071cf261f4febc0e68948449a375eb09da6
+  metadata.gz: 4e2cd0fdcdf92be70c916a75b95a8d3f6baf794e760c14f8dda7e0812ba965f686a9d720176e082e3cbe6b0cacd3013f79ea8f52deae7242f4728b44dc08b608
+  data.tar.gz: a76443341afde890cc9bfc6feb4e350effc9f8be7f36c5f61eb25d9afd0fcbeba182c675aa7a09bfb3ba514c6269543e4f0d2e5c81f0958c4986e0d9d06a9cd8

data/.travis.yml

@@ -21,3 +21,4 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: ree
+    - rvm: rbx

data/CHANGELOG.md

@@ -2,7 +2,15 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.0.2...master)
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.1.0...master)
+
+## 1.1.0
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.0.2...v1.1.0)
+
+* Unless specified `Expect` header is set to be empty to avoid `100 continue`
+  to be set when using `PUT`
+* Add global config option `Typhoeus::Config.proxy`
 
 ## 1.0.2
 

data/Gemfile

@@ -1,9 +1,11 @@
 source "https://rubygems.org"
 gemspec
 
-if Gem.ruby_version < Gem::Version.new("1.9.3")
+if Gem.ruby_version < Gem::Version.new("2.0.0")
   gem "rake", "< 11"
+  gem "json", "< 2"  
 else
+  gem "json"
   gem "rake"
 end
 
@@ -11,7 +13,6 @@ group :development, :test do
   gem "rspec", "~> 3.0"
 
   gem "sinatra", "~> 1.3"
-  gem "json"
   gem "faraday", ">= 0.9"
 
   if RUBY_PLATFORM == "java"

data/README.md

@@ -2,16 +2,6 @@
 
 Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
 
-# Typhoeus needs your help!
-
-I don't have enough time, but I think this is a nice project! If you or your company is using Typhoeus you should help keeping it alive! Pick any of:
-
-* add docs
-* respond to issues
-* add features
-
-Or send me an email! I would be more than happy to help getting you up to speed!
-
 ## Example
 
 A single request:
@@ -554,6 +544,3 @@ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/typhoeus/typhoeus/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/lib/typhoeus/adapters/faraday.rb

@@ -92,6 +92,7 @@ module Faraday # :nodoc:
             end
           elsif resp.response_code == 0
             env[:typhoeus_connection_failed] = true
+            env[:typhoeus_return_message] = resp.return_message
             unless parallel?(env)
               raise Faraday::Error::ConnectionFailed, resp.return_message
             end

data/lib/typhoeus/config.rb

@@ -58,5 +58,12 @@ module Typhoeus
     #
     # @see Typhoeus::Request#set_defaults
     attr_accessor :user_agent
+
+    # Defines wether to use a proxy server for every request.
+    #
+    # @return [ String ]
+    #
+    # @see Typhoeus::Request#set_defaults
+    attr_accessor :proxy
   end
 end

data/lib/typhoeus/request.rb

@@ -212,8 +212,10 @@ module Typhoeus
       default_user_agent = Config.user_agent || Typhoeus::USER_AGENT
 
       options[:headers] = {'User-Agent' => default_user_agent}.merge(options[:headers] || {})
+      options[:headers]['Expect'] ||= ''
       options[:verbose] = Typhoeus::Config.verbose if options[:verbose].nil? && !Typhoeus::Config.verbose.nil?
       options[:maxredirs] ||= 50
+      options[:proxy] = Typhoeus::Config.proxy unless options.has_key?(:proxy) || Typhoeus::Config.proxy.nil?
     end
   end
 end

data/lib/typhoeus/response/header.rb

@@ -33,6 +33,7 @@ module Typhoeus
           end
         when String
           raw.lines.each do |header|
+            header.strip!
             next if header.empty? || header.start_with?( 'HTTP/1.' )
             process_line(header)
           end

data/lib/typhoeus/version.rb

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

data/spec/typhoeus/adapters/faraday_spec.rb

@@ -123,6 +123,37 @@ describe Faraday::Adapter::Typhoeus do
     end
   end
 
+  context "when the connection failed" do
+    before do
+      stub = Typhoeus::Response.new \
+          :response_code => 0,
+          :return_code => 0,
+          :mock          => true
+
+      Typhoeus.stub(base_url + '/').and_return(stub)
+    end
+
+    context "when parallel" do
+      it "isn't successful" do
+        response = nil
+        conn.in_parallel { response = conn.get("/") }
+        expect(response.success?).to be_falsey
+      end
+
+      it "translates the response code into an error message" do
+        response = nil
+        conn.in_parallel { response = conn.get("/") }
+        expect(response.env[:typhoeus_return_message]).to eq("No error")
+      end
+    end
+
+    context "when not parallel" do
+      it "raises an error" do
+        expect { conn.get("/") }.to raise_error(Faraday::Error::ConnectionFailed, "No error")
+      end
+    end
+  end
+
   describe "#configure_socket" do
     let(:env) { { :request => { :bind => { :host => "interface" } } } }
 

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, :user_agent].each do |name|
+  [:block_connection, :memoize, :verbose, :cache, :user_agent, :proxy].each do |name|
     it "responds to #{name}" do
       expect(config).to respond_to(name)
     end

data/spec/typhoeus/request_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Typhoeus::Request do
   let(:base_url) { "localhost:3001" }
-  let(:options) { {:verbose => true, :headers => { 'User-Agent' => "Fubar" }, :maxredirs => 50} }
+  let(:options) { {:verbose => true, :headers => { 'User-Agent' => "Fubar", 'Expect' => "" }, :maxredirs => 50} }
   let(:request) { Typhoeus::Request.new(base_url, options) }
 
   describe ".url" do
@@ -110,6 +110,23 @@ describe Typhoeus::Request do
         end
       end
     end
+
+    context "when Config.proxy set" do
+      before { Typhoeus.configure { |config| config.proxy = "http://proxy.internal" } }
+      after { Typhoeus.configure { |config| config.proxy = nil } }
+
+      it "respects" do
+        expect(request.options[:proxy]).to eq("http://proxy.internal")
+      end
+
+      context "when option proxy set" do
+        let(:options) { {:proxy => nil} }
+
+        it "does not override" do
+          expect(request.options[:proxy]).to be_nil
+        end
+      end
+    end
   end
 
   describe "#eql?" do
@@ -150,7 +167,7 @@ describe Typhoeus::Request do
 
         context "when different order" do
           let(:other_options) {
-            {:headers => { 'User-Agent' => "Fubar" }, :verbose => true }
+            {:headers => { 'User-Agent' => "Fubar", 'Expect' => ""}, :verbose => true }
           }
           let(:other) { Typhoeus::Request.new(base_url, other_options)}
 
@@ -166,7 +183,7 @@ describe Typhoeus::Request do
     context "when request.eql?(other)" do
       context "when different order" do
         let(:other_options) {
-          {:headers => { 'User-Agent' => "Fubar" }, :verbose => true }
+          {:headers => { 'User-Agent' => "Fubar", 'Expect' => "" }, :verbose => true }
         }
         let(:other) { Typhoeus::Request.new(base_url, other_options)}
 
@@ -211,4 +228,5 @@ describe Typhoeus::Request do
       expect(request.encoded_body).to eq("a=1")
     end
   end
+
 end

data/spec/typhoeus/response/header_spec.rb

@@ -92,6 +92,19 @@ describe Typhoeus::Response::Header do
           expect(header[name.downcase]).to eq(value)
         end
       end
+
+      context 'includes line with only whitespace' do
+          let(:raw) do
+              'HTTP/1.1 200 OK
+               Date: Fri, 29 Jun 2012 10:09:23 GMT
+
+'
+        end
+
+        it 'ignores it' do
+          expect(header).to eq({ 'Date' => 'Fri, 29 Jun 2012 10:09:23 GMT' })
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - David Balatero
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon