vend 0.0.6 → 0.0.7

data/lib/vend/exception.rb

@@ -19,6 +19,8 @@ module Vend
   # from the Vend API
   class Unauthorized < StandardError; end
 
+  class RedirectionLimitExceeded < StandardError; end
+
   # Nonspecific HTTP error which is usually thrown when a non 2xx response
   # is received.
   class HTTPError < StandardError

data/lib/vend/http_client.rb

@@ -4,7 +4,7 @@ require 'cgi'
 module Vend
   class HttpClient
 
-    UNAUTHORIZED_MESSAGE = "Client not authorized. Check your store URL and credentials are correct and try again."
+    UNAUTHORIZED_MESSAGE = "Client not authorized. Check your store credentials are correct and try again."
     # Read timeout in seconds
     READ_TIMEOUT = 240
 
@@ -25,9 +25,9 @@ module Vend
     end
 
     # sets up a http connection
-    def get_http_connection(host, port)
+    def get_http_connection(host, port, use_ssl = true)
       http = Net::HTTP.new(host, port)
-      http.use_ssl = true
+      http.use_ssl = use_ssl
       http.verify_mode = verify_mode
       # Default read_tiemout is 60 seconds, some of the Vend API calls are
       # taking longer than this.
@@ -61,9 +61,15 @@ module Vend
     #          request('foo', :method => :post, :body => '{\"baz\":\"baloo\"}'
     #
     def request(path, options = {})
-      options = {:method => :get}.merge options
-      url = URI.parse(base_url + path) 
-      http = get_http_connection(url.host, url.port)
+      options = {:method => :get, :redirect_count => 0}.merge options
+      raise RedirectionLimitExceeded if options[:redirect_count] > 10
+      url = if path.kind_of?(URI)
+              path
+            else
+              URI.parse(base_url + path)
+            end
+      ssl = (url.scheme == 'https')
+      http = get_http_connection(url.host, url.port, ssl)
 
       # FIXME extract method
       method = ("Net::HTTP::" + options[:method].to_s.classify).constantize
@@ -73,10 +79,17 @@ module Vend
       request.body = options[:body] if options[:body]
       logger.debug url
       response = http.request(request)
-      raise Unauthorized.new(UNAUTHORIZED_MESSAGE) if response.kind_of?(Net::HTTPUnauthorized)
-      raise HTTPError.new(response) unless response.kind_of?(Net::HTTPSuccess)
-      logger.debug response
-      JSON.parse response.body unless response.body.nil? or response.body.empty?
+      if response.kind_of?(Net::HTTPRedirection)
+        location = URI.parse(response['location'])
+        logger.debug "Following redirect to %s" % [location]
+        options[:redirect_count] = options[:redirect_count] + 1
+        request(location, options)
+      else
+        raise Unauthorized.new(UNAUTHORIZED_MESSAGE) if response.kind_of?(Net::HTTPUnauthorized)
+        raise HTTPError.new(response) unless response.kind_of?(Net::HTTPSuccess)
+        logger.debug response
+        JSON.parse response.body unless response.body.nil? or response.body.empty?
+      end
     end
 
     # Returns the SSL verification mode, based upon the value of verify_ssl?

data/lib/vend/version.rb

@@ -1,3 +1,3 @@
 module Vend #:nodoc:
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/vend/http_client_spec.rb

@@ -126,5 +126,23 @@ describe Vend::HttpClient do
       response.should == {"foo" => "bar"}
     end
 
+    it "follows redirects" do
+      stub_request(:get, "https://username:password@foo/bar/foo").
+        to_return(:status => 302, :body => '{"bar":"baz"}', :headers => {"Location" => "http://username:password@foo/bar/floo"})
+
+      stub_request(:get, "http://username:password@foo/bar/floo").
+        to_return(:status => 200, :body => '{"foo":"bar"}', :headers => {})
+
+      response = subject.request('foo')
+      response.should == {"foo" => "bar"}
+    end
+
+    it "raises an exception when the redirection limit is exceeded" do
+      stub_request(:get, "https://username:password@foo/bar/foo").
+        to_return(:status => 302, :body => '{"bar":"baz"}', :headers => {"Location" => "https://username:password@foo/bar/foo"})
+      expect {
+        subject.request('foo')
+      }.to raise_exception(Vend::RedirectionLimitExceeded)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vend
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 502015210106226139
+      hash: 4352042861581051323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 502015210106226139
+      hash: 4352042861581051323
 requirements: []
 rubyforge_project: vend
 rubygems_version: 1.8.24