excon 0.30.0 → 0.31.0

data/tests/middlewares/decompress_tests.rb

@@ -3,19 +3,22 @@ Shindo.tests('Excon Decompress Middleware') do
 
   with_server('good') do
 
-    connection = Excon.new(
-      'http://127.0.0.1:9292/echo/content-encoded',
-      :method => :post,
-      :body => 'hello world',
-      :middlewares => Excon.defaults[:middlewares] + [Excon::Middleware::Decompress]
-    )
+    before do
+      @connection ||= Excon.new(
+        'http://127.0.0.1:9292/echo/content-encoded',
+        :method => :post,
+        :body => 'hello world',
+        :middlewares => Excon.defaults[:middlewares] + [Excon::Middleware::Decompress]
+      )
+    end
 
     tests('gzip') do
-      resp = connection.request(
-        :headers => { 'Accept-Encoding' => 'gzip, deflate;q=0' }
-      )
+      resp = nil
 
       tests('response body decompressed').returns('hello world') do
+        resp = @connection.request(
+          :headers => { 'Accept-Encoding' => 'gzip, deflate;q=0' }
+        )
         resp[:body]
       end
 
@@ -29,11 +32,12 @@ Shindo.tests('Excon Decompress Middleware') do
     end
 
     tests('deflate') do
-      resp = connection.request(
-        :headers => { 'Accept-Encoding' => 'gzip;q=0, deflate' }
-      )
+      resp = nil
 
       tests('response body decompressed').returns('hello world') do
+        resp = @connection.request(
+          :headers => { 'Accept-Encoding' => 'gzip;q=0, deflate' }
+        )
         resp[:body]
       end
 
@@ -47,12 +51,13 @@ Shindo.tests('Excon Decompress Middleware') do
     end
 
     tests('with pre-encoding') do
-      resp = connection.request(
-        :headers => { 'Accept-Encoding' => 'gzip, deflate;q=0',
-                      'Content-Encoding-Pre' => 'other' }
-      )
+      resp = nil
 
       tests('server sent content-encoding').returns('other, gzip') do
+        resp = @connection.request(
+          :headers => { 'Accept-Encoding' => 'gzip, deflate;q=0',
+                        'Content-Encoding-Pre' => 'other' }
+        )
         resp[:headers]['Content-Encoding-Sent']
       end
 
@@ -67,12 +72,13 @@ Shindo.tests('Excon Decompress Middleware') do
     end
 
     tests('with post-encoding') do
-      resp = connection.request(
-        :headers => { 'Accept-Encoding' => 'gzip, deflate;q=0',
-                      'Content-Encoding-Post' => 'other' }
-      )
+      resp = nil
 
       tests('server sent content-encoding').returns('gzip, other') do
+        resp = @connection.request(
+          :headers => { 'Accept-Encoding' => 'gzip, deflate;q=0',
+                        'Content-Encoding-Post' => 'other' }
+        )
         resp[:headers]['Content-Encoding-Sent']
       end
 
@@ -87,15 +93,16 @@ Shindo.tests('Excon Decompress Middleware') do
     end
 
     tests('with a :response_block') do
+      captures = nil
       resp = nil
-      captures = capture_response_block do |block|
-        resp = connection.request(
-          :headers => { 'Accept-Encoding' => 'gzip'},
-          :response_block => block
-        )
-      end
 
       tests('server sent content-encoding').returns('gzip') do
+        captures = capture_response_block do |block|
+          resp = @connection.request(
+            :headers => { 'Accept-Encoding' => 'gzip'},
+            :response_block => block
+          )
+        end
         resp[:headers]['Content-Encoding-Sent']
       end
 
@@ -125,7 +132,7 @@ Shindo.tests('Excon Decompress Middleware') do
 
       tests('with a :response_block').returns(nil) do
         captures = capture_response_block do |block|
-          resp = Excon.post(
+          Excon.post(
             'http://127.0.0.1:9292/echo/request',
             :body => 'hello world',
             :response_block => block,

data/tests/middlewares/instrumentation_tests.rb

@@ -1,4 +1,5 @@
 require 'active_support/notifications'
+require 'securerandom'
 
 class SimpleInstrumentor
   class << self
@@ -166,12 +167,12 @@ Shindo.tests('Excon instrumentation') do
         original_stderr = $stderr
         $stderr = @captured_stderr = StringIO.new
         stub_failure
-        @connection = Excon.new(
-          'http://user:pass@127.0.0.1:9292',
-          :instrumentor => Excon::StandardInstrumentor,
-          :mock         => true
-        )
         raises(Excon::Errors::SocketError) do
+          @connection = Excon.new(
+            'http://user:pass@127.0.0.1:9292',
+            :instrumentor => Excon::StandardInstrumentor,
+            :mock         => true
+          )
           @connection.get(:idempotent => true)
         end
       ensure
@@ -196,12 +197,12 @@ Shindo.tests('Excon instrumentation') do
         original_stderr = $stderr
         $stderr = @captured_stderr = StringIO.new
         stub_failure
-        @connection = Excon.new(
-          'http://user:pass@127.0.0.1:9292',
-          :instrumentor => Excon::StandardInstrumentor,
-          :mock         => true
-          )
         raises(Excon::Errors::SocketError) do
+          @connection = Excon.new(
+            'http://user:pass@127.0.0.1:9292',
+            :instrumentor => Excon::StandardInstrumentor,
+            :mock         => true
+            )
           @connection.get(:idempotent => true)
         end
       ensure

data/tests/middlewares/mock_tests.rb

@@ -15,13 +15,15 @@ Shindo.tests('Excon stubs') do
   end
 
   tests("stub({:method => :get}, {:body => 'body', :status => 200})") do
+    connection = nil
+    response = nil
 
-    Excon.stub({:method => :get}, {:body => 'body', :status => 200})
+    tests('response.body').returns('body') do
+      Excon.stub({:method => :get}, {:body => 'body', :status => 200})
 
-    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    response = connection.request(:method => :get, :path => '/content-length/100')
+      connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+      response = connection.request(:method => :get, :path => '/content-length/100')
 
-    tests('response.body').returns('body') do
       response.body
     end
 
@@ -47,18 +49,20 @@ Shindo.tests('Excon stubs') do
   end
 
   tests("stub({:path => %r{/tests/(\S+)}}, {:body => $1, :status => 200})") do
+    connection = nil
+    response = nil
 
-    Excon.stub({:path => %r{/tests/(\S+)}}) do |params|
-      {
-        :body => params[:captures][:path].first,
-        :status => 200
-      }
-    end
+    tests('response.body').returns('test') do
+      Excon.stub({:path => %r{/tests/(\S+)}}) do |params|
+        {
+          :body => params[:captures][:path].first,
+          :status => 200
+        }
+      end
 
-    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    response = connection.request(:method => :get, :path => '/tests/test')
+      connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+      response = connection.request(:method => :get, :path => '/tests/test')
 
-    tests('response.body').returns('test') do
       response.body
     end
 
@@ -75,13 +79,15 @@ Shindo.tests('Excon stubs') do
   end
 
   tests("stub({:body => 'body', :method => :get}) {|params| {:body => params[:body], :headers => params[:headers], :status => 200}}") do
+    connection = nil
+    response = nil
 
-    Excon.stub({:body => 'body', :method => :get}) {|params| {:body => params[:body], :headers => params[:headers], :status => 200}}
+    tests('response.body').returns('body') do
+      Excon.stub({:body => 'body', :method => :get}) {|params| {:body => params[:body], :headers => params[:headers], :status => 200}}
 
-    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    response = connection.request(:body => 'body', :method => :get, :path => '/content-length/100')
+      connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+      response = connection.request(:body => 'body', :method => :get, :path => '/content-length/100')
 
-    tests('response.body').returns('body') do
       response.body
     end
 
@@ -108,17 +114,17 @@ Shindo.tests('Excon stubs') do
 
   tests("stub({:body => File.open(...), :method => :get}, { :status => 200 })") do
 
-    file_path = File.join(File.dirname(__FILE__), '..', 'data', 'xs')
+    tests('response.status').returns(200) do
+      file_path = File.join(File.dirname(__FILE__), '..', 'data', 'xs')
 
-    Excon.stub(
-      { :body => File.read(file_path), :method => :get },
-      { :status => 200 }
-    )
+      Excon.stub(
+        { :body => File.read(file_path), :method => :get },
+        { :status => 200 }
+      )
 
-    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    response = connection.request(:body => File.open(file_path), :method => :get, :path => '/')
+      connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+      response = connection.request(:body => File.open(file_path), :method => :get, :path => '/')
 
-    tests('response.status') do
       response.status
     end
 
@@ -134,10 +140,10 @@ Shindo.tests('Excon stubs') do
   Excon.stubs.clear
 
   tests("stub({}, {:body => 'x' * (Excon::DEFAULT_CHUNK_SIZE + 1)})") do
-    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    Excon.stub({}, {:body => 'x' * (Excon::DEFAULT_CHUNK_SIZE + 1)})
-
     test("with response_block") do
+      connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+      Excon.stub({}, {:body => 'x' * (Excon::DEFAULT_CHUNK_SIZE + 1)})
+
       chunks = []
       response_block = lambda do |chunk, remaining_bytes, total_bytes|
         chunks << chunk
@@ -150,33 +156,33 @@ Shindo.tests('Excon stubs') do
   Excon.stubs.clear
 
   tests("stub({:url => 'https://user:pass@foo.bar.com:9999/baz?quux=true'}, {:status => 200})") do
-    Excon.stub({:url => 'https://user:pass@foo.bar.com:9999/baz?quux=true'}, {:status => 200})
-
-    tests("get(:expects => 200)") do
+    test("get(:expects => 200)") do
+      Excon.stub({:url => 'https://user:pass@foo.bar.com:9999/baz?quux=true'}, {:status => 200})
       Excon.new("https://user:pass@foo.bar.com:9999/baz?quux=true", :mock => true).get(:expects => 200)
+      true
     end
   end
 
   Excon.stubs.clear
 
   tests("stub({}, {:status => 404, :body => 'Not Found'}") do
-
-    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    Excon.stub({}, {:status => 404, :body => 'Not Found'})
+    connection = nil
 
     tests("request(:expects => 200, :method => :get, :path => '/')").raises(Excon::Errors::NotFound) do
+      connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+      Excon.stub({}, {:status => 404, :body => 'Not Found'})
+
       connection.request(:expects => 200, :method => :get, :path => '/')
     end
 
-    tests("Expects exception should contain response object") do
+    tests("Expects exception should contain response object").returns(Excon::Response) do
       begin
         connection.request(:expects => 200, :method => :get, :path => '/')
       rescue Excon::Errors::NotFound => e
-        returns(Excon::Response) { e.response.class }
+        e.response.class
       end
     end
 
-
     test("request(:expects => 200, :method => :get, :path => '/') with block does not invoke the block since it raises an error") do
       block_called = false
       begin
@@ -194,10 +200,10 @@ Shindo.tests('Excon stubs') do
   end
 
   tests("stub_for({})") do
-    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    Excon.stub({}, {})
-
     tests("stub_for({})").returns([{}, {}]) do
+      Excon.new('http://127.0.0.1:9292', :mock => true)
+      Excon.stub({}, {})
+
       Excon.stub_for({})
     end
 
@@ -205,10 +211,12 @@ Shindo.tests('Excon stubs') do
   end
 
   tests("unstub({})") do
-    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    Excon.stub({}, {})
+    connection = nil
 
     tests("unstub({})").returns([{}, {}]) do
+      connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+      Excon.stub({}, {})
+
       Excon.unstub({})
     end
 
@@ -219,11 +227,5 @@ Shindo.tests('Excon stubs') do
     Excon.stubs.clear
   end
 
-  tests('mock = false') do
-    with_rackup('basic.ru') do
-      basic_tests
-    end
-  end
-
   env_restore
 end

data/tests/middlewares/redirect_follower_tests.rb

@@ -1,31 +1,30 @@
 Shindo.tests('Excon redirector support') do
   env_init
 
-  connection = Excon.new(
-    'http://127.0.0.1:9292',
-    :middlewares  => Excon.defaults[:middlewares] + [Excon::Middleware::RedirectFollower],
-    :mock         => true
-  )
-
-  Excon.stub(
-    { :path => '/old' },
-    {
-      :headers  => { 'Location' => 'http://127.0.0.1:9292/new' },
-      :body     => 'old',
-      :status   => 301
-    }
-  )
-
-  Excon.stub(
-    { :path => '/new' },
-    {
-      :body     => 'new',
-      :status   => 200
-    }
-  )
-
   tests("request(:method => :get, :path => '/old').body").returns('new') do
-    connection.request(:method => :get, :path => '/old').body
+    Excon.stub(
+      { :path => '/old' },
+      {
+        :headers  => { 'Location' => 'http://127.0.0.1:9292/new' },
+        :body     => 'old',
+        :status   => 301
+      }
+    )
+
+    Excon.stub(
+      { :path => '/new' },
+      {
+        :body     => 'new',
+        :status   => 200
+      }
+    )
+
+    Excon.get(
+      'http://127.0.0.1:9292',
+      :path         => '/old',
+      :middlewares  => Excon.defaults[:middlewares] + [Excon::Middleware::RedirectFollower],
+      :mock         => true
+    ).body
   end
 
   env_restore
@@ -33,33 +32,32 @@ end
 
 Shindo.tests('Excon redirect support for relative Location headers') do
   env_init
-  
-  connection = Excon.new(
-    'http://127.0.0.1:9292',
-    :middlewares  => Excon.defaults[:middlewares] + [Excon::Middleware::RedirectFollower],
-    :mock         => true
-  )
-
-  Excon.stub(
-    { :path => '/old' },
-    {
-      :headers  => { 'Location' => '/new' },
-      :body     => 'old',
-      :status   => 301
-    }
-  )
-
-  Excon.stub(
-    { :path => '/new' },
-    {
-      :body     => 'new',
-      :status   => 200
-    }
-  )
 
   tests("request(:method => :get, :path => '/old').body").returns('new') do
-    connection.request(:method => :get, :path => '/old').body
+    Excon.stub(
+      { :path => '/old' },
+      {
+        :headers  => { 'Location' => '/new' },
+        :body     => 'old',
+        :status   => 301
+      }
+    )
+
+    Excon.stub(
+      { :path => '/new' },
+      {
+        :body     => 'new',
+        :status   => 200
+      }
+    )
+
+    Excon.get(
+      'http://127.0.0.1:9292',
+      :path         => '/old',
+      :middlewares  => Excon.defaults[:middlewares] + [Excon::Middleware::RedirectFollower],
+      :mock         => true
+    ).body
   end
-  
+
   env_restore
 end