songkick-transport 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fcdee184d275b052c905e2ac432d44fd9537119
-  data.tar.gz: a5734e06ba187e5732933e0317ec250ba0e1c19c
+  metadata.gz: 202b4b22c7239286ab5be97b564663de2d727173
+  data.tar.gz: c4bb87d2c9b8c54638ed7dbcd852c105192a2fc8
 SHA512:
-  metadata.gz: f7b4bdef2b4a12f85627e396255d294b601af05dc74feec90fbc33d1ca21928c8d6ff0f8f3061b8eac92cff7a6058528d4946d5754143923e2a30351d51f181c
-  data.tar.gz: 04418c68863395f6ee958a34e13fd45b473423765207f186d9a6244969f85a78fa07f404e6249dc9c95ca7890edcceba63b68f251785caa4ad1c86f105f9be47
+  metadata.gz: b13944a9f8f9c2d65fe0a70304bcb85125c1cecc2a504ddfd2c8278c116eef54bfc7126f7d19b403e62e3817471f8f86cb3d2eb74f3daa73c1537e1e6ae71ad5
+  data.tar.gz: 5a301688cd64bedd7b05a19ab1fbdb575879114808b47bcfbe92e5e9de88ca9f2a59d610d6a4c6d7493ce050044cd814cea4db33e5d412331af1124f3fadd377

data/lib/songkick/transport/httparty.rb

@@ -6,7 +6,6 @@ module Songkick
     class HttParty
       def self.new(host, options = {})
         adapter_class = options.delete(:adapter) || Adapter
-        adapter_class.base_uri(host)
         adapter_class.format(options[:format] || DEFAULT_FORMAT)
         adapter_class.default_timeout(options[:timeout] || DEFAULT_TIMEOUT)
         adapter_class.new(host, options)
@@ -16,16 +15,22 @@ module Songkick
         include HTTParty
 
         def endpoint
-          self.class.base_uri
+          @host
         end
 
         def execute_request(req)
           timeout = req.timeout || self.class.default_options[:timeout]
 
+          req_options = {
+            :base_uri => @host,
+            :headers => req.headers,
+            :timeout => timeout
+          }
+
           response = if req.use_body?
-            self.class.__send__(req.verb, req.path, :body => req.body, :headers => req.headers, :timeout => timeout)
+            self.class.__send__(req.verb, req.path, req_options.merge(:body => req.body))
           else
-            self.class.__send__(req.verb, req.url, :headers => req.headers, :timeout => timeout)
+            self.class.__send__(req.verb, req.url, req_options)
           end
 
           process(req, response.code, response.headers, response.parsed_response)

data/spec/songkick/transport_spec.rb

@@ -252,7 +252,34 @@ shared_examples_for "Songkick::Transport" do
       expect(transport.user_error_codes).to eq([409])
     end
   end
+end
+
+shared_examples_for "Songkick::Transport::HttpAdapter" do
+  describe 'multiple instances of the adapter' do
+    let!(:first_adapter) { described_class.new('http://localhost:8181') }
+    let!(:second_adapter) { described_class.new('http://localhost:8282') }
+
+    before do
+      @first_test_app = TestApp.listen(8181)
+      @second_test_app = TestApp.listen(8282)
+    end
 
+    after do
+      @first_test_app.stop
+      @second_test_app.stop
+      sleep 1
+    end
+
+    it 'should have the right endpoint on each adapter' do
+      expect(first_adapter.endpoint).to eq('http://localhost:8181')
+      expect(second_adapter.endpoint).to eq('http://localhost:8282')
+    end
+
+    it 'should call the right endpoint on each adapter' do
+      expect(first_adapter.get('/host').data).to eq({"host" => "localhost:8181"})
+      expect(second_adapter.get('/host').data).to eq({"host" => "localhost:8282"})
+    end
+  end
 end
 
 # Curb always times out talking to the web server in the other thread when run on 1.8
@@ -262,6 +289,7 @@ unless RUBY_VERSION =~ /^1.8/
     let(:endpoint)  { "http://localhost:4567" }
     let(:transport) { described_class.new(endpoint, options) }
     it_should_behave_like "Songkick::Transport"
+    it_should_behave_like "Songkick::Transport::HttpAdapter"
   end
 end
 
@@ -270,6 +298,7 @@ describe Songkick::Transport::HttParty do
   let(:endpoint)  { "http://localhost:4567" }
   let(:transport) { described_class.new(endpoint, options) }
   it_should_behave_like "Songkick::Transport"
+  it_should_behave_like "Songkick::Transport::HttpAdapter"
 end
 
 describe Songkick::Transport::RackTest do

data/spec/spec_helper.rb

@@ -26,6 +26,10 @@ class TestApp < Sinatra::Base
     '}'
   end
 
+  get '/host' do
+    Yajl::Encoder.encode({"host" => request.env["HTTP_HOST"]})
+  end
+
   get '/with_headers' do
     headers 'Set-Cookie' => ['a', 'b']
     '{}'
@@ -89,6 +93,7 @@ class TestApp < Sinatra::Base
     thin = Rack::Handler.get('thin')
     app  = Rack::Lint.new(self)
     thin.run(app, :Port => port) { |s| @server = s }
+    @server
   end
 
   def self.stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: songkick-transport
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Daniel Lucraft
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -164,34 +164,34 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - README.rdoc
-- examples/tcp_server.rb
 - examples/example.rb
-- examples/thread_safety.rb
 - examples/loop.rb
 - examples/server.rb
-- lib/songkick/transport/reporting.rb
-- lib/songkick/transport/rack_test.rb
-- lib/songkick/transport/headers.rb
-- lib/songkick/transport/response.rb
-- lib/songkick/transport/curb.rb
-- lib/songkick/transport/http_error.rb
-- lib/songkick/transport/httparty.rb
+- examples/tcp_server.rb
+- examples/thread_safety.rb
+- lib/songkick/transport/serialization.rb
 - lib/songkick/transport/service.rb
-- lib/songkick/transport/request.rb
+- lib/songkick/transport/response.rb
 - lib/songkick/transport/authentication.rb
-- lib/songkick/transport/serialization.rb
-- lib/songkick/transport/upstream_error.rb
+- lib/songkick/transport/request.rb
 - lib/songkick/transport/base.rb
+- lib/songkick/transport/httparty.rb
+- lib/songkick/transport/curb.rb
+- lib/songkick/transport/upstream_error.rb
+- lib/songkick/transport/http_error.rb
+- lib/songkick/transport/headers.rb
+- lib/songkick/transport/rack_test.rb
+- lib/songkick/transport/reporting.rb
 - lib/songkick/transport.rb
-- spec/spec_helper.rb
 - spec/songkick/transport_spec.rb
-- spec/songkick/transport/curb_spec.rb
 - spec/songkick/transport/service_spec.rb
-- spec/songkick/transport/request_spec.rb
 - spec/songkick/transport/authentication_spec.rb
 - spec/songkick/transport/httparty_spec.rb
 - spec/songkick/transport/base_spec.rb
+- spec/songkick/transport/request_spec.rb
+- spec/songkick/transport/curb_spec.rb
 - spec/songkick/transport/response_spec.rb
+- spec/spec_helper.rb
 - lib/songkick/transport/html_report.html.erb
 homepage: http://github.com/songkick/transport
 licenses:
@@ -220,3 +220,4 @@ signing_key:
 specification_version: 4
 summary: HTTP client abstraction for service clients
 test_files: []
+has_rdoc: