songkick-transport 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1535085159dedb0d551659b5fafcc840abd490
-  data.tar.gz: 3348c5d75c8a626302f4e1dae864d00edca3b593
+  metadata.gz: 1fe0da63a4b8a2922d2e54f19b00e65dd5fa7abe
+  data.tar.gz: 58a16dd55c6c201209beea4381935e61d8ad7f26
 SHA512:
-  metadata.gz: 4134a141cb12aeab651d930938b2fa77361db813fc127c9344477619c748abc57b9ab84deacce2063eafd65cd1cf6e40728cf5af0a50cb0c3770630777fb37ac
-  data.tar.gz: b0f7e3b1acda2080a5bb44aab9890739290c191287480d79b8a3bd08ab54c3df81c2a931ec088bf363b8813d8f8f223a6bf5ac88a7f6db5d5e6f2f895a323e66
+  metadata.gz: 6786e9954745bb68d84a8509e6fa9cf2cbd090e4d9c66c0ed27136b1bda2abb7d630ff2b81006f4f473025b28e58232df6524989b23259f6e658b628e65bdb5e
+  data.tar.gz: 540c662c5c7683f2a62b6940a43cad2c0650674957ae6fb9157d520ade72b31a3d4df9111554b0ebc58716bb39d3bf26c65ecb1b31071572481842c66db4896a

data/lib/songkick/transport/curb.rb

@@ -1,5 +1,6 @@
 require 'cgi'
-require 'curb'
+
+autoload :Curl, 'curb'
 
 module Songkick
   module Transport
@@ -50,7 +51,12 @@ module Songkick
           line = header_line.sub(/\r\n$/, '')
           parts = line.split(/:\s*/)
           if parts.size >= 2
-            response_headers[parts.shift] = parts * ':'
+            header_name, value = parts.shift, parts * ':'
+            if response_headers[header_name]
+              response_headers[header_name] << ", #{value}"
+            else
+              response_headers[header_name] = value
+            end
           end
           header_line.bytesize
         end

data/spec/songkick/transport/curb_spec.rb

@@ -25,13 +25,24 @@ module Songkick
         end
       end
 
-      describe "handling errors" do
+      describe 'handling errors' do
         when_request_raises_the_exception(Curl::Err::HostResolutionError)   { it_should_raise(Transport::HostResolutionError)   }
         when_request_raises_the_exception(Curl::Err::ConnectionFailedError) { it_should_raise(Transport::ConnectionFailedError) }
         when_request_raises_the_exception(Curl::Err::TimeoutError)          { it_should_raise(Transport::TimeoutError)          }
         when_request_raises_the_exception(Curl::Err::GotNothingError)       { it_should_raise(Transport::UpstreamError)         }
         when_request_raises_the_exception(Curl::Err::RecvError)             { it_should_raise(Transport::UpstreamError)         }
       end
+
+      describe 'headers parsing' do
+        let(:curl) { instance_double(Curl::Easy, :response_code => 200, :headers => {}).as_null_object }
+
+        it 'should join multiple headers to one' do
+          allow(curl).to receive(:on_header).and_yield('Set-Cookie: a').and_yield('Set-Cookie: b')
+
+          response = subject.execute_request(request)
+          expect(response.headers['Set-Cookie']).to eq 'a, b'
+        end
+      end
     end
 
   end

data/spec/songkick/transport/httparty_spec.rb

@@ -8,14 +8,14 @@ module Songkick
 
       let(:request){ Request.new('http://localhost', 'get', '/', {}) }
 
-      describe "handling errors" do
+      describe 'handling errors' do
         class FakeHttparty < Songkick::Transport::HttParty::Adapter
           class << self
             attr_accessor :error
           end
 
           def self.get(path, args)
-            raise(error, "bang") if error
+            raise(error, 'bang') if error
           end
 
         end
@@ -41,13 +41,31 @@ module Songkick
           end
         end
 
-        describe "handling errors" do
+        describe 'handling errors' do
           when_request_raises_the_exception(FakeJSONException) { it_should_raise(Transport::InvalidJSONError)      }
           when_request_raises_the_exception(SocketError)       { it_should_raise(Transport::ConnectionFailedError) }
           when_request_raises_the_exception(Timeout::Error)    { it_should_raise(Transport::TimeoutError)          }
           when_request_raises_the_exception(UpstreamError)     { it_should_raise(Transport::UpstreamError)         }
           when_request_raises_the_exception(Exception)         { it_should_raise(Transport::UpstreamError)         }
         end
+
+        describe 'headers parsing' do
+          let(:httparty) { Songkick::Transport::HttParty.new('localhost') }
+          let(:request) { Request.new('http://localhost:4567', 'get', '/with_headers', {}) }
+
+          before do
+            TestApp.listen(4567)
+          end
+
+          after do
+            TestApp.stop
+          end
+
+          it 'should join multiple headers to one' do
+            response = httparty.execute_request(request)
+            expect(response.headers['Set-Cookie']).to eq 'a, b'
+          end
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -26,6 +26,11 @@ class TestApp < Sinatra::Base
     '}'
   end
 
+  get '/with_headers' do
+    headers 'Set-Cookie' => ['a', 'b']
+    '{}'
+  end
+
   get '/authenticate' do
     env['HTTP_AUTHORIZATION'] ?
         Yajl::Encoder.encode('successful' => true) :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: songkick-transport
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Daniel Lucraft
@@ -10,10 +10,11 @@ authors:
 - Robin Tweedie
 - Paul Lawson
 - Sabina Bejasa-Dimmock
+- Paul Springett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -77,14 +78,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -219,3 +220,4 @@ signing_key:
 specification_version: 4
 summary: HTTP client abstraction for service clients
 test_files: []
+has_rdoc: