zendesk2 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930984502b3ffcce83fd01762bb8d48a07d760d5
-  data.tar.gz: 901281d2b7f73eeedbb0405ab259f62d6ab920aa
+  metadata.gz: 281e65de8d7fc12c868312a9d3544dec44a584f7
+  data.tar.gz: 020d4a2cedceba691113f3bf5a18137a5c8df58d
 SHA512:
-  metadata.gz: f642fe7199612809c97ec24c1f3a680ac33a270944d4205c6316bf4a6a4429224f0b09d331f1af5b4d671345b1450029be7af405d96471fadfb12064d277fa40
-  data.tar.gz: 76141a4780845418663435b0ef1cd769d0fe5ba5cbcc277d31df3c8978587c5f497d3802e75e1b32497bcf5e6e627c97565241ce59e90b5c8c4fe7da917dbfe3
+  metadata.gz: f5a5ecc71d76557bc9e4dd70f64da853c70953f2a1040e87c72371f7fb005e3c7f56cac5537802e9a205103f42d994fa21cfaf5480b3cf7405f9881351c98f07
+  data.tar.gz: 877a512b7b15e43c6c9c882a1e063792c11a638aeea00bceb060340a922cff1aa92e0a208a6abb7c6a584b1016dc546340711a2e5ad83498d8ece93c584c7c08

data/lib/zendesk2.rb

@@ -12,7 +12,7 @@ require 'forwardable'
 require 'logger'
 require 'time'
 require 'yaml'
-require 'uri'
+require 'securerandom'
 
 module Zendesk2
   def self.defaults
@@ -24,20 +24,21 @@ module Zendesk2
   end
 
   def self.paging_parameters(options={})
-    if url = options["url"]
-      uri = Addressable::URI.parse(url)
-      uri.query_values
-    else
-      Cistern::Hash.slice(options, "page", "per_page")
-    end
+    params = if url = options["url"]
+               Addressable::URI.parse(url).query_values
+             else
+               options
+             end
+
+    Cistern::Hash.slice(params, "page", "per_page")
   end
 
   def self.uuid
-    [8,4,4,4,12].map{|i| Cistern::Mock.random_hex(i)}.join("-")
+    SecureRandom.uuid
   end
 
   def self.stringify_keys(hash)
-    hash.inject({}){|r,(k,v)| r.merge(k.to_s => v)}
+    hash.inject({}) { |r,(k,v)| r.merge(k.to_s => v) }
   end
 
   def self.blank?(string)

data/lib/zendesk2/client.rb

@@ -21,6 +21,7 @@ class Zendesk2::Client < Cistern::Service
   module Shared
     def require_parameters(_params, *requirements)
       params = Cistern::Hash.stringify_keys(_params)
+      params.reject! { |_,v| Zendesk2.blank?(v) }
 
       if (missing = requirements - params.keys).any?
         raise ArgumentError, "missing parameters: #{missing.join(", ")}"

data/lib/zendesk2/client/mock.rb

@@ -42,7 +42,7 @@ class Zendesk2::Client < Cistern::Service
 
     def initialize(options={})
       @url                 = options[:url]
-      @path                = ::URI.parse(url).path
+      @path                = Addressable::URI.parse(url).path
       @username, @password = options[:username], options[:password]
       @token               = options[:token]
       @jwt_token           = options[:jwt_token]

data/lib/zendesk2/client/real.rb

@@ -6,7 +6,7 @@ class Zendesk2::Client < Cistern::Service
 
     def initialize(options={})
       @url = if url = options[:url] || Zendesk2.defaults[:url]
-               ::URI.parse(url).to_s
+               Addressable::URI.parse(url).to_s
              end
 
       @logger   = options[:logger]   || Logger.new(nil)

data/lib/zendesk2/client/requests/get_user.rb

@@ -12,9 +12,9 @@ class Zendesk2::Client
 
   class Mock
     def get_user(params={})
-      id   = params["id"]
+      id = require_parameters(params, "id").to_i
 
-      identities = self.data[:identities].values.select{|i| i["user_id"] == id}
+      identities = self.data[:identities].values.select { |i| i["user_id"] == id }
       identity = identities.find { |i| i["type"] == "email" && i["primary"] } || identities.find { |i| i["type"] == "email" }
 
       # @todo what happens if no identity?

data/lib/zendesk2/client/requests/get_user_identities.rb

@@ -5,9 +5,9 @@ class Zendesk2::Client
       page_params = Zendesk2.paging_parameters(params)
 
       request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/users/#{user_id}/identities.json",
+        :params => page_params,
+        :method => :get,
+        :path   => "/users/#{user_id}/identities.json",
       )
     end
   end # Real

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable