zendesk2 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e80f873dd170c7aa2f3a62268d1e2580228f5c5
-  data.tar.gz: 4eca8baf6dd0b2f4be9d2b2a4879dd77c78cec69
+  metadata.gz: a61d3d90ed074ac942698a76c6032da01d98dc49
+  data.tar.gz: c7c9d087bc7d353345a15e02455b679c745d3a91
 SHA512:
-  metadata.gz: 717c640ad7636fefe296d93c3c75f317fb83e758bc08c2fda527abbf2c917adb364d484cbdf75753d92a966442d6eabf58c5deb6224f0bc34474d064bfb35e21
-  data.tar.gz: 5a635a1179e896ab3cfcc00aa1b6751310afb29f803d8775ab3cd65c0e3ab004c6d69257db0e617eedfdfc95e682890fe8c1461c54e8f567b6164966199007c7
+  metadata.gz: 68410198ef99c316d62bb865a3f2d29e9975848972ee8b706d37bd0acb84ba547209efecbff793afdee1d85edccda4fdfc93f0a069675f0a5968472c922b6cd1
+  data.tar.gz: bf5cc95b1b2e4dc8e616112aabc0ade9419a1b68ef1223ff136209f470b3f1b0e986dc2c154fa69f898a73347eee04f17728a3d89a43f63999ab6a0c7f357b1c

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.2
   DisplayCopNames: true
 Metrics/LineLength:
   Max: 120

data/CHANGELOG.md

@@ -1,8 +1,7 @@
 # Change Log
 
-## [Unreleased](https://github.com/lanej/zendesk2/tree/HEAD)
-
-[Full Changelog](https://github.com/lanej/zendesk2/compare/v1.10.0...HEAD)
+## [v1.11.0](https://github.com/lanej/zendesk2/tree/v1.11.0) (2016-07-05)
+[Full Changelog](https://github.com/lanej/zendesk2/compare/v1.10.0...v1.11.0)
 
 **Implemented enhancements:**
 

data/Gemfile

@@ -5,9 +5,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-# To avoid warnings from JWT
-gem 'json', '~> 1.8'
-gem 'rubocop', '~> 0.41', require: false
+gem 'rubocop', '~> 0.44.1', require: false
 
 group :test do
   gem 'pry-nav'

data/README.md

@@ -1,5 +1,7 @@
 # Zendesk2
 
+[![Join the chat at https://gitter.im/lanej/zendesk2](https://badges.gitter.im/lanej/zendesk2.svg)](https://gitter.im/lanej/zendesk2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 [![Build Status](https://travis-ci.org/lanej/zendesk2.svg?branch=master)](http://travis-ci.org/lanej/zendesk2)
 [![Gem Version](https://fury-badge.herokuapp.com/rb/zendesk2.png)](http://badge.fury.io/rb/zendesk2)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/lanej/zendesk2)

data/lib/zendesk2.rb

@@ -19,7 +19,7 @@ require 'securerandom'
 module Zendesk2
   include Cistern::Client.with(interface: :module)
 
-  USER_AGENT = <<-UA
+  USER_AGENT = <<-UA.freeze
   Ruby/#{RUBY_VERSION} (#{RUBY_PLATFORM}; #{RUBY_ENGINE}) Zendesk2/#{Zendesk2::VERSION} Faraday/#{Faraday::VERSION}
   UA
 

data/lib/zendesk2/client.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 # @deprecated use {#Zendesk2}
 module Zendesk2::Client
-  def self.method_missing(message, *args, &block)
-    Cistern.deprecation('Zendesk2::Client is deprecated, use Zendesk2', caller[1])
-
-    if Zendesk2.respond_to?(message)
-      Zendesk2.public_send(message, *args, &block)
-    else
-      super
+  class << self
+    def respond_to_missing?(method, *)
+      Zendesk2.respond_to?(method) || super
     end
-  end
 
-  def self.respond_to?(message)
-    Cistern.deprecation('Zendesk2::Client is deprecated, use Zendesk2', caller[1])
+    def method_missing(message, *args, &block)
+      Cistern.deprecation('Zendesk2::Client is deprecated, use Zendesk2', caller[1])
 
-    Zendesk2.respond_to?(message) || super
+      if Zendesk2.respond_to?(message)
+        Zendesk2.public_send(message, *args, &block)
+      else
+        super
+      end
+    end
   end
 end

data/lib/zendesk2/create_category.rb

@@ -16,8 +16,8 @@ class Zendesk2::CreateCategory
     record = {
       'id'         => identity,
       'url'        => url_for("/categories/#{identity}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
     }.merge(Cistern::Hash.slice(params.fetch('category'), *self.class.accepted_attributes))
 
     cistern.data[:categories][identity] = record

data/lib/zendesk2/create_forum.rb

@@ -20,8 +20,8 @@ class Zendesk2::CreateForum
     record = {
       'id'         => identity,
       'url'        => url_for("/forums/#{identity}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
     }.merge(Cistern::Hash.slice(params.fetch('forum'), *self.class.accepted_attributes))
 
     cistern.data[:forums][identity] = record

data/lib/zendesk2/create_group.rb

@@ -20,8 +20,8 @@ class Zendesk2::CreateGroup
     record = {
       'id'         => identity,
       'url'        => url_for("/groups/#{identity}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
       'deleted'    => false,
     }.merge(group_params)
 

data/lib/zendesk2/create_organization.rb

@@ -20,8 +20,8 @@ class Zendesk2::CreateOrganization
     record = {
       'id'         => identity,
       'url'        => url_for("/organizations/#{identity}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
     }.merge(organization_params)
 
     unless record['name']

data/lib/zendesk2/create_ticket.rb

@@ -8,7 +8,7 @@ class Zendesk2::CreateTicket
 
   def self.accepted_attributes
     %w(external_id via priority requester requester_id submitter_id assignee_id organization_id subject description
-       custom_fields recipient status collaborator_ids tags)
+       custom_fields recipient status collaborator_ids collaborators tags)
   end
 
   def ticket_params
@@ -24,6 +24,7 @@ class Zendesk2::CreateTicket
     requester_id = create_params.delete('requester_id')
 
     set_requester(create_params.delete('requester'), create_params)
+    set_collaborators(create_params)
     custom_fields = get_custom_fields(create_params.delete('custom_fields') || [])
 
     identity = cistern.serial_id
@@ -31,10 +32,9 @@ class Zendesk2::CreateTicket
     record = {
       'id'               => identity,
       'url'              => url_for("/tickets/#{identity}.json"),
-      'created_at'       => Time.now.iso8601,
-      'updated_at'       => Time.now.iso8601,
+      'created_at'       => timestamp,
+      'updated_at'       => timestamp,
       'priority'         => nil,
-      'collaborator_ids' => [],
       'custom_fields'    => custom_fields,
     }.merge(create_params)
 
@@ -64,11 +64,7 @@ class Zendesk2::CreateTicket
                ],
              })
 
-    known_user = cistern.users.search(email: requester['email']).first
-
-    user_id = (known_user && known_user.identity) || cistern.create_user('user' => requester).body['user']['id']
-
-    create_params['requester_id'] = user_id.to_i
+    create_params['requester_id'] = find_or_create_user(requester)
   end
 
   def get_custom_fields(requested_custom_fields)
@@ -87,4 +83,35 @@ class Zendesk2::CreateTicket
 
     custom_fields
   end
+
+  # rubocop:disable Style/AccessorMethodName
+  def set_collaborators(create_params)
+    ids = create_params.delete('collaborator_ids') || []
+    collaborator_specs = create_params.delete('collaborators') || []
+
+    ids += collaborator_specs.map do |spec|
+      case spec
+      when Hash
+        find_or_create_user(spec)
+      when Integer, String
+        cistern.users.get!(spec).identity
+      else
+        raise ArgumentError, "Unprocessable collaborator: #{spec}"
+      end
+    end.compact
+
+    create_params.merge!('collaborator_ids' => ids)
+  end
+
+  def find_or_create_user(user)
+    return nil unless user['email']
+    user['name'] ||= user['email'].split('@').first.capitalize
+
+    known_user = cistern.users.search(email: user['email']).first
+
+    user_id = (known_user && known_user.identity) ||
+              cistern.create_user('user' => user).body['user']['id']
+
+    user_id.to_i
+  end
 end

data/lib/zendesk2/create_ticket_field.rb

@@ -21,7 +21,7 @@ class Zendesk2::CreateTicketField
     record = {
       'active'                => true,
       'collapsed_for_agents'  => false,
-      'created_at'            => Time.now.iso8601,
+      'created_at'            => timestamp,
       'description'           => params['title'],
       'editable_in_portal'    => false,
       'id'                    => identity,
@@ -32,7 +32,7 @@ class Zendesk2::CreateTicketField
       'required_in_portal'    => false,
       'tag'                   => '',
       'title_in_portal'       => params['title'],
-      'updated_at'            => Time.now.iso8601,
+      'updated_at'            => timestamp,
       'url'                   => url_for("/ticket_fields/#{identity}.json"),
       'visible_in_portal'     => false,
     }.merge(ticket_field_params)

data/lib/zendesk2/create_topic.rb

@@ -20,8 +20,8 @@ class Zendesk2::CreateTopic
     record = {
       'id'         => identity,
       'url'        => url_for("/topics/#{identity}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
     }.merge(topic_params)
 
     data[:topics][identity] = record

data/lib/zendesk2/create_topic_comment.rb

@@ -24,8 +24,8 @@ class Zendesk2::CreateTopicComment
     record = {
       'id'         => identity,
       'url'        => url_for("/topics/#{topic_id}/comments/#{identity}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
       'topic_id'   => topic_id,
     }.merge(topic_comment_params)
 

data/lib/zendesk2/create_user.rb

@@ -25,8 +25,8 @@ class Zendesk2::CreateUser
     record = {
       'id'         => user_id,
       'url'        => url_for("/users/#{user_id}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
       'role'       => 'end-user',
       'active'     => true,
     }.merge(user_params)
@@ -58,8 +58,8 @@ class Zendesk2::CreateUser
     user_identity = {
       'id'         => user_identity_id,
       'url'        => url_for("/users/#{user_id}/identities/#{user_identity_id}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
       'type'       => 'email',
       'value'      => record['email'],
       'verified'   => false,

data/lib/zendesk2/create_user_field.rb

@@ -20,7 +20,7 @@ class Zendesk2::CreateUserField
     record = {
       'active'                => true,
       'collapsed_for_agents'  => false,
-      'created_at'            => Time.now.iso8601,
+      'created_at'            => timestamp,
       'description'           => params['title'],
       'editable_in_portal'    => false,
       'id'                    => identity,
@@ -31,7 +31,7 @@ class Zendesk2::CreateUserField
       'required_in_portal'    => false,
       'tag'                   => '',
       'title_in_portal'       => params['title'],
-      'updated_at'            => Time.now.iso8601,
+      'updated_at'            => timestamp,
       'url'                   => url_for("/user_fields/#{identity}.json"),
       'visible_in_portal'     => false,
     }.merge(user_field_params)

data/lib/zendesk2/create_user_identity.rb

@@ -24,8 +24,8 @@ class Zendesk2::CreateUserIdentity
     record = {
       'id'         => identity,
       'url'        => url_for("/user/#{user_id}/identities/#{identity}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
       'verified'   => false,
       'primary'    => false,
       'user_id'    => user_id,

data/lib/zendesk2/create_view.rb

@@ -63,8 +63,8 @@ class Zendesk2::CreateView
     record = {
       'id'               => identity,
       'url'              => url_for("/views/#{identity}.json"),
-      'created_at'       => Time.now.iso8601,
-      'updated_at'       => Time.now.iso8601,
+      'created_at'       => timestamp,
+      'updated_at'       => timestamp,
       'active'           => true,
       'execution'        => {
         'columns'       => columns,

data/lib/zendesk2/get_view_tickets.rb

@@ -15,7 +15,7 @@ class Zendesk2::GetViewTickets
     view = find!(:views, view_id)
 
     operators = Array(view['conditions']['all']).map do |c|
-      operator = ('is' == c.fetch('operator')) ? :eql? : :!=
+      operator = 'is' == c.fetch('operator') ? :eql? : :!=
       key      = c.fetch('field')
       value    = c.fetch('value').to_s
 
@@ -27,7 +27,7 @@ class Zendesk2::GetViewTickets
     end
 
     any_operators = Array(view['conditions']['any']).map do |c|
-      operator = ('is' == c.fetch('operator')) ? :eql? : :!=
+      operator = 'is' == c.fetch('operator') ? :eql? : :!=
       key      = c.fetch('field')
       value    = c.fetch('value').to_s
 

data/lib/zendesk2/help_center/create_help_center_article.rb

@@ -44,8 +44,8 @@ class Zendesk2::CreateHelpCenterArticle
       'vote_sum'          => 0,
       'vote_count'        => 0,
       'section_id'        => section_id,
-      'created_at'        => Time.now.iso8601,
-      'updated_at'        => Time.now.iso8601,
+      'created_at'        => timestamp,
+      'updated_at'        => timestamp,
       'title'             => '',
       'body'              => '',
       'source_locale'     => locale,

data/lib/zendesk2/help_center/create_help_center_category.rb

@@ -26,8 +26,8 @@ class Zendesk2::CreateHelpCenterCategory
       'html_url'    => html_url_for("/hc/#{locale}/categories/#{identity}.json"),
       'author_id'   => cistern.current_user['id'],
       'position'    => position,
-      'created_at'  => Time.now.iso8601,
-      'updated_at'  => Time.now.iso8601,
+      'created_at'  => timestamp,
+      'updated_at'  => timestamp,
       'description' => '',
     }.merge(category_params)
 

data/lib/zendesk2/help_center/create_help_center_post.rb

@@ -21,8 +21,8 @@ class Zendesk2::CreateHelpCenterPost
       'id'             => identity,
       'url'            => url_for("/community/posts/#{identity}.json"),
       'html_url'       => html_url_for("/hc/posts/#{identity}.json"),
-      'created_at'     => Time.now.iso8601,
-      'updated_at'     => Time.now.iso8601,
+      'created_at'     => timestamp,
+      'updated_at'     => timestamp,
       'vote_count'     => 0,
       'vote_sum'       => 0,
       'comment_count'  => 0,

data/lib/zendesk2/help_center/create_help_center_section.rb

@@ -37,8 +37,8 @@ class Zendesk2::CreateHelpCenterSection
       'vote_sum'          => 0,
       'vote_count'        => 0,
       'category_id'       => category_id,
-      'created_at'        => Time.now.iso8601,
-      'updated_at'        => Time.now.iso8601,
+      'created_at'        => timestamp,
+      'updated_at'        => timestamp,
       'name'              => '',
       'body'              => '',
       'source_locale'     => locale,

data/lib/zendesk2/help_center/create_help_center_subscription.rb

@@ -28,12 +28,11 @@ class Zendesk2::CreateHelpCenterSubscription
       mock_response('Required parameter missing: subscription', status: 400)
     end
 
-
     record = subscription_params.merge(
       'id'           => identity,
       'url'          => url,
-      'created_at'   => Time.now.iso8601, # @todo create #timestamp helper
-      'updated_at'   => Time.now.iso8601,
+      'created_at'   => timestamp, # @todo create #timestamp helper
+      'updated_at'   => timestamp,
       'content_id'   => content_id,
       'content_type' => content_type,
     )

data/lib/zendesk2/help_center/create_help_center_topic.rb

@@ -24,8 +24,8 @@ class Zendesk2::CreateHelpCenterTopic
       'url'         => url_for("/communit/topics/#{identity}.json"),
       'html_url'    => html_url_for("/hc/topics/#{identity}.json"),
       'position'    => position,
-      'created_at'  => Time.now.iso8601,
-      'updated_at'  => Time.now.iso8601,
+      'created_at'  => timestamp,
+      'updated_at'  => timestamp,
       'description' => '',
     }.merge(topic_params)
 

data/lib/zendesk2/help_center/create_help_center_translation.rb

@@ -22,8 +22,8 @@ class Zendesk2::CreateHelpCenterTranslation
       'id'                => identity,
       'url'               => url_for("/help_center/#{source_type_url}/#{source_id}/translation/#{locale}.json"),
       'html_url'          => html_url_for("/hc/#{locale}/#{source_type_url}/#{source_id}"),
-      'created_at'        => Time.now.iso8601,
-      'updated_at'        => Time.now.iso8601,
+      'created_at'        => timestamp,
+      'updated_at'        => timestamp,
       'title'             => params.fetch('translation').fetch('title'),
       'body'              => (params.fetch('translation')['body'] || ''),
       'outdated'          => false,

data/lib/zendesk2/help_center/destroy_help_center_article.rb

@@ -10,6 +10,8 @@ class Zendesk2::DestroyHelpCenterArticle
   end
 
   def mock
-    mock_response('article' => find!(:help_center_articles, article_id))
+    delete!(:help_center_articles, article_id)
+
+    mock_response(nil)
   end
 end

data/lib/zendesk2/help_center/search_help_center_articles.rb

@@ -6,16 +6,9 @@ class Zendesk2::SearchHelpCenterArticles
 
   attr_reader :query
 
-  def _mock(query, params = {})
+  def call(query, params)
     @query = query
-    setup(params)
-    mock
-  end
-
-  def _real(query, params = {})
-    @query = query
-    setup(params)
-    real
+    super(params)
   end
 
   def mock

data/lib/zendesk2/help_center/subscription_request.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Zendesk2::HelpCenter::SubscriptionRequest
-
   def self.included(klass)
     super
     klass.extend(ClassMethods)

data/lib/zendesk2/help_center/update_help_center_subscription.rb

@@ -25,7 +25,7 @@ class Zendesk2::UpdateHelpCenterSubscription
 
     updated = subscription_params
     updated['locale'] = updated.delete('source_locale') if updated['source_locale']
-    updated['updated_at'] = Time.now.iso8601
+    updated['updated_at'] = timestamp
 
     subscription.merge!(updated)
 

data/lib/zendesk2/mock.rb

@@ -3,6 +3,7 @@ class Zendesk2::Mock
   attr_reader :username, :url, :token, :jwt_token
   attr_accessor :last_request
 
+  # rubocop:disable Metrics/BlockLength
   def self.data
     @data ||= Hash.new do |h, k|
       h[k] = {

data/lib/zendesk2/organizations.rb

@@ -15,11 +15,12 @@ class Zendesk2::Organizations
   def find_by_external_id(external_id)
     body = cistern.get_organization_by_external_id('external_id' => external_id).body
     data = body.delete('organizations')
-    if data
-      collection = clone.load(data)
-      collection.merge_attributes(Cistern::Hash.slice(body, 'count', 'next_page', 'previous_page'))
-      collection
-    end
+
+    return unless data
+
+    collection = clone.load(data)
+    collection.merge_attributes(Cistern::Hash.slice(body, 'count', 'next_page', 'previous_page'))
+    collection
   end
 
   self.collection_method = :get_organizations

data/lib/zendesk2/paged_collection.rb

@@ -58,19 +58,19 @@ module Zendesk2::PagedCollection
   end
 
   def next_page
-    if next_page_link
-      options = { 'url' => next_page_link }
-      options['filtered'] = filtered if respond_to?(:filtered) # searchable
-      new_page.all(options)
-    end
+    return nil unless next_page_link
+
+    options = { 'url' => next_page_link }
+    options['filtered'] = filtered if respond_to?(:filtered) # searchable
+    new_page.all(options)
   end
 
   def previous_page
-    if previous_page_link
-      options = { 'url' => previous_page_link }
-      options['filtered'] = filtered if respond_to?(:filtered) # searchable
-      new_page.all(options)
-    end
+    return nil unless previous_page_link
+
+    options = { 'url' => previous_page_link }
+    options['filtered'] = filtered if respond_to?(:filtered) # searchable
+    new_page.all(options)
   end
 
   # Attempt creation of resource and explode if unsuccessful

data/lib/zendesk2/request.rb

@@ -52,18 +52,11 @@ module Zendesk2::Request
 
   attr_reader :params
 
-  def setup(params)
+  def call(*args)
+    params = args.last.is_a?(Hash) ? args.pop : {}
     @params = Cistern::Hash.stringify_keys(params)
-  end
-
-  def _mock(params = {})
-    setup(params)
-    mock
-  end
 
-  def _real(params = {})
-    setup(params)
-    real
+    dispatch
   end
 
   def page_params!(options)
@@ -147,6 +140,10 @@ module Zendesk2::Request
     }.merge(cistern.hash.slice(params, :method, :path, :body, :headers),),)
   end
 
+  def timestamp
+    Time.now.iso8601
+  end
+
   def mock_response(body, options = {})
     response(
       method: self.class.request_method,

data/lib/zendesk2/search.rb

@@ -10,16 +10,9 @@ class Zendesk2::Search
 
   attr_reader :query
 
-  def _mock(query, params = {})
+  def call(query, params)
     @query = query
-    setup(params)
-    mock
-  end
-
-  def _real(query, params = {})
-    @query = query
-    setup(params)
-    real
+    super(params)
   end
 
   def mock

data/lib/zendesk2/search_organization.rb

@@ -10,16 +10,9 @@ class Zendesk2::SearchOrganization
 
   page_params!
 
-  def _mock(query, params = {})
+  def call(query, params = {})
     @query = query
-    setup(params)
-    mock
-  end
-
-  def _real(query, params = {})
-    @query = query
-    setup(params)
-    real
+    super(params)
   end
 
   def mock

data/lib/zendesk2/search_user.rb

@@ -10,16 +10,9 @@ class Zendesk2::SearchUser
 
   page_params!
 
-  def _mock(query, params = {})
+  def call(query, params)
     @query = query
-    setup(params)
-    mock
-  end
-
-  def _real(query, params = {})
-    @query = query
-    setup(params)
-    real
+    super(params)
   end
 
   def mock

data/lib/zendesk2/searchable.rb

@@ -21,15 +21,15 @@ module Zendesk2::Searchable
   # @see http://developer.zendesk.com/documentation/rest_api/search.html
   def search(terms, params = {})
     query = (terms.is_a?(Hash) ? search_by_hash(terms) : search_by_string(terms))
-
     body = cistern.send(self.class.search_request, query, params).body
     data = body.delete('results')
 
-    if data
-      load(data)
-      merge_attributes(Cistern::Hash.slice(body, 'count', 'next_page', 'previous_page').merge('filtered' => true))
-      self
-    end
+    return nil unless data
+
+    load(data)
+
+    merge_attributes(Cistern::Hash.slice(body, 'count', 'next_page', 'previous_page').merge('filtered' => true))
+    self
   end
 
   private

data/lib/zendesk2/ticket.rb

@@ -115,17 +115,6 @@ class Zendesk2::Ticket
     )
   end
 
-  # @return [Array<Zendesk2::User>] All users CCD on this ticket
-  def collaborators
-    collaborator_ids.map { |cid| cistern.users.get(cid) }
-  end
-
-  # Update list of users to be CCD on this ticket
-  # @param [Array<Zendesk2::User>] collaborators list of users
-  def collaborators=(collaborators)
-    self.collaborator_ids = collaborators.map(&:identity)
-  end
-
   # @return [Zendesk2::TicketAudits] all audits for this ticket
   def audits
     cistern.ticket_audits(ticket_id: identity).all
@@ -140,4 +129,24 @@ class Zendesk2::Ticket
   def comments
     cistern.ticket_comments(ticket_id: identity).all
   end
+
+  # @return [Array<Zendesk2::User>] All users CCD on this ticket
+  def collaborators
+    (collaborator_ids || []).map { |id| cistern.users.get(id) }
+  end
+
+  def collaborators=(collaborators)
+    collaborators = [collaborators] unless collaborators.is_a?(Array)
+
+    value = collaborators.map do |collaborator|
+      case collaborator
+      when Zendesk2::User
+        collaborator.identity
+      else
+        collaborator
+      end
+    end
+
+    attributes[:collaborators] = value
+  end
 end

data/lib/zendesk2/update_user.rb

@@ -54,8 +54,8 @@ class Zendesk2::UpdateUser
     user_identity = {
       'id'         => user_identity_id,
       'url'        => url_for("/users/#{user_id}/identities/#{user_identity_id}.json"),
-      'created_at' => Time.now.iso8601,
-      'updated_at' => Time.now.iso8601,
+      'created_at' => timestamp,
+      'updated_at' => timestamp,
       'type'       => 'email',
       'value'      => email,
       'verified'   => false,

data/lib/zendesk2/update_view.rb

@@ -28,7 +28,7 @@ class Zendesk2::UpdateView
       a + [{ 'id' => e, 'name' => Zendesk2::CreateView.view_columns.fetch(c) }]
     end
 
-    body['updated_at'] = Time.now.iso8601
+    body['updated_at'] = timestamp
 
     if columns.any?
       body['execution'] = {

data/lib/zendesk2/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Zendesk2
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'.freeze
 end

data/spec/tickets_spec.rb

@@ -39,6 +39,47 @@ describe 'Zendesk2' do
       end
     end
 
+    it 'should create collaborators' do
+      name = 'Josh Lane'
+      email = mock_email
+      collaborating_user = client.users.create!(email: mock_email, name: mock_uuid)
+      collaborating_user_id = client.users.create!(email: mock_email, name: mock_uuid).identity
+
+      ticket = client.tickets.create!(
+        subject: mock_uuid,
+        description: mock_uuid,
+        collaborators: [{ name: name, email: email }, collaborating_user_id, collaborating_user],
+      )
+
+      collaborators = [collaborating_user]
+      collaborators << client.users.get(collaborating_user_id)
+      collaborators << client.users.search(email: email).first if Zendesk2.mocking?
+
+      expect(ticket.collaborators).to include(*collaborators)
+    end
+
+    it 'fails to create collaborators with missing collaborators[email]' do
+      ticket = client.tickets.create!(
+        subject: mock_uuid,
+        description: mock_uuid,
+        collaborators: { name: 'josh', email: nil },
+      )
+
+      expect(ticket.collaborators).to be_empty
+    end
+
+    it 'fails to create collaborators with missing collaborators[name]' do
+      email = mock_email
+
+      ticket = client.tickets.create!(
+        subject: mock_uuid,
+        description: mock_uuid,
+        collaborators: { name: nil, email: email },
+      )
+
+      expect(ticket.collaborators.map(&:email)).to contain_exactly(email)
+    end
+
     context 'valid requester exists' do
       it 'sets organization id' do
         ticket = client.tickets.create!(subject: mock_uuid, description: mock_uuid, requester_id: 11_111_111_111_199)

data/zendesk2.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday',            '~> 0.9'
   gem.add_dependency 'faraday_middleware', '~> 0.9'
   gem.add_dependency 'jwt',                '~> 1.0'
+  gem.add_dependency 'json',               '> 1.7', '< 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern
@@ -66,6 +66,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Zendesk V2 API client
 email:
 - me@joshualane.com