ticketevolution-ruby 0.6.4 → 0.6.5

data/lib/ticket_evolution/core/endpoint/request_handler.rb

@@ -19,19 +19,23 @@ module TicketEvolution
       }
 
       def request(method, path, params = nil, &response_handler)
-        response = self.build_request(method, path, params)
+        redirecting = caller.first =~ /request_handler/ ? false : true
+        response = self.build_request(method, path, params, redirecting)
         response.http(method)
         response = self.naturalize_response(response)
-        if response.response_code >= 400
+        if [301, 302].include?(response.response_code)
+          new_path = response.header.match(/Location: ([\w\.:\/]*)/).to_a[1].to_s.match(/^https?:\/\/[a-zA-Z_]+[\.a-zA-Z_]+(\/[\w\/]+)[\?]*/).to_a[1]
+          self.request(method, new_path, params, &response_handler)
+        elsif response.response_code >= 300
           TicketEvolution::ApiError.new(response)
         else
           response_handler.call(response)
         end
       end
 
-      def build_request(method, path, params = nil)
+      def build_request(method, path, params = nil, build_path = true)
         raise EndpointConfigurationError, "#{self.class.to_s}#request requires it's first parameter to be a valid HTTP method" unless [:GET, :POST, :PUT, :DELETE].include? method.to_sym
-        self.connection.build_request(method, "#{self.base_path}#{path}", params)
+        self.connection.build_request(method, "#{build_path ? self.base_path : ''}#{path}", params)
       end
 
       def naturalize_response(response)

data/lib/ticket_evolution/version.rb

@@ -1,3 +1,3 @@
 module TicketEvolution
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/spec/fixtures/fake.rb

@@ -19,11 +19,19 @@ class Fake
     OpenStruct.new.tap do |resp|
       resp.header = 'fake header string (we don\'t currently process this)'
       resp.response_code = 200
-      resp.body = {:body => "test"}
+      resp.body = {:body => "test", :connection => self.connection}
       resp.server_message = TicketEvolution::Endpoint::RequestHandler::CODES[200].last
     end
   end
 
+  def self.redirect_response
+    r = self.response
+    r.header = "HTTP/1.1 301 Moved Permanently\r\nContent-Type: text/html\r\nConnection: keep-alive\r\nStatus: 301\r\nX-Powered-By: Phusion Passenger (mod_rails/mod_rack) 3.0.11\r\nX-UA-Compatible: IE=Edge,chrome=1\r\nLocation: http://api.ticketevolution.com/something_else/1\r\nX-Runtime: 0.001401\r\nContent-Length: 102\r\nServer: nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)\r\n\r\n"
+    r.response_code = 302
+    r.server_message = TicketEvolution::Endpoint::RequestHandler::CODES[302].last
+    r
+  end
+
   def self.show_response
     r = self.response
     r.body = {

data/spec/fixtures/net/endpoints/accounts.yml

@@ -173,3 +173,157 @@
       Office","url":"/clients/1443","id":"1443"}},{"balance":"0.0","currency":"USD","url":"/accounts/3019","id":"3019","updated_at":"2011-08-11T03:13:27Z","client":{"name":"Main
       Office","url":"/clients/1444","id":"1444"}}],"current_page":5,"per_page":4}'
     http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: https://api.sandbox.ticketevolution.com:443/62?
+    body: !!null 
+    headers:
+      accept:
+      - application/vnd.ticketevolution.api+json; version=8
+      x-signature:
+      - ZZGQZhUyFpSSPPVE83Xtg9Vtk/iNkwU3yKvi2ktrgy8=
+      x-token:
+      - b2b5a7a33b1a78896ed1b53d81c5c9cc
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 404
+      message: Not Found
+    headers:
+      content-type:
+      - application/vnd.ticketevolution.api+json; version=8; charset=utf-8
+      transfer-encoding:
+      - chunked
+      connection:
+      - keep-alive
+      status:
+      - '404'
+      x-powered-by:
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.11
+      x-ua-compatible:
+      - IE=Edge,chrome=1
+      x-runtime:
+      - '0.044726'
+      cache-control:
+      - no-cache
+      strict-transport-security:
+      - max-age=31536000
+      server:
+      - nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)
+    body: ! '{"error":"The endpoint you requested doesn''t exist. You may have mistyped
+      the address or the resource may have moved."}'
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: https://api.sandbox.ticketevolution.com:443/62?
+    body: !!null 
+    headers:
+      accept:
+      - application/vnd.ticketevolution.api+json; version=8
+      x-signature:
+      - ZZGQZhUyFpSSPPVE83Xtg9Vtk/iNkwU3yKvi2ktrgy8=
+      x-token:
+      - b2b5a7a33b1a78896ed1b53d81c5c9cc
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 404
+      message: Not Found
+    headers:
+      content-type:
+      - application/vnd.ticketevolution.api+json; version=8; charset=utf-8
+      transfer-encoding:
+      - chunked
+      connection:
+      - keep-alive
+      status:
+      - '404'
+      x-powered-by:
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.11
+      x-ua-compatible:
+      - IE=Edge,chrome=1
+      x-runtime:
+      - '0.044726'
+      cache-control:
+      - no-cache
+      strict-transport-security:
+      - max-age=31536000
+      server:
+      - nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)
+    body: ! '{"error":"The endpoint you requested doesn''t exist. You may have mistyped
+      the address or the resource may have moved."}'
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: https://api.sandbox.ticketevolution.com:443/?page=5&per_page=4
+    body: !!null 
+    headers:
+      accept:
+      - application/vnd.ticketevolution.api+json; version=8
+      x-signature:
+      - ZopWnvK10aQ8C2N9MpHc9/wTqL5aSKD7XnCS1vbd4Iw=
+      x-token:
+      - b2b5a7a33b1a78896ed1b53d81c5c9cc
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 301
+      message: Moved Permanently
+    headers:
+      content-type:
+      - text/html
+      connection:
+      - keep-alive
+      status:
+      - '301'
+      x-powered-by:
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.11
+      x-ua-compatible:
+      - IE=Edge,chrome=1
+      location:
+      - http://developer.ticketevolution.com
+      x-runtime:
+      - '0.001913'
+      content-length:
+      - '102'
+      server:
+      - nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)
+    body: <html><body>You are being <a href="http://developer.ticketevolution.com">redirected</a>.</body></html>
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: https://api.sandbox.ticketevolution.com:443/?page=5&per_page=4
+    body: !!null 
+    headers:
+      accept:
+      - application/vnd.ticketevolution.api+json; version=8
+      x-signature:
+      - ZopWnvK10aQ8C2N9MpHc9/wTqL5aSKD7XnCS1vbd4Iw=
+      x-token:
+      - b2b5a7a33b1a78896ed1b53d81c5c9cc
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 301
+      message: Moved Permanently
+    headers:
+      content-type:
+      - text/html
+      connection:
+      - keep-alive
+      status:
+      - '301'
+      x-powered-by:
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.11
+      x-ua-compatible:
+      - IE=Edge,chrome=1
+      location:
+      - http://developer.ticketevolution.com
+      x-runtime:
+      - '0.001913'
+      content-length:
+      - '102'
+      server:
+      - nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)
+    body: <html><body>You are being <a href="http://developer.ticketevolution.com">redirected</a>.</body></html>
+    http_version: '1.1'

data/spec/shared_examples/endpoints/class.rb

@@ -120,7 +120,6 @@ shared_examples_for "a ticket_evolution endpoint class" do
   end
 
   describe "#build_request" do
-
     context "which is valid" do
       context "with params" do
         let(:params) do
@@ -149,6 +148,16 @@ shared_examples_for "a ticket_evolution endpoint class" do
           end
         end
       end
+
+      context "with build_path set to false" do
+        [:GET, :POST, :PUT, :DELETE].each do |method|
+          it "should not include the base_path when it calls connection#build_request" do
+            connection.should_receive(:build_request).with(method, path, nil).and_return(curl)
+
+            instance.build_request(method, path, nil, false)
+          end
+        end
+      end
     end
 
     context "given an invalid http method" do
@@ -167,11 +176,11 @@ shared_examples_for "a ticket_evolution endpoint class" do
     let(:handler) { Fake.send(:method, :response_handler) }
 
     before do
-      connection.should_receive(:build_request).and_return(curl)
-      instance.should_receive(:naturalize_response).and_return(response)
     end
 
     it "calls http on the return Curl object with the method for the request" do
+      connection.should_receive(:build_request).and_return(curl)
+      instance.should_receive(:naturalize_response).and_return(response)
       curl.should_receive(:http).with(method)
 
       instance.request(method, path, nil, &handler).should == Fake.response_handler(true)
@@ -180,7 +189,11 @@ shared_examples_for "a ticket_evolution endpoint class" do
     context "when there is an error from the api" do
       let(:response) { Fake.error_response }
 
-      before { curl.should_receive(:http) }
+      before do
+        connection.should_receive(:build_request).and_return(curl)
+        instance.should_receive(:naturalize_response).and_return(response)
+        curl.should_receive(:http)
+      end
 
       it "should return an instance of TicketEvolution::ApiError" do
         subject.should be_a TicketEvolution::ApiError
@@ -190,12 +203,36 @@ shared_examples_for "a ticket_evolution endpoint class" do
     context "when successful" do
       let(:response) { Fake.response }
 
-      before { curl.should_receive(:http) }
+      before do
+        connection.should_receive(:build_request).and_return(curl)
+        instance.should_receive(:naturalize_response).and_return(response)
+        curl.should_receive(:http)
+      end
 
       it "should pass the response object to #build_object" do
         instance.request(method, path, nil, &handler).should == Fake.response_handler(true)
       end
     end
+
+    context "when there is a redirect response" do
+      let(:response) { Fake.redirect_response }
+      let(:redirect_path) { '/something_else/1'}
+      let(:second_curl) { double(:curl, :http => nil) }
+      let(:second_response) { Fake.response }
+
+      before do
+        curl.should_receive(:http)
+        connection.should_receive(:build_request).with(:GET, instance.base_path, nil).and_return(curl)
+        instance.should_receive(:naturalize_response).with(curl).and_return(response)
+        second_curl.should_receive(:http)
+        instance.connection.should_receive(:build_request).with(:GET, redirect_path, nil).and_return(second_curl)
+        instance.should_receive(:naturalize_response).with(second_curl).and_return(second_response)
+      end
+
+      it "should follow the redirect path" do
+        instance.request(:GET, nil, nil, &handler)
+      end
+    end
   end
 
   describe "#naturalize_response" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ticketevolution-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70256748458480 !ruby/object:Gem::Requirement
+  requirement: &70271315278760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70256748458480
+  version_requirements: *70271315278760
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70256748457480 !ruby/object:Gem::Requirement
+  requirement: &70271315277780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *70256748457480
+  version_requirements: *70271315277780
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70256748456140 !ruby/object:Gem::Requirement
+  requirement: &70271315276260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.7.7
   type: :runtime
   prerelease: false
-  version_requirements: *70256748456140
+  version_requirements: *70271315276260
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70256748454820 !ruby/object:Gem::Requirement
+  requirement: &70271315275140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70256748454820
+  version_requirements: *70271315275140
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70256748454100 !ruby/object:Gem::Requirement
+  requirement: &70271315274460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70256748454100
+  version_requirements: *70271315274460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70256748453420 !ruby/object:Gem::Requirement
+  requirement: &70271315273680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 2.7.1
   type: :development
   prerelease: false
-  version_requirements: *70256748453420
+  version_requirements: *70271315273680
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70256748452700 !ruby/object:Gem::Requirement
+  requirement: &70271315273000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256748452700
+  version_requirements: *70271315273000
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70256748451480 !ruby/object:Gem::Requirement
+  requirement: &70271315271880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256748451480
+  version_requirements: *70271315271880
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70256748450920 !ruby/object:Gem::Requirement
+  requirement: &70271315271340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256748450920
+  version_requirements: *70271315271340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70256748450320 !ruby/object:Gem::Requirement
+  requirement: &70271315270720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256748450320
+  version_requirements: *70271315270720
 description: Provides Ruby wrappers for the Ticket Evolution API (http://developer.ticketevolution.com).
   Ticket Evolution is the industry leader in software for the Ticket Broker industry.
 email:
@@ -295,7 +295,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3594449940152660308
+      hash: 3497363882923040696
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: