zendesk2 1.5.12 → 1.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2704a7e73413c045698c7d7c28204609d114bcf6
-  data.tar.gz: 875403304d611be75c6d2e33ee0611e6d2e026c5
+  metadata.gz: c674ffdaf290aa003843999126fd4a91ec5cbc5e
+  data.tar.gz: 9833ea51c7f813627bbcb8c1ab665ca81cf318f9
 SHA512:
-  metadata.gz: 0ec9a8b932f31698c6b09a81e197ae80593302f1444fa12b2f5f83d440d827eb4d3c125d5c74160d1a6b7593e2c6c2e0d5958bea893f1c64d53780e108550a1e
-  data.tar.gz: 7bd85661df9a778aecd039da44763b0fc0c2d616b23a46b4d6462946bc5b5fd49a5b1eeda71dcd7c6b9e99ae59858ab9eb573d7b48d835f9c20bf9209918313d
+  metadata.gz: 2229829dc333da6699459a16ab55809ad7aa415c30c0140319e663dca9da46dcd4f0ef111e8c771bf40dedb761848b1682b7f5aee58e85ccfcfeefaf3f2ab55a
+  data.tar.gz: 0894c69b3f3a566bab16d2e8fa0969a212936654cda0744b76b6a0fffb8ea3572cc08de6704385a42aa65fe2ee51022091ee744f73b089bffb956169a3791634

data/lib/zendesk2/client/collections/tickets.rb

@@ -11,10 +11,10 @@ class Zendesk2::Client::Tickets < Zendesk2::Client::Collection
   assoc_accessor :requester
   assoc_accessor :collaborator
 
-  self.collection_root   = "tickets"
-  self.model_method      = :get_ticket
-  self.model_root        = "ticket"
-  self.search_type       = "ticket"
+  self.collection_root = "tickets"
+  self.model_method    = :get_ticket
+  self.model_root      = "ticket"
+  self.search_type     = "ticket"
 
   def collection_page(params={})
     collection_method = if requester_id
@@ -31,4 +31,7 @@ class Zendesk2::Client::Tickets < Zendesk2::Client::Collection
     self.merge_attributes(Cistern::Hash.slice(body, "count", "next_page", "previous_page"))
     self
   end
+
+  scopes << :requester_id
+  scopes << :collaborator_id
 end

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

@@ -71,7 +71,7 @@ class Zendesk2::Client::CreateTicket < Zendesk2::Client::Request
     }.merge(create_params)
 
     record["requester_id"] ||= (requester_id && requester_id.to_i) || service.current_user["id"]
-    record["submitter_id"] = service.current_user["id"].to_s
+    record["submitter_id"] = service.current_user["id"].to_i
 
     # @note invalid requester id does NOT cause a 404 or 422
     record["organization_id"] = if requester = service.data[:users][record["requester_id"].to_i]

data/lib/zendesk2/searchable.rb

@@ -20,12 +20,17 @@ module Zendesk2::Searchable
   def search(terms, params={})
     query = if terms.is_a?(Hash)
               terms.merge!("type" => self.class.search_type) if self.class.search_type
-              terms.merge(self.class.scopes.inject({}){|r,k| r.merge(k.to_s => public_send(k))}).
-                map { |k,v| "#{k}:#{v}" }.join(" ")
+              terms.merge(self.class.scopes.inject({}) { |r,k|
+                val = public_send(k)
+                val.nil? ? r : r.merge(k.to_s => val)
+              }).map { |k,v| "#{k}:#{v}" }.join(" ")
             else
               additional_terms = []
               additional_terms = ["type:#{self.class.search_type}"] if self.class.search_type
-              additional_terms += self.class.scopes.inject([]) { |r,k| ["#{k}:#{public_send(k)}"] }
+              additional_terms += self.class.scopes.inject([]) { |r,k|
+                val = public_send(k)
+                val.nil? ? r : ["#{k}:#{val}"]
+              }
 
               additional_terms.inject(terms.to_s) do |qualified_search, qualification|
                 if !qualified_search.include?(qualification)

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.5.12"
+  VERSION = "1.5.13"
 end

data/spec/users_spec.rb

@@ -77,10 +77,15 @@ describe "users" do
     it "should get requested tickets" do
       another_user = client.users.create!(email: mock_email, name: mock_uuid)
 
-      another_user.tickets.create!(collaborators: [user], subject: mock_uuid, description: mock_uuid)
-      ticket = user.tickets.create!(requester: user, subject: mock_uuid, description: mock_uuid)
+      2.times.each {
+        another_user.tickets.create!(collaborators: [user], subject: mock_uuid, description: mock_uuid)
+      }
 
-      expect(user.requested_tickets).to contain_exactly(ticket)
+      targets = 2.times.map {
+        user.tickets.create!(requester: user, subject: mock_uuid, description: mock_uuid)
+      }
+
+      expect(user.requested_tickets.all(per_page: 1).all_entries).to match_array(targets)
     end
 
     it "should get ccd tickets", mock_only: true do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.13
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern