zendesk2 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjY3NzNhNGNkOWQ2OGU5ZWE1YjNkNDJlZWI2YmNjMTFkODI5M2ZmMQ==
+    NTEwMjM0ZDE4MjQ2Mzc5N2RkYTFmODU5MjRkZGQ1YTQ0MjA5MmYzMA==
   data.tar.gz: !binary |-
-    MmMxZTEwYTgwZDgwYWEzYjU0MDMzY2U2NjYxNTEwNDUxOWY3OGU0OQ==
+    YzBjZmVmOGNiNzU1NDgyNTQ0MDBkMGJkYzNiNTVlOTI1OGFiNjhmNA==
 SHA512:
   metadata.gz: !binary |-
-    ZTJhYTViYWNhMGJlZGU5MGExOGQyMzg5NWE2YmI0OGNhNmIwODAyMzY1MDA3
-    NDQ3ZTFhMmI2ZDc0ZmIwNDkyZmU4Y2UyZjk0ZDc3NzNmODIxOWVjNmJkNDRl
-    ZGU5ZjI4MDRhYjIxYWQzZmQwNTk3NWI5N2IxMDU1NDI0NGUxYzk=
+    MmNlYTRjZjk2NjI1ZDY5MjQ1N2Y3M2I2MzI5OGIyNmI1N2Y5ZWNiM2M4N2Fm
+    OWU1ZDg0OTE3N2I5MGVmMDIwYzBiZjNlOWE1NjlmYzY5MDE2OTc5MGZjODNj
+    MTE5OWZlOWI5YTIyZDA0NDNiNDZkNDY2MGEwMDIwMGYxYzNlNmU=
   data.tar.gz: !binary |-
-    YzFjNjRmZmU1NzczMDg0MTU2ZDk4MWM4ZThiMTQ5NDA4YmE1NzYyZGIyZjA1
-    YTliOWZmODdhNGM4ODIzNjU3MDYwMzkwY2U2NWJhYTIwMWQ3OGNhYmE2ZjJj
-    YzQ0ODU0ZDgxOTE2ZmI0ZDAyM2E1OTI2ZmRlMWU0ZTg0YWM0MTc=
+    MmE4NWQyNWIyMjEzMTU1MTYyODYxYTA5OWFmZTg4NTIyMWRjMGU4ZTNkYjM2
+    NjUzNTRjMGRjYjFhOTMzYzMzZGFmYThhZDYzMGUyMDI1YjdjYzlhZTkwYzkw
+    OWRkNzkzMTk4Y2NhYjY5MDYwNzViODU2ZGFhODE3YmFiNDQzOTQ=

data/.gitignore

@@ -17,3 +17,5 @@ test/version_tmp
 tmp
 .rspec
 doc/
+.rvmrc
+.ruby-version

data/README.md

@@ -59,6 +59,7 @@ Currently support resources
 * Groups
 * Organization
 * Ticket Audits
+* Ticket Fields
 * Tickets
 * Topic Comments
 * Topics

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

@@ -49,8 +49,6 @@ class Zendesk2::Client::TicketField < Zendesk2::Model
     data = if new_record?
              requires :type, :title
 
-             self.custom_field_options ||= []
-
              connection.create_ticket_field(params).body["ticket_field"]
            else
              requires :identity

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

@@ -14,6 +14,22 @@ class Zendesk2::Client
       identity = self.class.new_id
 
       if requester = params.delete('requester')
+        if !requester['name'] || requester['name'].size < 1
+          response(
+            :path   => "/tickets.json",
+            :method => :post,
+            :status => 422,
+            :body   => {
+              "error"       => "RecordInvalid",
+              "description" => "Record validation errors",
+              "details"     => {
+                "requester" => [
+                  {
+                    "description" => "Requester Name:  is too short (minimum is 1 characters)"
+                  }
+                ]}})
+        end
+
         user_id = if known_user = self.users.search(email: requester['email']).first
                     known_user.identity
                   else
@@ -24,13 +40,20 @@ class Zendesk2::Client
         params['requester_id'] = user_id
       end
 
+      custom_fields = (params.delete("custom_fields") || [])
+
+      self.data[:ticket_fields].each do |field_id, field|
+        custom_fields.find { |cf| cf["id"] == field_id } ||
+          custom_fields << {"id" => field_id, "value" => nil }
+      end
+
       record = {
         "id"               => identity,
         "url"              => url_for("/tickets/#{identity}.json"),
         "created_at"       => Time.now.iso8601,
         "updated_at"       => Time.now.iso8601,
         "collaborator_ids" => [],
-        "custom_fields"    => [],
+        "custom_fields"    => custom_fields,
       }.merge(params)
 
       record["requester_id"] ||= current_user["id"]

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/shared/resource.rb

@@ -11,13 +11,13 @@ shared_examples "a resource" do |_collection, _params, _update_params, _options|
   end
 
   it "by fetching a specific record" do
-    record = collection.create(params)
+    record = collection.create!(params)
     collection.get(fetch_params.call(record)).should == record
   end
 
   context "that is paged" do
     before(:each) do
-      3.times.each { collection.create(instance_exec(&_params)) }
+      3.times.each { collection.create!(instance_exec(&_params)) }
     end
 
     it "by retrieving the first page" do
@@ -38,7 +38,7 @@ shared_examples "a resource" do |_collection, _params, _update_params, _options|
   end
 
   it "by updating a record" do
-    record = collection.create(params)
+    record = collection.create!(params)
     record.merge_attributes(update_params)
     record.save
     update_params.each {|k,v| record.send(k).should == v}
@@ -46,7 +46,7 @@ shared_examples "a resource" do |_collection, _params, _update_params, _options|
 
   it "by destroying a record" do
     pending if _collection == :forums
-    record = collection.create(params)
+    record = collection.create!(params)
     record.identity.should_not be_nil
     record.destroy
     record.should be_destroyed
@@ -55,7 +55,7 @@ shared_examples "a resource" do |_collection, _params, _update_params, _options|
   # Search index takes 2-3 minutes according to the docs
   it "should search" do
     pending unless Zendesk2::Client.mocking?
-    record = collection.create(params)
+    record = collection.create!(params)
     collection.search(params).should include(record)
   end
 end

data/spec/tickets_spec.rb

@@ -2,25 +2,34 @@ require 'spec_helper'
 
 describe "tickets" do
   let(:client) { create_client }
-  it_should_behave_like "a resource",
-    :tickets,
+  it_should_behave_like "a resource", :tickets,
     lambda { {subject: Zendesk2.uuid, description: Zendesk2.uuid} },
     lambda { {subject: Zendesk2.uuid} }
 
   describe "when creating a ticket" do
-    let!(:requester_email) { "newuser@example.org" }
-    let!(:ticket) { client.tickets.create(subject: Zendesk2.uuid, description: Zendesk2.uuid, requester: {email: requester_email}) }
+    let!(:requester_email) { "#{Zendesk2.uuid}@example.org" }
 
     it "should create requester" do
-      requester = client.users.search(email: requester_email).first
-      requester.should_not be_nil
+      ticket = client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.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
+        requester.should_not be_nil
 
-      ticket.requester.should == requester
+        ticket.reload.requester.should == requester
+      else
+        ticket.reload.requester.should_not be_nil
+      end
+    end
+
+    it "should require requester name" do
+      expect {
+        client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid, requester: {email: requester_email})
+      }.to raise_exception(Zendesk2::Error, /Requester Name: .* too short/)
     end
   end
 
   describe "with a created ticket" do
-    let(:ticket) { client.tickets.create(subject: Zendesk2.uuid, description: Zendesk2.uuid) }
+    let(:ticket) { client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid) }
     it "should get requester" do
       ticket.requester.should == client.users.current
     end
@@ -35,7 +44,7 @@ describe "tickets" do
   end
 
   describe "comments" do
-    let(:ticket) { client.tickets.create(subject: Zendesk2.uuid, description: Zendesk2.uuid) }
+    let(:ticket) { client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid) }
 
     it "lists audits" do
       body = Zendesk2.uuid
@@ -60,4 +69,20 @@ describe "tickets" do
       (comment = ticket.comments.find{|c| c.body == body}).should_not be_nil
     end
   end
+
+  describe "custom fields" do
+    let!(:ticket_field) { client.ticket_fields.create!(title: Zendesk2.uuid, type: "textbox") }
+
+    it "should be based on ticket_fields" do
+      ticket = client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid)
+      custom_field = ticket.custom_fields.find { |cf| cf["id"] == ticket_field.identity }
+      custom_field.should_not be_nil
+      custom_field["value"].should be_nil
+
+      ticket = client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid, custom_fields: [{"id" => ticket_field.identity, "value" => "jessicaspacekat"}])
+      custom_field = ticket.custom_fields.find { |cf| cf["id"] == ticket_field.identity }
+      custom_field.should_not be_nil
+      custom_field["value"].should == "jessicaspacekat"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -88,7 +88,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
 - .travis.yml
 - Gemfile
 - Guardfile

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.3