zendesk2 0.2.5 → 0.2.6

data/lib/zendesk2/attributes.rb

@@ -3,14 +3,21 @@ module Zendesk2::Attributes
     assoc_key  = options[:key] || "#{name}_id"
     collection = options[:collection] || "#{name}s"
     define_method(name) do
-      self.connection.send(collection).get(self.send(assoc_key))
+      if assoc_id = self.send(assoc_key)
+        self.connection.send(collection).get(assoc_id)
+      else self.instance_variable_get("@#{name}")
+      end
     end
   end
 
   def assoc_writer(name, options={})
     assoc_key = options[:key] || "#{name}_id"
     define_method("#{name}=") do |assoc|
-      self.send("#{assoc_key}=", assoc.id)
+      if assoc.is_a?(Cistern::Model)
+        self.send("#{assoc_key}=", assoc.identity)
+      else
+        self.instance_variable_set("@#{name}", assoc)
+      end
     end
   end
 

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

@@ -66,7 +66,10 @@ class Zendesk2::Client::Ticket < Zendesk2::Model
   def save!
     data = if new_record?
              requires :subject, :description
-             connection.create_ticket(params).body["ticket"]
+
+             with_requester = @requester && Zendesk2.stringify_keys(@requester)
+
+             connection.create_ticket(params.merge("requester" => with_requester)).body["ticket"]
            else
              requires :identity
              connection.update_ticket(params.merge("id" => self.identity)).body["ticket"]
@@ -109,7 +112,7 @@ class Zendesk2::Client::Ticket < Zendesk2::Model
 
   # @return [Zendesk2::Client::TicketAudits] all audits for this ticket
   def audits
-    self.connection.ticket_audits(:ticket_id => self.identity).all
+    self.connection.ticket_audits(ticket_id: self.identity).all
   end
 
   # @return [Array<Zendesk2::Client::AuditEvent>] audit events of type 'Comment'

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

@@ -13,6 +13,17 @@ class Zendesk2::Client
     def create_ticket(params={})
       identity = self.class.new_id
 
+      if requester = params.delete('requester')
+        user_id = if known_user = self.users.search(email: requester['email']).first
+                    known_user.identity
+                  else
+                    # name is not required in this case
+                    create_user(requester).body["user"]["id"]
+                  end
+
+        params['requester_id'] = user_id
+      end
+
       record = {
         "id"               => identity,
         "url"              => url_for("/tickets/#{identity}.json"),

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/tickets_spec.rb

@@ -2,11 +2,23 @@ require 'spec_helper'
 
 describe "tickets" do
   let(:client) { create_client }
-  it_should_behave_like "a resource", 
+  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}) }
+
+    it "should create requester" do
+      requester = client.users.search(email: requester_email).first
+      requester.should_not be_nil
+
+      ticket.requester.should == requester
+    end
+  end
+
   describe "with a created ticket" do
     let(:ticket) { client.tickets.create(subject: Zendesk2.uuid, description: Zendesk2.uuid) }
     it "should get requester" do

metadata

@@ -1,24 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
+  version: 0.2.6
   prerelease: 
-  version: 0.2.5
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -27,14 +21,14 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: faraday
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -43,14 +37,14 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -59,14 +53,14 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: addressable
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -75,14 +69,14 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: jwt
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -91,6 +85,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Zendesk V2 API client
 email:
 - me@joshualane.com