ticket_sharing 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b51ca8f39acac4810a623cff359b0932a6c78d0
-  data.tar.gz: 965583e24ce9ce3dab466e15eeafcd91cec047f7
+  metadata.gz: 1bc8f56c0ccfb6e635bb4ac3be1715209b5c9a61
+  data.tar.gz: b3f6d3d8536df537b82ef3d559eba9d67f9f8cc5
 SHA512:
-  metadata.gz: 077b31ace706771d4539827c0dc1c8ba57192cfd8e7dc6b96f88c84b92f54f7ac3c1f52d11a1482595b07852318df012c9c663485f0e6b5bc8719599014d83b6
-  data.tar.gz: 23e7d9ea5d840f1747f52eb746b35449d99a12067dfd3376647b579e671a842fb36f06a6e4d30e116edc53e2e071f9de443e87aee39989a8861cfdf192e1f727
+  metadata.gz: 723ab06045867a1447abf8497580db737ee56c93975ce154bfb27e4560a6157f643358f23c3c28420cd3e10689469bb5d4070b473be3ae3187b76eba730c700b
+  data.tar.gz: f94a63b118dcb4867a14064bfc63942a009e743ac0dd2c1298556eb97a8db769d693960c0a3feeb8d0f260c6d43a34a55b8a0f7d84b80c946925f1195bf5cc60

data/Readme.md

@@ -10,7 +10,7 @@ A ruby implementation of the [Networked Help Desk] [1] API
 
 ### Creating an agreement
 
-    agreement = TicketSharing::Agreement.new({'uuid' => '5ad614f4'})
+    agreement = TicketSharing::Agreement.new('uuid' => '5ad614f4')
     agreement.send_to('http://example.com/sharing')
 
 ### Sending a ticket
@@ -25,7 +25,7 @@ A ruby implementation of the [Networked Help Desk] [1] API
 
 ### Updating a ticket
 
-    ticket = TicketSharing::Ticket.new({'status' => 'new'})
+    ticket = TicketSharing::Ticket.new('status' => 'new')
     ticket.update_partner('http://example.com/sharing')
 
 ## Contributing

data/lib/ticket_sharing.rb

@@ -0,0 +1,9 @@
+module TicketSharing
+  def self.connection
+    @connection ||= Faraday.new
+  end
+
+  def self.connection=(new_connection)
+    @connection = new_connection
+  end
+end

data/lib/ticket_sharing/agreement.rb

@@ -23,14 +23,14 @@ module TicketSharing
       client = Client.new(url)
       @response = client.post(relative_url, self.to_json)
 
-      @response.code.to_i
+      @response.status
     end
 
     def update_partner(url)
       client = Client.new(url, authentication_token)
       @response = client.put(relative_url, self.to_json)
 
-      @response.code.to_i
+      @response.status
     end
 
     def relative_url

data/lib/ticket_sharing/client.rb

@@ -1,3 +1,4 @@
+require 'ticket_sharing'
 require 'ticket_sharing/error'
 require 'ticket_sharing/request'
 
@@ -6,6 +7,8 @@ module TicketSharing
     def initialize(base_url, credentials=nil)
       @base_url    = base_url
       @credentials = credentials
+
+      @requester = TicketSharing::Request.new(TicketSharing.connection)
     end
 
     def post(path, body, options={})
@@ -29,19 +32,19 @@ module TicketSharing
     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)
+      response = @requester.request(method, @base_url + path, options)
 
       handle_response(response)
     end
 
     def handle_response(response)
-      @success = case response.code.to_i
+      @success = case response.status
       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}})
+        raise TicketSharing::Error.new(%Q{#{response.status}\n\n#{response.body}})
       end
       response
     end

data/lib/ticket_sharing/request.rb

@@ -1,3 +1,4 @@
+require 'ticket_sharing'
 require 'ticket_sharing/error'
 
 module TicketSharing
@@ -6,67 +7,66 @@ module TicketSharing
 
     CA_PATH = "/etc/ssl/certs"
 
-    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 initialize(connection = TicketSharing.connection)
+      @connection = connection
+    end
 
-      response = send_request(request_class, url, options)
+    def request(method, url, options = {})
+      raise ArgumentError, "Unsupported method: #{method.inspect}" unless %i(get post put delete).include?(method)
 
-      follow_redirects!(request_class, response, options)
+      response = send_request(method, url, options)
+      follow_redirects!(method, response, options)
     end
 
     private
 
-    def send_request(request_class, url, options)
-      uri = URI.parse(url)
-      request = build_request(request_class, uri, options)
-      send!(request, uri, options)
-    end
+    def send_request(method, url, options)
+      response = nil
 
-    def build_request(request_class, uri, options)
-      request = request_class.new(uri.path)
-      request['Accept'] = 'application/json'
-      request['Content-Type'] = 'application/json'
-
-      (options[:headers] || {}).each do |k, v|
-        request[k] = v
+      with_ssl_connection(options) do
+        response = @connection.send(method) do |request|
+          configure_request(request, url, options)
+        end
       end
 
-      request.body = options[:body]
-
-      request
+      response
     end
 
-    def send!(request, uri, options)
-      http = Net::HTTP.new(uri.host, uri.port)
+    def with_ssl_connection(options)
+      ssl_config = {}
+      ssl_config[:ca_path] = CA_PATH if File.exist?(CA_PATH)
+      ssl_config[:verify]  = false   if options[:ssl] && options[:ssl][:verify] == false
+
+      old_configuration = @connection.instance_variable_get(:@ssl)
+      @connection.instance_variable_set(:@ssl, ssl_config) unless ssl_config.empty?
+      yield
+    ensure
+      @connection.instance_variable_set(:@ssl, old_configuration)
+    end
 
-      if uri.scheme == 'https'
-        http.use_ssl = true
-        http.ca_path = CA_PATH if File.exist?(CA_PATH)
+    def configure_request(request, url, options)
+      uri = URI.parse(url)
 
-        if options[:ssl] && options[:ssl][:verify] == false
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
+      request.url url
+      {
+        'Accept'       => 'application/json',
+        'Content-Type' => 'application/json'
+      }.merge(options[:headers] || {}).each do |h, v|
+        request.headers[h] = v
       end
 
-      http.start { |http| http.request(request) }
+      request.body = options[:body]
     end
 
-    def follow_redirects!(request_class, response, options)
+    def follow_redirects!(method, response, options)
       redirects = 0
-      while (300..399).include?(response.code.to_i)
+      while (300..399).include?(response.status)
         if redirects >= MAX_REDIRECTS
           raise TicketSharing::TooManyRedirects
         else
           redirects += 1
         end
-        response = send_request(request_class, response['Location'], options)
+        response = send_request(method, response['Location'], options)
       end
       response
     end

data/lib/ticket_sharing/ticket.rb

@@ -48,21 +48,21 @@ module TicketSharing
       client = Client.new(url, agreement.authentication_token)
       @response = client.post(relative_url, self.to_json)
 
-      @response.code.to_i
+      @response.status
     end
 
     def update_partner(url)
       client = Client.new(url, agreement.authentication_token)
       @response = client.put(relative_url, self.to_json)
 
-      @response.code.to_i
+      @response.status
     end
 
     def unshare(base_url)
       client = Client.new(base_url, agreement.authentication_token)
       @response = client.delete(relative_url)
 
-      @response.code.to_i
+      @response.status
     end
 
     def relative_url

metadata

@@ -1,15 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ticket_sharing
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Josh Lubaway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
-dependencies: []
+date: 2016-05-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A ruby implementation of the Networked Help Desk API
 email: josh@zendesk.com
 executables: []
@@ -18,6 +88,7 @@ extra_rdoc_files:
 - Readme.md
 files:
 - Readme.md
+- lib/ticket_sharing.rb
 - lib/ticket_sharing/actor.rb
 - lib/ticket_sharing/agreement.rb
 - lib/ticket_sharing/attachment.rb
@@ -43,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="