zendesk2 0.5.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e98a8ac074916225c83cf4271ea8d314249b5918
-  data.tar.gz: 1cb904e381f8fd9885583d7f7127a9ded19250c7
+  metadata.gz: 3fb950fdc0ae118b3bba5edfb7a2729bec53561d
+  data.tar.gz: 2d427b0a21b5b0fdc8551013a2c76f1a36bf7587
 SHA512:
-  metadata.gz: 3061708e3f94ff0f7890b826e14abe779248468c5247290f228a88a0db2aec1eb04ce19e441a3f34ea176bbf833d698466e3f27b64e8bd34d281a1b035c6130c
-  data.tar.gz: a59e3fa35f2d3c263ac0b1aaf4ebc0e1396597cbfd045112dd8480d9c33efd8f0208b8e4f2fe6d6167311b228c285d082c5357087d301836cf17ebeefda0d2f1
+  metadata.gz: 4094b670f1a2f9e40a391ad70db20f3e5699b8eb1661d643d5a1e62ad80e0e81238470c67d7fa1d64e38f958b331ff4164bbe06f476b3329a8d0b144a087d6f4
+  data.tar.gz: 5f42f0d0fc4fe7948baf89c14c424ee31a4b3c0794fbf31302c1af80b37b25416b58488607d3afa369ba0ccb4e763b7574b92694570a5fad1d057ab95b5e1641

data/lib/zendesk2/client.rb

@@ -121,7 +121,7 @@ class Zendesk2::Client < Cistern::Service
   request :update_user_field
   request :update_user_identity
 
-  recognizes :url, :subdomain, :host, :port, :path, :scheme, :logger, :adapter, :username, :password, :token, :jwt_token
+  recognizes :url, :logger, :adapter, :username, :password, :token, :jwt_token
 
   module Shared
     def require_parameters(params, *requirements)
@@ -129,23 +129,6 @@ class Zendesk2::Client < Cistern::Service
         raise ArgumentError, "missing parameters: #{missing.join(", ")}"
       end
     end
-
-    private
-
-    def zendesk_url(options)
-      options[:url] || Zendesk2.defaults[:url] || form_zendesk_url(options)
-    end
-
-    def form_zendesk_url(options)
-      host      = options[:host]
-      subdomain = options[:subdomain] || Zendesk2.defaults[:subdomain]
-
-      host ||= "#{subdomain}.zendesk.com"
-      scheme = options[:scheme] || "https"
-      port   = options[:port] || (scheme == "https" ? 443 : 80)
-
-      "#{scheme}://#{host}:#{port}"
-    end
   end
 
   class Real
@@ -154,19 +137,23 @@ class Zendesk2::Client < Cistern::Service
     attr_accessor :username, :url, :token, :logger, :jwt_token
 
     def initialize(options={})
-      url = zendesk_url(options)
-      @url  = ::URI.parse(url).to_s
-
-      @logger            = options[:logger] || Logger.new(nil)
-      adapter            = options[:adapter] || :net_http
-      connection_options = options[:connection_options] || {ssl: {verify: false}}
-      @username          = options[:username] || Zendesk2.defaults[:username]
-      @token             = options[:token] || Zendesk2.defaults[:token]
-      password           = options[:password] || Zendesk2.defaults[:password]
-      @auth_token        = password || @token
-      @username         += "/token" if @auth_token == @token
-      @jwt_token         = options[:jwt_token]
+      @url = if url = options[:url] || Zendesk2.defaults[:url]
+               ::URI.parse(url).to_s
+             end
+
+      @logger   = options[:logger]   || Logger.new(nil)
+      adapter   = options[:adapter]  || Faraday.default_adapter
+      @username = options[:username] || Zendesk2.defaults[:username]
+      @token    = options[:token]    || Zendesk2.defaults[:token]
+      password  = options[:password] || Zendesk2.defaults[:password]
+
+      connection_options = options[:connection_options] || {}
 
+      @auth_token  = password || @token
+      @username   += "/token" if @auth_token == @token
+      @jwt_token   = options[:jwt_token]
+
+      raise "Missing required options: :url" unless @url
       raise "Missing required options: :username" unless @username
       raise "Missing required options: :password or :token" unless password || @token
 
@@ -242,9 +229,7 @@ class Zendesk2::Client < Cistern::Service
     end
 
     def initialize(options={})
-      url = zendesk_url(options)
-
-      @url  = url
+      @url  = options[:url]
       @path = ::URI.parse(url).path
       @username, @password = options[:username], options[:password]
       @token = options[:token]

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "0.5.4"
+  VERSION = "1.0.0"
 end

data/spec/spec_helper.rb

@@ -13,9 +13,10 @@ end
 Cistern.formatter = Cistern::Formatter::AwesomePrint
 
 RSpec.configure do |config|
-  config.before(:each) do
-    Zendesk2::Client.reset! if Zendesk2::Client.mocking?
+  if Zendesk2::Client.mocking?
+    config.before(:each) { Zendesk2::Client.reset! }
   end
+
   config.order = "random"
-  config.filter_run_excluding(:mock_only => true) unless Zendesk2::Client.mocking?
+  config.filter_run_excluding(mock_only: true) unless Zendesk2::Client.mocking?
 end

data/spec/tickets_spec.rb

@@ -69,9 +69,7 @@ describe "Zendesk2::Client" do
       expect(ticket.submitter).to eq(client.users.current)
     end
 
-    it "should have empty custom fields by default" do
-      pending if !Zendesk2::Client.mocking?
-
+    it "should have empty custom fields by default", mock_only: true do
       expect(ticket.custom_fields).to eq([])
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Josh Lane