zendesk2 0.0.17 → 0.0.18

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

@@ -1,5 +1,6 @@
 class Zendesk2::Client::Organization < Cistern::Model
   PARAMS = %w[id details domain_names external_id group_id shared_comments shared_tickets tags name notes]
+
   identity :id,               type: :integer
   attribute :url,             type: :string
   attribute :created_at,      type: :time

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

@@ -20,6 +20,47 @@ class Zendesk2::Client
         "updated_at" => Time.now.iso8601,
       }.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"
+                }
+              ]
+            }
+          }
+        )
+      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"
+                }
+              ]
+            }
+          }
+        )
+      end
+
+
       self.data[:organizations][identity]= record
 
       response(

data/lib/zendesk2/client.rb

@@ -177,7 +177,7 @@ class Zendesk2::Client < Cistern::Service
     end
 
     def url_for(path)
-      File.join(@url, "/api/v2", path)
+      File.join(@url, "/api/v2", path.to_s)
     end
 
     def page(params, collection, path, collection_root, options={})

data/lib/zendesk2/error.rb

@@ -1,14 +1,15 @@
 class Zendesk2::Error < StandardError
 
-  attr_reader :message, :wrapped_exception
+  attr_reader :wrapped_exception
   def initialize(wrapped_exception)
     @wrapped_exception = wrapped_exception
-    @message = if wrapped_exception.is_a?(Faraday::Error::ParsingError)
+    message = if wrapped_exception.is_a?(Faraday::Error::ParsingError)
                 wrapped_exception.message
               elsif wrapped_exception.is_a?(Faraday::Error::ClientError)
                 wrapped_exception.response.inspect
               else
                 wrapped_exception.instance_variable_get(:@wrapped_exception).inspect
               end
+    super(message)
   end
 end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/spec/organizations_spec.rb

@@ -7,17 +7,21 @@ describe "organizations" do
     lambda { {name: Zendesk2.uuid} },
     lambda { {name: Zendesk2.uuid} }
 
-  describe do
+  describe "with an organization" do
     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_id: organization.id)
+      user = client.users.create(email: "#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: organization)
       organization.users.should include user
     end
 
     it "should get #tickets" do
-      user = client.users.create(email: "#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization_id: organization.id)
+      user = client.users.create(email: "#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: organization)
       ticket = client.tickets.create(subject: "#{Zendesk2.uuid}@example.org", description: Zendesk2.uuid, requester: user)
       organization.tickets.should include ticket
     end
+
+    it "should raise on name conflict" do
+      lambda { client.organizations.create(name: organization.name) }.should raise_exception(Zendesk2::Error)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors: