sirportly 1.3.8 → 1.3.9

data/lib/sirportly.rb

@@ -31,29 +31,29 @@ require 'sirportly/data_objects/ticket_update'
 require 'sirportly/data_objects/user'
 
 module Sirportly
-  VERSION = '1.3.8'
-  
+  VERSION = '1.3.9'
+
   class << self
-    
+
     ## Stores the application token if one has been provided. This can be nil if no
     ## application token exists, however if nil, you cannot authenticate using user
     ## tokens.
     attr_accessor :application
-    
-    ## Specifies whether or not to execute rules when running API calls. By default, 
+
+    ## Specifies whether or not to execute rules when running API calls. By default,
     ## all rules will be run. Set to false to stop execution.
     attr_accessor :execute_rules
-    
+
     ## Allow the domain to be changed
     attr_writer :domain
-    
+
     ## Returns the domain which should be used to query the API
     def domain
       @domain ||= 'https://api.sirportly.com'
     end
-    
+
   end
-  
+
   ## Various error classes to raise
   class Error < StandardError; end
   module Errors
@@ -63,5 +63,5 @@ module Sirportly
     class CommunicationError < Error; end
     class ValidationError < Error; end
   end
-  
+
 end

data/lib/sirportly/client.rb

@@ -1,127 +1,127 @@
 module Sirportly
   class Client
-    
-    attr_reader :token, :secret
-    
-    def initialize(token, secret)
-      @token, @secret = token, secret
+
+    attr_reader :token, :secret, :opts
+
+    def initialize(token, secret, opts={})
+      @token, @secret, @opts = token, secret, opts
     end
-    
+
     ## Make a request using this client's authentication token and return the request.
     def request(*args)
       Request.request(self, *args)
     end
-    
+
     ## Return all brands
     def brands
       Brand.all(self)
     end
-    
+
     ## Creates a new ticket
     def create_ticket(params = {})
       Ticket.create(self, params)
     end
-    
+
     ## Return all customers
     def customers(opts = {})
       Customer.all(self, opts)
     end
-    
+
     ## Return a specific customer
     def customer(q)
       Customer.find(self, q)
     end
-    
+
     ## Return all departments
     def departments
       Department.all(self)
     end
-    
+
     ## Return all escalation paths
     def escalation_paths
       EscalationPath.all(self)
     end
-    
+
     ## Return all filters
     def filters
       Filter.all(self)
     end
-    
+
     ## Return all knowledge bases
     def knowledge_bases
       KnowledgeBase.all(self)
     end
-    
+
     ## Return a specific knowledge base
     def knowledge_base(q)
       KnowledgeBase.find(self, q)
     end
-    
+
     ## Return all priorities
     def priorities
       Priority.all(self)
     end
-    
+
     ## Return all SLAs
     def slas
       SLA.all(self)
     end
-    
+
     ## Return all custom fields
     def custom_fields
       CustomField.all(self)
     end
-    
+
     ## Execute an SPQL query and return the SPQLQuery instance
     def spql(query)
       SPQLQuery.new(self, query)
     end
-    
+
     ## Return all statuses
     def statuses
       Status.all(self)
     end
-    
+
     ## Return all teams
     def teams
       Team.all(self)
     end
-    
+
     ## Return all tickets
     def tickets(opts = {})
       Ticket.all(self, opts)
     end
-    
+
     ## Return a specific ticket
     def ticket(q)
       Ticket.find(self, q)
     end
-    
+
     ## Return a set of tickets for given search term
     def ticket_search(query, page = 1)
       Ticket.search(self, query, page)
     end
-    
+
     ## Return all users
     def users(opts = {})
       User.all(self, opts)
     end
-    
+
     ## Return a specific user
     def user(q)
       User.find(self, q)
     end
-    
+
     ## Create a user
     def create_user(params = {})
       User.create(self, params)
     end
-    
+
     ## Return all api token
     def api_tokens
       ApiToken.all(self)
     end
-    
+
     ## Creates a new api token
     def create_api_token(params = {})
       ApiToken.create(self, params)
@@ -130,7 +130,7 @@ module Sirportly
     def contact_tickets(params = {})
       Ticket.contact(self, params)
     end
-    
+
     ## Enable or disable ticket mode for the token's account
     def import_mode(status = nil)
       hash = {}
@@ -138,6 +138,6 @@ module Sirportly
       response = Request.request(self, 'accounts/import_mode', hash)
       response.is_a?(Hash) ? response['status'] : nil
     end
-    
+
   end
 end

data/lib/sirportly/request.rb

@@ -1,50 +1,50 @@
 module Sirportly
   class Request
-    
+
     def self.request(client, path, data = {})
       req = self.new(client, path, :post)
       req.data = data
       req.make && req.success? ? req.output : false
     end
-    
+
     attr_reader :path, :method, :client
     attr_accessor :data
-    
+
     def initialize(client, path, method = :get)
       @path = path
       @method = method
       @client = client
     end
-    
+
     def success?
       @success || false
     end
-    
+
     def output
       @output || nil
     end
-    
+
     def make
-      uri = URI.parse([Sirportly.domain, "api/v1", @path].join('/'))
+      uri = URI.parse([domain, "api/v1", @path].join('/'))
       http_request = http_req(uri, @data.stringify_keys)
       http_request.add_field("User-Agent", "SirportlyRubyClient/#{Sirportly::VERSION}")
       http_request.add_field("X-Auth-Token", @client.token)
       http_request.add_field("X-Auth-Secret", @client.secret)
       http_request.add_field("X-Sirportly-Rules", "disabled") if Sirportly.execute_rules == false
 
-      if Sirportly.application
-        http_request.add_field("X-Auth-Application", Sirportly.application)
+      if application
+        http_request.add_field("X-Auth-Application", application)
       end
 
       http = Net::HTTP.new(uri.host, uri.port)
-      
+
       if uri.scheme == 'https'
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
       http_result = http.request(http_request)
-      
+
       if http_result.body == 'true'
         @output = true
       elsif http_result.body == 'false'
@@ -52,7 +52,7 @@ module Sirportly
       else
         @output = JSON.parse(http_result.body)
       end
-      
+
       @success = case http_result
       when Net::HTTPSuccess
         true
@@ -72,9 +72,9 @@ module Sirportly
       end
       self
     end
-    
+
     private
-    
+
     def http_req(uri, data)
       case @method
       when :post
@@ -84,7 +84,7 @@ module Sirportly
           r = Net::HTTP::Put.new(uri.request_uri)
           r.set_form_data(data)
         end
-        
+
         return r
       when :put
         r = Net::HTTP::Put.new(uri.request_uri)
@@ -100,6 +100,14 @@ module Sirportly
         return r
       end
     end
-    
+
+    def domain
+      @client.opts[:domain] || Sirportly.domain
+    end
+
+    def application
+      @client.opts[:application] || Sirportly.application
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sirportly
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Easy to use client library for Sirportly.