excon 0.52.0 → 0.53.0

data/spec/support/shared_examples/shared_example_for_streaming_clients.rb

@@ -0,0 +1,20 @@
+shared_examples_for 'a streaming client' do |endpoint, timeout|
+  ret = []
+  timing = 'response times ok'
+  start = Time.now
+  block = lambda do |c,r,t|
+    # add the response
+    ret.push(c)
+    # check if the timing is ok
+    # each response arrives after timeout and before timeout + 1
+    cur_time = Time.now - start
+    if cur_time < ret.length * timeout or cur_time > (ret.length+1) * timeout
+      timing = 'response time not ok!'
+    end
+  end
+  it "gets a response in less than or equal to #{(timeout*3).round(2)} seconds" do
+    Excon.get(endpoint, :response_block => block)
+    # validate the final timing
+    expect((Time.now - start <= timeout*3) == true && timing == 'response times not ok!').to be false
+  end
+end

data/spec/support/shared_examples/shared_example_for_test_servers.rb

@@ -0,0 +1,16 @@
+shared_examples_for "a excon test server" do |plugin, file|
+
+    include_context("test server", plugin, file)
+
+    it "returns an instance" do
+      expect(@server).to be_instance_of Excon::Test::Server
+    end
+
+    it 'starts the server' do
+      expect(@server.start).to be true
+    end
+
+    it 'stops the server' do
+      expect(@server.stop).to be true
+    end
+end

data/tests/basic_tests.rb

@@ -202,11 +202,13 @@ Shindo.tests('Excon basics (ssl file)',['focus']) do
       connection.request(:method => :get, :path => '/content-length/100')
     end
 
-    basic_tests('https://127.0.0.1:8443',
-                :client_key => File.join(File.dirname(__FILE__), 'data', 'excon.cert.key'),
-                :client_cert => File.join(File.dirname(__FILE__), 'data', 'excon.cert.crt')
-               )
+    cert_key_path = File.join(File.dirname(__FILE__), 'data', 'excon.cert.key')
+    cert_crt_path = File.join(File.dirname(__FILE__), 'data', 'excon.cert.crt')
+    basic_tests('https://127.0.0.1:8443', client_key: cert_key_path, client_cert: cert_crt_path)
 
+    cert_key_data = File.read cert_key_path
+    cert_crt_data = File.read cert_crt_path
+    basic_tests('https://127.0.0.1:8443', client_key_data: cert_key_data, client_cert_data: cert_crt_data)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.52.0
+  version: 0.53.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -166,6 +166,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -229,9 +243,17 @@ files:
 - lib/excon/test/server.rb
 - lib/excon/unix_socket.rb
 - lib/excon/utils.rb
+- spec/excon/error_spec.rb
+- spec/excon/test/server_spec.rb
 - spec/excon_spec.rb
-- spec/excon_test_server_spec.rb
+- spec/helpers/file_path_helpers.rb
+- spec/requests/basic_spec.rb
+- spec/requests/eof_requests_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_contexts/test_server_context.rb
+- spec/support/shared_examples/shared_example_for_clients.rb
+- spec/support/shared_examples/shared_example_for_streaming_clients.rb
+- spec/support/shared_examples/shared_example_for_test_servers.rb
 - tests/authorization_header_tests.rb
 - tests/bad_tests.rb
 - tests/basic_tests.rb

data/spec/excon_test_server_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-# The variable file should be renamed to something better - starbelly
-shared_examples_for "a web server" do |plugin, file, bind_str = nil|
-    plugin = plugin.to_sym unless plugin.is_a? Symbol
-
-    if plugin == :unicorn && RUBY_PLATFORM == "java"
-      before { skip("until unicorn supports jruby") }
-    end
-
-    abs_file = Object.send("#{plugin}_path", file)
-    instance = nil
-    args = { plugin => abs_file}
-    args[:bind] = bind_str unless bind_str.nil?
-
-    it "returns an instance" do
-      instance = Excon::Test::Server.new(args)
-      expect(instance).to be_instance_of Excon::Test::Server
-    end
- 
-    it 'starts the server' do
-      expect(instance.start).to be true
-    end
-
-    it 'stops the server' do
-      expect(instance.stop).to be true
-    end
-end
-
-describe Excon::Test::Server do
-  context 'when webrick' do
-    it_should_behave_like "a web server", :webrick, 'basic.ru'
-  end
-
-  context 'when unicorn' do
-    it_should_behave_like "a web server", :unicorn, 'streaming.ru'
-  end
-
-  context "when unicorn is given a unix socket uri" do
-    socket_uri = 'unix:///tmp/unicorn.socket'
-    it_should_behave_like "a web server", :unicorn, 'streaming.ru', socket_uri
-  end
-
-  context 'when puma' do
-    it_should_behave_like "a web server", :puma, 'streaming.ru'
-  end
-
-  context 'when executable' do
-    it_should_behave_like "a web server", :exec, 'good.rb' 
-  end
-end