zendesk2 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be50d350e9c25fc106b0bc4155ee76d24ebce43a
-  data.tar.gz: dda78a4ca0bae941f2c1357a0d443ff50ecc06e1
+  metadata.gz: c07f86f5133eeb2a08c320e2d5c01b1346187d0c
+  data.tar.gz: 97a882ccf6edb6d90f371603c61d0b54d00c4edb
 SHA512:
-  metadata.gz: c8e5ebae513b256ed1fc3f55851f8ad572753dce377b68fca8009376f1ab65cc73ba1aae3e4684d0523bf1e1bc900eadd741117de802931643a967357d0100ba
-  data.tar.gz: 39641e3dc44246592f5e980da926c5a69b754f0d51fb5d6c8497878d6b1475e93bd5a91fd10856660538e33c29df4e098dac6e65a93e44cca1824e3bc3d9b8fa
+  metadata.gz: 0221b1a52704b3572c01245d8903f4600500d93263a9128e24890b1eda336aa381fc94fba66f9f94b9c35e65c8b37240c98432bc88dbf623ad0054880fc44be8
+  data.tar.gz: fa22d5464a2b93c559558f3f19b709a7fcbd45ec1dad93920ce51c2eee1a027043cc915c21703d68df2222bbef686e34ee9c3742d05002973b8461d7b4b166a3

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

@@ -73,11 +73,13 @@ class Zendesk2::Client
       }.merge(params)
 
       record["requester_id"] ||= (requester_id && requester_id.to_s) || current_user["id"].to_s
+      requester = self.find!(:users, record["requester_id"])
+
       record["submitter_id"] = current_user["id"].to_s
 
-      # FIXME: throw error if user doesn't exist?
-      requester = self.find!(:users, record["requester_id"])
-      record["organization_id"] = requester["organization_id"]
+      if record["organization_id"] = params.delete('organization_id') || requester["organization_id"]
+        self.find!(:organizations, record["organization_id"])
+      end
 
       self.data[:tickets][identity] = record
 

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

@@ -15,6 +15,11 @@ class Zendesk2::Client
       user_id = self.class.new_id
       path    = "/users.json"
 
+      if organization_id = params.delete("organization_id")
+        self.find!(:organizations, organization_id)
+        params["organization_id"] = organization_id.to_s
+      end
+
       record = {
         "id"         => user_id,
         "url"        => url_for("/users/#{user_id}.json"),

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

@@ -1,23 +1,25 @@
 class Zendesk2::Client
   class Real
     def get_organization_tickets(params={})
-      id          = params["id"]
+      id          = require_parameters(params, "id").to_s
       page_params = Zendesk2.paging_parameters(params)
 
       request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/organizations/#{id}/tickets.json",
+        :params => page_params,
+        :method => :get,
+        :path   => "/organizations/#{id}/tickets.json",
       )
     end
   end # Real
 
   class Mock
     def get_organization_tickets(params={})
-      id = params["id"]
+      id = require_parameters(params, "id").to_s
 
-      requesters = self.data[:users].values.select{|u| u["organization_id"] == id}.map{|s| s["organization_id"]}
-      page(params, :tickets, "/organizations/#{id}/tickets.json", "tickets", filter: lambda{|c| c.select{|u| requesters.include?(u["organization_id"])}})
+      requesters = self.data[:users].values.select { |u| u["organization_id"] == id }.map { |s| s["organization_id"].to_s }
+      page(params, :tickets, "/organizations/#{id}/tickets.json", "tickets",
+           :filter => lambda { |c| c.select { |u| requesters.include?(u["organization_id"].to_s) } }
+          )
     end
   end # Mock
 end

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

@@ -1,7 +1,7 @@
 class Zendesk2::Client
   class Real
     def get_organization_users(params={})
-      id          = params["id"]
+      id          = require_parameters(params, "id").to_s
       page_params = Zendesk2.paging_parameters(params)
 
       request(
@@ -14,8 +14,11 @@ class Zendesk2::Client
 
   class Mock
     def get_organization_users(params={})
-      id = params["id"]
-      page(params, :users, "/organizations/#{id}/users.json", "users", filter: lambda{|c| c.select{|u| u["organization_id"] == id}})
+      id = require_parameters(params, "id").to_s
+
+      page(params, :users, "/organizations/#{id}/users.json", "users",
+           :filter => lambda { |c| c.select { |u| u["organization_id"].to_s == id } }
+          )
     end
   end # Mock
 end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end

data/spec/tickets_spec.rb

@@ -20,10 +20,11 @@ describe "Zendesk2::Client" do
   end
 
   describe "when creating a ticket" do
-    let!(:requester_email) { "#{mock_uuid}@example.org" }
-
     it "should create requester" do
+      requester_email = mock_email
+
       ticket = client.tickets.create!(subject: mock_uuid, description: mock_uuid, requester: {name: "Josh Lane", email: requester_email})
+
       if Zendesk2::Client.mocking? # this takes some time for realsies
         requester = client.users.search(email: requester_email).first
         expect(requester).not_to be_nil
@@ -34,9 +35,25 @@ describe "Zendesk2::Client" do
       end
     end
 
+    it "should require a valid organization if not blank" do
+      expect {
+        client.tickets.create!(subject: mock_uuid, description: mock_uuid, organization_id: -1)
+      }.to raise_exception(Zendesk2::Error, /RecordNotFound/)
+    end
+
+    it "should default to the requesters primary organization if organization is not specified" do
+      organization = client.organizations.create!(name: mock_uuid)
+      requester = client.users.create!(email: mock_email, name: mock_uuid, organization: organization)
+
+      ticket = client.tickets.create!(requester: requester, subject: mock_uuid, description: mock_uuid)
+
+      expect(ticket.organization).to eq(organization)
+      expect(organization.tickets).to contain_exactly(ticket)
+    end
+
     it "should require requester name" do
       expect {
-        client.tickets.create!(subject: mock_uuid, description: mock_uuid, requester: {email: requester_email})
+        client.tickets.create!(subject: mock_uuid, description: mock_uuid, requester: {email: mock_email})
       }.to raise_exception(Zendesk2::Error, /Requester Name: .* too short/)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -308,3 +308,4 @@ test_files:
 - spec/user_fields_spec.rb
 - spec/user_identities_spec.rb
 - spec/users_spec.rb
+has_rdoc: