zendesk2 1.7.2 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db3f34cbbdf52fdf9a7ccbe8f4f1850ba6f91ac
-  data.tar.gz: b06f3c2f223f5a8ea1f4815e2130112bb6e6cd3e
+  metadata.gz: 16ff1793762e3e79b861085c3c15546dcc0972ed
+  data.tar.gz: 1b221889fcadd78477031cf1b84cffffac37bf90
 SHA512:
-  metadata.gz: 7b4d01b853ec1356f2a12b92b6f3c7060f3c107a813e936ff99efcd8f4440f7a18d06a1ac90b0caffa6a5965219eadeaea9a026abd3d20f2fc3bd0f40f83f4af
-  data.tar.gz: 6b7345a170e99e6c335b7cfacec1551e2051a56d5c0a5caa967d9a197ea579601c503a9fb683499c912220e5aec186d0da892df9e49b6ca7c8aeeb76e6a116ff
+  metadata.gz: af82a3dfd968173f87118ce99a099b26ac9741d94057953abe1ffb5839512a14599010cd1fb397e94035017af99c38056c51a7cb7ec35efa2d75b814b1226ca4
+  data.tar.gz: cf4674bc02e4cf6215e8e9c3fb8768b71c71a78ca0839e1e36726d2a5bbac02b1936e98df9c7dfe43e5706a631d9676f42b43587ee076091f4a26e0e453f1db9

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
+sudo: false
+cache:
+  - bundler
 rvm:
-  - "2.1.2"
-  - "1.9.3"
+  - "2.2"
+  - "1.9"
 script: "bundle exec rake --trace"
 notifications:
   email:

data/lib/zendesk2/client/mock.rb

@@ -1,74 +1,76 @@
-class Zendesk2::Client
-  class Mock
+class Zendesk2::Client::Mock
+  attr_reader :username, :url, :token, :jwt_token
+  attr_accessor :last_request
 
-    attr_reader :username, :url, :token, :jwt_token
-    attr_accessor :last_request
+  def self.data
+    @data ||= Hash.new { |h,k| h[k] = {
+      :categories             => {},
+      :forums                 => {},
+      :groups                 => {},
+      :help_center_articles   => {},
+      :help_center_categories => {},
+      :help_center_sections   => {},
+      :identities             => {},
+      :memberships            => {},
+      :organizations          => {},
+      :ticket_audits          => {},
+      :ticket_comments        => {},
+      :ticket_fields          => {},
+      :ticket_metrics         => {},
+      :tickets                => {},
+      :topic_comments         => {},
+      :topics                 => {},
+      :user_fields            => {},
+      :users                  => {},
+      :views                  => {},
+    }
+    }
+  end
 
-    def self.data
-      @data ||= Hash.new { |h,k| h[k] = {
-        :categories             => {},
-        :forums                 => {},
-        :groups                 => {},
-        :help_center_articles   => {},
-        :help_center_categories => {},
-        :help_center_sections   => {},
-        :identities             => {},
-        :memberships            => {},
-        :organizations          => {},
-        :ticket_audits          => {},
-        :ticket_comments        => {},
-        :ticket_fields          => {},
-        :ticket_metrics         => {},
-        :tickets                => {},
-        :topic_comments         => {},
-        :topics                 => {},
-        :user_fields            => {},
-        :users                  => {},
-        :views                  => {},
-      }
-      }
-    end
+  def self.serial_id
+    @current_id ||= 0
+    @current_id += 1
+    @current_id
+  end
 
-    def self.serial_id
-      @current_id ||= 0
-      @current_id += 1
-      @current_id
-    end
+  def data
+    self.class.data[@url]
+  end
 
-    def data
-      self.class.data[@url]
-    end
+  def reset
+    data.clear
+  end
 
-    def reset
-      data.clear
-    end
+  def self.reset
+    data.clear
+  end
 
-    def self.reset
-      data.clear
-    end
+  def serial_id
+    self.class.serial_id
+  end
 
-    def serial_id
-      self.class.serial_id
-    end
+  def initialize(options={})
+    @url                 = options[:url]
+    @path                = URI.parse(url).path
+    @username, @password = options[:username], options[:password]
+    @token               = options[:token]
+    @jwt_token           = options[:jwt_token]
 
-    def initialize(options={})
-      @url                 = options[:url]
-      @path                = URI.parse(url).path
-      @username, @password = options[:username], options[:password]
-      @token               = options[:token]
-      @jwt_token           = options[:jwt_token]
+    @current_user ||= self.data[:users].values.find { |u|
+      @username == u["name"]
+    } || self.create_user(
+      "user" => {"email" => @username, "name" => @username}
+    ).body["user"]
 
-      @current_user ||= self.create_user("user" => {"email" => @username, "name" => "Mock Agent"}).body["user"]
-      @current_user_identity ||= self.data[:identities].values.first
-    end
+    @current_user_identity ||= self.data[:identities].values.first
+  end
 
-    # Lazily re-seeds data after reset
-    # @return [Hash] current user response
-    def current_user
-      self.data[:users][@current_user["id"]] ||= @current_user
-      self.data[:identities][@current_user_identity["id"]] ||= @current_user_identity
+  # Lazily re-seeds data after reset
+  # @return [Hash] current user response
+  def current_user
+    self.data[:users][@current_user["id"]]               ||= @current_user
+    self.data[:identities][@current_user_identity["id"]] ||= @current_user_identity
 
-      @current_user
-    end
+    @current_user
   end
 end

data/lib/zendesk2/client/models/ticket_audit.rb

@@ -23,6 +23,8 @@ class Zendesk2::Client::TicketAudit < Zendesk2::Client::Model
   end
 
   def events
-    (self.attributes[:events] || []).map{|ae| Zendesk2::Client::AuditEvent.for(ae.merge(ticket_audit: self, service: self.service))}
+    (self.attributes[:events] || []).map { |ae|
+      Zendesk2::Client::AuditEvent.for(ae.merge(ticket_audit: self, service: self.service))
+    }
   end
 end

data/lib/zendesk2/client/real.rb

@@ -1,71 +1,69 @@
-class Zendesk2::Client
-  class Real
+class Zendesk2::Client::Real
 
-    attr_accessor :username, :url, :token, :logger, :jwt_token, :last_request
+  attr_accessor :username, :url, :token, :logger, :jwt_token, :last_request
 
-    def initialize(options={})
-      @url = if url = options[:url] || Zendesk2.defaults[:url]
-               URI.parse(url).to_s
-             end
+  def initialize(options={})
+    @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.fetch(:token, Zendesk2.defaults[:token])
-      password  = options[:password] || Zendesk2.defaults[:password]
+    @logger   = options[:logger]   || Logger.new(nil)
+    adapter   = options[:adapter]  || Faraday.default_adapter
+    @username = options[:username] || Zendesk2.defaults[:username]
+    @token    = options.fetch(:token, Zendesk2.defaults[:token])
+    password  = options[:password] || Zendesk2.defaults[:password]
 
-      service_options = options[:service_options] || {}
+    service_options = options[:service_options] || {}
 
-      @auth_token  = password || @token
-      @username   += "/token" if @auth_token == @token
-      @jwt_token   = options[:jwt_token]
+    @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
+    raise "Missing required options: :url" unless @url
+    raise "Missing required options: :username" unless @username
+    raise "Missing required options: :password or :token" unless password || @token
 
-      @service = Faraday.new({url: @url}.merge(service_options)) do |connection|
-        # response
-        connection.use Faraday::Request::BasicAuthentication, @username, @auth_token
-        connection.use Faraday::Response::RaiseError
-        connection.response :json, content_type: /\bjson/
+    @service = Faraday.new({url: @url}.merge(service_options)) do |connection|
+      # response
+      connection.use Faraday::Request::BasicAuthentication, @username, @auth_token
+      connection.use Faraday::Response::RaiseError
+      connection.response :json, content_type: /\bjson/
 
-        # request
-        connection.request :multipart
-        connection.request :json
+      # request
+      connection.request :multipart
+      connection.request :json
 
-        # idempotency
-        connection.request :retry,
-          :max                 => 30,
-          :interval            => 1,
-          :interval_randomness => 0.2,
-          :backoff_factor      => 2
+      # idempotency
+      connection.request :retry,
+        :max                 => 30,
+        :interval            => 1,
+        :interval_randomness => 0.2,
+        :backoff_factor      => 2
 
-        # rate limit
-        connection.use Zendesk2::RateLimit, logger: @logger
+      # rate limit
+      connection.use Zendesk2::RateLimit, logger: @logger
 
-        connection.use Zendesk2::Logger, @logger
-        connection.adapter(*adapter)
-      end
+      connection.use Zendesk2::Logger, @logger
+      connection.adapter(*adapter)
     end
+  end
 
-    def request(options={})
-      method  = options[:method] || :get
-      url     = options[:url] || File.join(@url, "/api/v2", options[:path])
-      params  = options[:params] || {}
-      body    = options[:body]
-      headers = {"User-Agent" => USER_AGENT}.merge(options[:headers] || {})
+  def request(options={})
+    method  = options[:method] || :get
+    url     = options[:url] || File.join(@url, "/api/v2", options[:path])
+    params  = options[:params] || {}
+    body    = options[:body]
+    headers = {"User-Agent" => Zendesk2::Client::USER_AGENT}.merge(options[:headers] || {})
 
-      @service.send(method) do |req|
-        req.url(url)
-        req.headers.merge!(headers)
-        req.params.merge!(params)
-        req.body = @last_request = body
-      end
-    rescue Faraday::ConnectionFailed
-      raise
-    rescue Faraday::Error::ClientError => e
-      raise Zendesk2::Error.new(e)
+    @service.send(method) do |req|
+      req.url(url)
+      req.headers.merge!(headers)
+      req.params.merge!(params)
+      req.body = @last_request = body
     end
+  rescue Faraday::ConnectionFailed
+    raise
+  rescue Faraday::Error::ClientError => e
+    raise Zendesk2::Error.new(e)
   end
 end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.7.2"
+  VERSION = "1.7.4"
 end

data/spec/client_spec.rb

@@ -0,0 +1,12 @@
+#encoding: utf-8
+require 'spec_helper'
+
+describe Zendesk2 do
+  context "when mocking", mock_only: true do
+    # this used to cause user creation conflicts
+    it "allows the client to be intialized more than once" do
+      Zendesk2::Client.new(username: "steve@example.org", url: "http://example.org")
+      Zendesk2::Client.new(username: "steve@example.org", url: "http://example.org")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.4
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern
@@ -246,6 +246,7 @@ files:
 - lib/zendesk2/searchable.rb
 - lib/zendesk2/version.rb
 - spec/categories_spec.rb
+- spec/client_spec.rb
 - spec/forums_spec.rb
 - spec/groups_spec.rb
 - spec/help_center/articles_spec.rb
@@ -294,6 +295,7 @@ specification_version: 4
 summary: Zendesk V2 API client
 test_files:
 - spec/categories_spec.rb
+- spec/client_spec.rb
 - spec/forums_spec.rb
 - spec/groups_spec.rb
 - spec/help_center/articles_spec.rb