zendesk2 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b82a5a48123f485de6ede8d43e13a302538888
-  data.tar.gz: 6e1df0272327038e7b5b476ee56611e580324a05
+  metadata.gz: da53e74ee09d2c85abc260d39f02878a346d769e
+  data.tar.gz: 255c672c805f8bfd51b8bd3ee682fa6f5de1d30d
 SHA512:
-  metadata.gz: 986b90b437821c2b751d66f31c6e74736e0bfe603bb4cb05e40a9f64a170ade9df31f38cf937e99871a7248c7a363c85c3ec010e23295f74d98edb837b7a57bc
-  data.tar.gz: 94f4606077f53d047ba69058a34e414727399e91e7ac074890afef445d846efe2e52b9b40e22b80045a637911e3a3fb646d42f50393d402d3015be3dc9570905
+  metadata.gz: 35529ac971be807243949d67d763a07192dd27491f8e16822ec0a2d27056c163bf5dbb2a590815c63d178ca2fffe82c4c2a5b5444ab9d22f9472a4a6823dffc9
+  data.tar.gz: 53945ba5705d696416c9d7e073d3e9bdeb85b2143ee592f8e5874f6cdcb62940c97ae6c1493e0ce9fa77a99a84fa1dde864da810d262a2f4a85e85fa2341257c

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

@@ -21,46 +21,13 @@ class Zendesk2::Client
       }.merge(params)
 
       unless record["name"]
-        response(
-          :status  => 422,
-          :headers => {
-            "status" => "422 Unprocessable Entity",
-          },
-          :body => {
-            "error"       => "RecordInvalid",
-            "description" => "Record validation errors",
-            "details"     => {
-              "name" => [
-                {
-                  "description" => "Name cannot be blank"
-                }
-              ]
-            }
-          }
-        )
+        error!(:invalid, details: { "name" => [ { "description" => "Name cannot be blank" } ]})
       end
 
       if self.data[:organizations].values.find{|o| o["name"] == record["name"]}
-        response(
-          :status  => 422,
-          :headers => {
-            "status" => "422 Unprocessable Entity",
-          },
-          :body    => {
-            "error"       => "RecordInvalid",
-            "description" => "Record validation errors",
-            "details"     => {
-              "name" => [
-                {
-                  "description" => "Name: has already been taken"
-                }
-              ]
-            }
-          }
-        )
+        error!(:invalid, details: {"name" => [ { "description" => "Name: has already been taken" } ]})
       end
 
-
       self.data[:organizations][identity]= record
 
       response(

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

@@ -14,8 +14,15 @@ class Zendesk2::Client
   end
   class Mock
     def update_organization(params={})
-      id   = params.delete("id")
-      body = self.data[:organizations][id].merge!(params)
+      id = params.delete("id")
+
+      organization = self.find!(:organizations, id)
+
+      if self.data[:organizations].values.find { |o| o["name"] == params["name"] && o["id"] != id }
+        error!(:invalid, details: {"name" => [ { "description" => "Name: has already been taken" } ]})
+      end
+
+      body = organization.merge!(params)
 
       response(
         :method => :put,

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/organizations_spec.rb

@@ -10,7 +10,8 @@ describe "organizations" do
   }
 
   describe "with an organization" do
-    let(:organization) { client.organizations.create(name: Zendesk2.uuid) }
+    let(:organization) { client.organizations.create!(name: Zendesk2.uuid) }
+
     it "should get #users" do
       user = client.users.create(email: "#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: organization)
       expect(organization.users).to include user
@@ -26,15 +27,17 @@ describe "organizations" do
       expect { client.organizations.create!(name: organization.name) }.to raise_exception(Zendesk2::Error)
       model = client.organizations.create(name: organization.name)
       expect(model.errors).to eq({"name" => ["Name: has already been taken"]})
+      model = client.organizations.create(name: Zendesk2.uuid)
+      model.name = organization.name
+      model.save
+      expect(model.errors).to eq({"name" => ["Name: has already been taken"]})
     end
 
     it "should be able to find organizations by external id" do
-      o = organization
-      external_id = o.name + "_foo"
-      o.external_id = external_id
-      o.save
-      found = client.organizations.find_by_external_id(external_id).first
-      expect(found).to be === o
+      external_id = organization.external_id = Zendesk2.uuid
+      organization.save!
+
+      expect(client.organizations.find_by_external_id(external_id).first).to eq(organization)
     end
 
   end

metadata

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