ticket_sharing 1.0.1 → 1.1.0

data/lib/ticket_sharing/client.rb

@@ -3,24 +3,21 @@ require 'ticket_sharing/request'
 
 module TicketSharing
   class Client
-
-    attr_reader :response, :code
-
     def initialize(base_url, credentials=nil)
       @base_url    = base_url
       @credentials = credentials
     end
 
-    def post(path, body)
-      send_request(Net::HTTP::Post, path, body)
+    def post(path, body, options={})
+      send_request(:post, path, body, options)
     end
 
-    def put(path, body)
-      send_request(Net::HTTP::Put, path, body)
+    def put(path, body, options={})
+      send_request(:put, path, body, options)
     end
 
-    def delete(path)
-      send_request(Net::HTTP::Delete, path, '')
+    def delete(path, options={})
+      send_request(:delete, path, '', options)
     end
 
     def success?
@@ -29,39 +26,24 @@ module TicketSharing
 
     private
 
-      def send_request(request_class, path, body)
-        request = TicketSharing::Request.new(request_class, @base_url + path, body)
-
-        if @credentials
-          request.set_header('X-Ticket-Sharing-Token', @credentials)
-        end
+    def send_request(method, path, body, options)
+      headers = {'X-Ticket-Sharing-Token' => @credentials} if @credentials
+      options = options.merge(:body => body, :headers => headers)
+      response = TicketSharing::Request.new.request(method, @base_url + path, options)
 
-        request.send!
-
-        handle_response(request)
-      end
-
-      def handle_response(request)
-        @response = request.raw_response
-        @code = response.code.to_i
+      handle_response(response)
+    end
 
-        case @code
-        when (200..299)
-          @success = true
-          response
-        when (300..399)
-          request.follow_redirect!
-          handle_response(request)
-        when 403, 404, 405, 408, 410, 422
-          @success = false
-          response
-        when (500..599)
-          @success = false
-          response
-        else
-          raise TicketSharing::Error.new(%Q{#{response.code} "#{response.message}"\n\n#{response.body}})
-        end
+    def handle_response(response)
+      @success = case response.code.to_i
+      when (200..299)
+        true
+      when 401, 403, 404, 405, 408, 410, 422, 500..599
+         false
+      else
+        raise TicketSharing::Error.new(%Q{#{response.code} "#{response.message}"\n\n#{response.body}})
       end
-
+      response
+    end
   end
 end

data/lib/ticket_sharing/request.rb

@@ -1,64 +1,74 @@
+require 'ticket_sharing/error'
+
 module TicketSharing
   class Request
-
-    attr_reader :raw_response
-
-    # this should very rarely have to go above 2, and definitely never any higher than 5
     MAX_REDIRECTS = 2
 
     CA_PATH = "/etc/ssl/certs"
 
-    def initialize(request_class, uri, body)
-      @redirects = 0
-      @uri = URI.parse(uri)
-      @request_class = request_class
-      @body = body
-      @raw_request = new_raw_request
-    end
+    def request(method, url, options = {})
+      request_class = case method
+      when :get    then Net::HTTP::Get
+      when :post   then Net::HTTP::Post
+      when :put    then Net::HTTP::Put
+      when :delete then Net::HTTP::Delete
+      else
+        raise ArgumentError, "Unsupported method: #{method.inspect}"
+      end
 
-    def set_header(key, value)
-      @raw_request[key] = value
-    end
+      response = send_request(request_class, url, options)
 
-    def send!
-      @raw_request.body = @body
+      follow_redirects!(request_class, response, options)
+    end
 
-      http = Net::HTTP.new(@uri.host, @uri.port)
+    private
 
-      if @uri.scheme == 'https'
-        http.use_ssl = true
-        http.ca_path = CA_PATH if File.exist?(CA_PATH)
-      end
-
-      @raw_response = http.start do |http|
-        http.request(@raw_request)
-      end
+    def send_request(request_class, url, options)
+      uri = URI.parse(url)
+      request = build_request(request_class, uri, options)
+      send!(request, uri, options)
     end
 
-    def follow_redirect!
-      if @redirects >= MAX_REDIRECTS
-        raise TicketSharing::TooManyRedirects
-      end
+    def build_request(request_class, uri, options)
+      request = request_class.new(uri.path)
+      request['Accept'] = 'application/json'
+      request['Content-Type'] = 'application/json'
 
-      @uri = URI.parse(@raw_response['Location'])
-      @raw_request = new_raw_request
+      (options[:headers] || {}).each do |k, v|
+        request[k] = v
+      end
 
-      self.send!
+      request.body = options[:body]
 
-      @redirects += 1
+      request
     end
 
-    def new_raw_request
-      raw_request = @request_class.new(@uri.path)
-      raw_request['Accept'] = 'application/json'
-      raw_request['Content-Type'] = 'application/json'
+    def send!(request, uri, options)
+      http = Net::HTTP.new(uri.host, uri.port)
 
-      if @raw_request && token = @raw_request['X-Ticket-Sharing-Token']
-        raw_request['X-Ticket-Sharing-Token'] = token
+      if uri.scheme == 'https'
+        http.use_ssl = true
+        http.ca_path = CA_PATH if File.exist?(CA_PATH)
+
+        if options[:ssl] && options[:ssl][:verify] == false
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
       end
 
-      raw_request
+      http.start { |http| http.request(request) }
     end
 
+    def follow_redirects!(request_class, response, options)
+      redirects = 0
+      while (300..399).include?(response.code.to_i)
+        if redirects >= MAX_REDIRECTS
+          raise TicketSharing::TooManyRedirects
+        else
+          redirects += 1
+        end
+        response = send_request(request_class, response['Location'], options)
+      end
+      response
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ticket_sharing
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies: []
 description: A ruby implementation of the Networked Help Desk API
 email: josh@zendesk.com
@@ -45,6 +45,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3138541096207578650
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ticket sharing