zendesk2 0.1.1 → 0.1.2

data/README.md

@@ -52,12 +52,16 @@ Zendesk2::Client.new(url: "http://support.cloud.engineyard.com", username: "mate
 
 Currently support resources
 
+* Audit Events
 * Categories
 * Forums
 * Organization
-* Ticket
+* Ticket Audits
+* Tickets
+* Topic Comments
 * Topics
-* User
+* User Identities
+* Users
 
 All collection are accessed like so:
 

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

@@ -3,15 +3,25 @@ class Zendesk2::Client::TopicComment < Zendesk2::Model
 
   PARAMS = %w[id topic_id user_id body informative]
 
-  identity  :id,          type: :integer # ro[integer] mandatory [yes] Automatically assigned upon creation
-  attribute :url,         type: :string  # ro[yes]     mandatory [no]  The API url of this topic comment
-  attribute :topic_id,    type: :integer # ro[no]      mandatory [yes] The id of the topic this comment was made on
-  attribute :user_id,     type: :integer # ro[no]      mandatory [yes] The id of the user making the topic comment
-  attribute :body,        type: :string  # ro[no]      mandatory [yes] The comment body
-  attribute :informative, type: :boolean # ro[no]      mandatory [no]  If the comment has been flagged as informative
-  attribute :attachments, type: :array   # ro[yes]     mandatory [no]  Attachments to this comment as Attachment objects
-  attribute :created_at,  type: :date    # ro[yes]     mandatory [no]  The time the topic_comment was created
-  attribute :updated_at,  type: :date    # ro[yes]     mandatory [no]  The time of the last update of the topic_comment
+  # @return [Integer] Automatically assigned upon creation
+  identity :id, type: :integer
+
+  # @return [Array] Attachments to this comment as Attachment objects
+  attribute :attachments, type: :array
+  # @return [String] The comment body
+  attribute :body, type: :string
+  # @return [Time] The time the topic_comment was created
+  attribute :created_at, type: :time
+  # @return [Boolean] If the comment has been flagged as informative
+  attribute :informative, type: :boolean
+  # @return [Integer] The id of the topic this comment was made on
+  attribute :topic_id, type: :integer
+  # @return [Time] The time of the last update of the topic_comment
+  attribute :updated_at, type: :time
+  # @return [String] The API url of this topic comment
+  attribute :url, type: :string
+  # @return [Integer] The id of the user making the topic comment
+  attribute :user_id, type: :integer
 
   assoc_accessor :user
   assoc_accessor :topic

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

@@ -4,7 +4,7 @@ class Zendesk2::Client::TopicComments < Zendesk2::Collection
 
   model Zendesk2::Client::TopicComment
 
-  attribute :topic_id
+  attribute :topic_id, type: :integer
 
   self.collection_method = :get_topic_comments
   self.collection_root   = "topic_comments"

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

@@ -3,35 +3,63 @@ class Zendesk2::Client::User < Zendesk2::Model
 
   PARAMS = %w[name email organization_id external_id alias verified locate_id time_zone phone signature details notes role custom_role_id moderator ticket_restriction only_private_comments]
 
-  identity :id,                     type: :id
-  attribute :url
-  attribute :external_id
-  attribute :name
-  attribute :alias
-  attribute :created_at,            type: :time
-  attribute :updated_at,            type: :time
-  attribute :active,                type: :boolean
-  attribute :verified,              type: :boolean
-  attribute :shared,                type: :boolean
-  attribute :locale_id,             type: :integer
-  attribute :locale
-  attribute :time_zone
-  attribute :last_login_at,         type: :time
-  attribute :email
-  attribute :phone
-  attribute :signature
-  attribute :details,               type: :string
-  attribute :notes
-  attribute :organization_id,       type: :integer
-  attribute :role
-  attribute :custom_role_id,        type: :integer
-  attribute :moderator,             type: :boolean
-  attribute :ticket_restriction
+  # @return [Integer] Automatically assigned when creating users
+  identity :id, type: :integer
+
+  # @return [Boolean] Users that have been deleted will have the value false here
+  attribute :active, type: :boolean
+  # @return [String] Agents can have an alias that is displayed to end-users
+  attribute :alias, type: :string
+  # @return [Time] The time the user was created
+  attribute :created_at, type: :time
+  # @return [Integer] A custom role on the user if the user is an agent on the entreprise plan
+  attribute :custom_role_id, type: :integer
+  # @return [String] In this field you can store any details obout the user. e.g. the address
+  attribute :details, type: :string
+  # @return [String] The primary email address of this user
+  attribute :email, type: :string
+  # @return [String] A unique id you can set on a user
+  attribute :external_id, type: :string
+  # @return [Array] Array of user identities (e.g. email and Twitter) associated with this user. See User Identities
+  attribute :identities, type: :array
+  # @return [Time] A time-stamp of the last time this user logged in to Zendesk
+  attribute :last_login_at, type: :time
+  # @return [Integer] The language identifier for this user
+  attribute :locale_id, type: :integer
+  # @return [Boolean] Designates whether this user has forum moderation capabilities
+  attribute :moderator, type: :boolean
+  # @return [String] The name of the user
+  attribute :name, type: :string
+  # @return [String] In this field you can store any notes you have about the user
+  attribute :notes, type: :string
+  # @return [Boolean] true if this user only can create private comments
   attribute :only_private_comments, type: :boolean
-  attribute :tags,                  type: :array
-  attribute :suspended,             type: :boolean
-  attribute :photo
-  attribute :authenticity_token
+  # @return [Integer] The id of the organization this user is associated with
+  attribute :organization_id, type: :integer
+  # @return [String] The primary phone number of this user
+  attribute :phone, type: :string
+  # @return [Attachment] The user's profile picture represented as an Attachment object
+  attribute :photo, type: :Attachment
+  # @return [String] The role of the user. Possible values: "end-user", "agent", "admin"
+  attribute :role, type: :string
+  # @return [Boolean] If this user is shared from a different Zendesk, ticket sharing accounts only
+  attribute :shared, type: :boolean
+  # @return [String] The signature of this user. Only agents and admins can have signatures
+  attribute :signature, type: :string
+  # @return [Boolean] Tickets from suspended users are also suspended, and these users cannot log in to the end-user portal
+  attribute :suspended, type: :boolean
+  # @return [Array] The tags of the user. Only present if your account has user tagging enabled
+  attribute :tags, type: :array
+  # @return [String] Specified which tickets this user has access to. Possible values are: "organization", "groups", "assigned", "requested", null
+  attribute :ticket_restriction, type: :string
+  # @return [String] The time-zone of this user
+  attribute :time_zone, type: :string
+  # @return [Time] The time of the last update of the user
+  attribute :updated_at, type: :time
+  # @return [String] The API url of this user
+  attribute :url, type: :string
+  # @return [Boolean] Zendesk has verified that this user is who he says he is
+  attribute :verified, type: :boolean
 
   attr_accessor :errors
   assoc_accessor :organization

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

@@ -4,7 +4,7 @@ class Zendesk2::Client::UserIdentities < Zendesk2::Collection
 
   model Zendesk2::Client::UserIdentity
 
-  attribute :user_id
+  attribute :user_id, type: :integer
 
   self.collection_method = :get_user_identities
   self.collection_root   = "identities"
@@ -12,14 +12,6 @@ class Zendesk2::Client::UserIdentities < Zendesk2::Collection
   self.model_root        = "identity"
   self.search_type       = "identity"
 
-  def create(attributes={})
-    super(attributes.merge("user_id" => self.user_id))
-  end
-
-  def create!(attributes={})
-    super(attributes.merge("user_id" => self.user_id))
-  end
-
   def all(params={})
     body = connection.send(collection_method, params.merge("user_id" => self.user_id)).body
 

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

@@ -4,11 +4,12 @@ class Zendesk2::Client::Users < Zendesk2::Collection
 
   model Zendesk2::Client::User
 
-  self.collection_method= :get_users
-  self.collection_root= "users"
-  self.model_method= :get_user
-  self.model_root= "user"
-  self.search_type= "user"
+  self.collection_method = :get_users
+  self.collection_root   = "users"
+  self.model_method      = :get_user
+  self.model_root        = "user"
+  self.search_type       = "user"
+  self.search_request    = :search_user
 
   def current
     new(connection.get_current_user.body["user"])

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

@@ -21,8 +21,8 @@ class Zendesk2::Client
         "collaborator_ids" => [],
       }.merge(params)
 
-      record["requester_id"] ||= current_user_id
-      record["submitter_id"] = current_user_id
+      record["requester_id"] ||= current_user["id"]
+      record["submitter_id"] = current_user["id"]
 
       # FIXME: throw error if user doesn't exist?
       requester = self.data[:users][record["requester_id"]]

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

@@ -2,10 +2,12 @@ class Zendesk2::Client
   class Real
     def create_topic_comment(params={})
       topic_id = params.delete("topic_id")
+      path     = "/topics/#{topic_id}/comments.json"
+
       request(
         :body   => {"topic_comment" => params},
         :method => :post,
-        :path   => "/topics/#{topic_id}/comments.json",
+        :path   => path,
       )
     end
   end # Real
@@ -13,15 +15,16 @@ class Zendesk2::Client
   class Mock
     def create_topic_comment(params={})
       identity = self.class.new_id
+      topic_id = params["topic_id"]
+      path     = "/topics/#{topic_id}/comments.json"
 
       record = {
         "id"         => identity,
-        "url"        => url_for("/topic_comments/#{identity}.json"),
+        "url"        => url_for("/topics/#{topic_id}/comments/#{identity}.json"),
         "created_at" => Time.now.iso8601,
         "updated_at" => Time.now.iso8601,
       }.merge(params)
 
-      path = "/topic_comments.json"
       self.data[:topic_comments][identity]= record
 
       response(

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

@@ -11,18 +11,18 @@ class Zendesk2::Client
 
   class Mock
     def create_user(params={})
-      identity = self.class.new_id
+      user_id = self.class.new_id
+      path    = "/users.json"
 
       record = {
-        "id"         => identity,
-        "url"        => url_for("/users/#{identity}.json"),
+        "id"         => user_id,
+        "url"        => url_for("/users/#{user_id}.json"),
         "created_at" => Time.now.iso8601,
         "updated_at" => Time.now.iso8601,
         "active"     => true,
       }.merge(params)
 
-      path = "/users.json"
-      if (email = record["email"]) && self.data[:users].find{|k,u| u["email"] == email && k != identity}
+      if (email = record["email"]) && self.data[:identities].find{|k,i| i["type"] == "email" && i["value"] == email}
         response(
           :method => :put,
           :path   => path,
@@ -38,22 +38,22 @@ class Zendesk2::Client
           }
         )
       else
-        user_identity_identity = self.class.new_id # ugh
+        user_identity_id = self.class.new_id # ugh
 
         user_identity = {
-          "id"         => user_identity_identity,
-          "url"        => url_for("/users/#{identity}/identities/#{user_identity_identity}.json"),
+          "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,
           "type"       => "email",
           "value"      => record["email"],
           "verified"   => false,
           "primary"    => true,
-          "user_id"    => identity,
+          "user_id"    => user_id,
         }
 
-        self.data[:identities][user_identity_identity] = user_identity
-        self.data[:users][identity] = record
+        self.data[:identities][user_identity_id] = user_identity
+        self.data[:users][user_id] = record.reject{|k,v| k == "email"}
 
         response(
           :method => :post,

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

@@ -10,14 +10,9 @@ class Zendesk2::Client
 
   class Mock
     def get_current_user
-      body = self.data[:users][@current_user_id]
+      current_user # re-seed if necessary
 
-      response(
-        :path  => "/users/me.json",
-        :body  => {
-          "user" => body
-        },
-      )
+      get_user("id" => @current_user["id"])
     end
   end # Mock
 end

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

@@ -3,25 +3,33 @@ class Zendesk2::Client
     def get_topic_comment(params={})
       id       = params["id"]
       topic_id = params["topic_id"]
+      path     = "/topics/#{topic_id}/comments/#{id}.json"
 
       request(
         :method => :get,
-        :path => "/topics/#{topic_id}/comments/#{id}.json"
+        :path => path,
       )
     end
   end # Real
 
   class Mock
     def get_topic_comment(params={})
-      id   = params["id"]
+      id       = params["id"]
+      topic_id = params["topic_id"]
+      path     = "/topics/#{topic_id}/comments/#{id}.json"
+
       body = self.data[:topic_comments][id]
 
-      response(
-        :path  => "/topic_comments/#{id}.json",
-        :body  => {
-          "topic_comment" => body
-        },
-      )
+      unless (topic_comment = self.data[:topic_comments][id]) && topic_comment["topic_id"] == topic_id
+        response(status: 404)
+      else
+        response(
+          :path  => "/topic_comments/#{id}.json",
+          :body  => {
+            "topic_comment" => topic_comment,
+          },
+        )
+      end
     end
   end # Mock
 end

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

@@ -13,14 +13,22 @@ class Zendesk2::Client
   class Mock
     def get_user(params={})
       id   = params["id"]
-      body = self.data[:users][id]
+      if body = self.data[:users][id]
 
-      response(
-        :path  => "/users/#{id}.json",
-        :body  => {
-          "user" => body
-        },
-      )
+        identities = self.data[:identities].values.select{|i| i["user_id"] == id}
+        identity = identities.find{|i| i["type"] == "email" && i["primary"]} || identities.find{|i| i["type"] == "email"}
+
+        # @todo what happens if no identity?
+
+        response(
+          :path  => "/users/#{id}.json",
+          :body  => {
+            "user" => body.merge("email" => identity["value"]),
+          },
+        )
+      else
+        response(status: 404)
+      end
     end
   end # Mock
 end

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

@@ -0,0 +1,25 @@
+class Zendesk2::Client
+  class Real
+    alias search_user search
+  end # Real
+
+  class Mock
+    def search_user(query)
+      query.delete("type") # context already provided
+
+      collection = self.data[:users].values
+      collection = collection.map do |user|
+        self.data[:identities].values.select{|i| i["type"] == "email" && i["user_id"] == user["id"]}.map do |identity|
+          user.merge("email" => identity["value"])
+        end
+      end.flatten
+
+      results = collection.select{|v| query.all?{|term, condition| v[term.to_s] == condition}}
+
+      response(
+        :path => "/search.json",
+        :body => {"results" => results},
+      )
+    end
+  end # Mock
+end

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

@@ -23,7 +23,7 @@ class Zendesk2::Client
           "id"         => audit_id,
           "ticket_id"  => ticket_id,
           "created_at" => Time.now,
-          "author_id"  => current_user_id,
+          "author_id"  => current_user["id"],
           "via"        => {
             "channel" => "api",
             "source"  => {
@@ -45,7 +45,7 @@ class Zendesk2::Client
           "events" => [
             "id"          => self.class.new_id,
             "type"        => "Comment",
-            "author_id"   => current_user_id,
+            "author_id"   => current_user["id"],
             "body"        => comment["body"],
             "html_body"   => "<p>#{comment["body"]}</p>",
             "public"      => comment["public"].nil? ? true : comment["public"],

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

@@ -1,11 +1,13 @@
 class Zendesk2::Client
   class Real
     def update_topic_comment(params={})
-      id = params.delete("id")
+      id       = params.delete("id")
+      topic_id = params.delete("topic_id")
+      path     = "/topics/#{topic_id}/comments/#{id}.json"
 
       request(
         :method => :put,
-        :path   => "/topic_comments/#{id}.json",
+        :path   => path,
         :body   => {
           "topic_comment" => params
         },
@@ -14,17 +16,22 @@ class Zendesk2::Client
   end
   class Mock
     def update_topic_comment(params={})
-      id   = params.delete("id")
-      path = "/topic_comments/#{id}.json"
+      id       = params.delete("id")
+      topic_id = params.delete("topic_id")
+      path     = "/topics/#{topic_id}/comments/#{id}.json"
 
-      body = self.data[:topic_comments][id].merge!(params)
-      response(
-        :method => :put,
-        :path   => path,
-        :body   => {
-          "topic_comment" => body
-        },
-      )
+      unless (topic_comment = self.data[:topic_comments][id]) && topic_comment["topic_id"] == topic_id
+        response(status: 404)
+      else
+        body = topic_comment.merge!(params)
+        response(
+          :method => :put,
+          :path   => path,
+          :body   => {
+            "topic_comment" => body
+          },
+        )
+      end
     end
   end
 end

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

@@ -14,9 +14,10 @@ class Zendesk2::Client
   end
   class Mock
     def update_user(params={})
-      id   = params.delete("id")
-      path = "/users/#{id}.json"
-      if params["email"] && self.data[:users].find{|k,u| u["email"] == params["email"] && k != id}
+      user_id = params.delete("id")
+      path    = "/users/#{user_id}.json"
+
+      if (email = params["email"]) && self.data[:identities].find{|k,i| i["type"] == "email" && i["value"] == email}
         response(
           :method => :put,
           :path   => path,
@@ -31,7 +32,22 @@ class Zendesk2::Client
           }
         )
       else
-        body = self.data[:users][id].merge!(params)
+        user_identity_id = self.class.new_id # ugh
+
+        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,
+          "type"       => "email",
+          "value"      => params["email"],
+          "verified"   => false,
+          "primary"    => false,
+          "user_id"    => user_id,
+        }
+
+        self.data[:identities][user_identity_id] = user_identity
+        body = self.data[:users][user_id].merge!(params)
         response(
           :method => :put,
           :path   => path,

data/lib/zendesk2/client.rb

@@ -65,6 +65,7 @@ class Zendesk2::Client < Cistern::Service
   request :get_user_identity
   request :get_users
   request :search
+  request :search_user
   request :mark_user_identity_primary
   request :update_category
   request :update_forum
@@ -139,7 +140,7 @@ class Zendesk2::Client < Cistern::Service
 
   class Mock
 
-    attr_reader :username, :url, :token, :current_user_id
+    attr_reader :username, :url, :token
 
     def self.data
       @data ||= {
@@ -183,14 +184,17 @@ class Zendesk2::Client < Cistern::Service
       @username, @password = options[:username], options[:password]
       @token = options[:token]
 
-      @current_user_id = self.class.new_id
+      @current_user ||= self.create_user("email" => @username, "name" => "Mock Agent").body["user"]
+      @current_user_identity ||= self.data[:identities].values.first
+    end
 
-      self.data[:users][@current_user_id]= {
-        "id"    => @current_user_id,
-        "email" => @username,
-        "name"  => "Mock Agent",
-        "url"   => url_for("/users/#{@current_user_id}.json"),
-      }
+    # Lazily re-seeds data after reset
+    # @return [Hash] current user response
+    def current_user
+      self.data[:users][@current_user["id"]] ||= @current_user
+      self.data[:identities][@current_user_identity["id"]] ||= @current_user_identity
+
+      @current_user
     end
 
     def url_for(path)

data/lib/zendesk2/collection.rb

@@ -1,6 +1,19 @@
+# @abstract adds {#create!} method
 class Zendesk2::Collection < Cistern::Collection
+
+  # Attempt creation of resource and explode if unsuccessful
+  # @raise [Zendesk2::Error] if creation was unsuccessful
+  # @return [Cistern::Model]
   def create!(attributes={})
-    model = self.new(attributes)
+    model = self.new(attributes.merge(Zendesk2.stringify_keys(self.attributes)))
     model.save!
   end
+
+  # Quietly attempt creation of resource. Check {#new_record?} and {#errors} for success
+  # @see {#create!} to raise an exception on failure
+  # @return [Cistern::Model]
+  def create(attributes={})
+    model = self.new(attributes.merge(Zendesk2.stringify_keys(self.attributes)))
+    model.save
+  end
 end

data/lib/zendesk2/model.rb

@@ -1,11 +1,19 @@
+# @abstract subclass and implement {#save!}
 class Zendesk2::Model < Cistern::Model
-
   attr_accessor :errors
 
+  # @abstract override in subclass
+  # @raise [Zendesk2::Error] if unsuccessful
+  def save!
+    raise NotImplementError
+  end
+
+  # calls {#save!} and sets {#errors} if unsuccessful and applicable
+  # @return [Zendesk2::Model] self, regardless of success
   def save
     save!
   rescue Zendesk2::Error => e
-    self.errors= e.response[:body]["details"].inject({}){|r,(k,v)| r.merge(k => v.map{|e| e["type"] || e["description"]})} rescue nil
+    self.errors = e.response[:body]["details"].inject({}){|r,(k,v)| r.merge(k => v.map{|e| e["type"] || e["description"]})} rescue nil
     self
   end
 

data/lib/zendesk2/searchable.rb

@@ -4,7 +4,7 @@ module Zendesk2::Searchable
   end
 
   def search(parameters)
-    body = connection.search(parameters.merge("type" => self.class.search_type)).body
+    body = connection.send(self.class.search_request, parameters.merge("type" => self.class.search_type)).body
     if data = body.delete("results")
       load(data)
     end
@@ -13,5 +13,10 @@ module Zendesk2::Searchable
 
   module Attributes
     attr_accessor :search_type
+    attr_writer :search_request
+
+    def search_request
+      @search_request ||= :search
+    end
   end
 end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/organizations_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 
 describe "organizations" do
   let(:client) { create_client }
-  it_should_behave_like "a resource",
-    :organizations,
+  it_should_behave_like "a resource", :organizations,
     lambda { {name: Zendesk2.uuid} },
     lambda { {name: Zendesk2.uuid} }
 

data/spec/spec_helper.rb

@@ -13,8 +13,9 @@ end
 Cistern.formatter = Cistern::Formatter::AwesomePrint
 
 RSpec.configure do |config|
-  config.before(:all) do
+  config.before(:each) do
     Zendesk2::Client.reset! if Zendesk2::Client.mocking?
   end
+  config.order = "random"
   config.filter_run_excluding(:mock_only => true) unless Zendesk2::Client.mocking?
 end

data/spec/support/client_helper.rb

@@ -3,6 +3,7 @@ require 'logger'
 module ClientHelper
   def create_client(options={})
     options.merge!(logger: Logger.new(STDOUT)) if ENV['VERBOSE']
+    options = {username: "zendesk2@example.org", password: "password"}.merge(Zendesk2.defaults).merge(options)
     Zendesk2::Client.new(options)
   end
 end

data/spec/users_spec.rb

@@ -2,20 +2,18 @@ require 'spec_helper'
 
 describe "users" do
   let(:client) { create_client }
-  it_should_behave_like "a resource", 
-    :users,
+  it_should_behave_like "a resource", :users,
     lambda { {email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true} },
   lambda { {name: Zendesk2.uuid} }
 
   it "should get current user" do
     current_user = client.users.current
-    current_user.should be_a(Zendesk2::Client::User)
     current_user.email.should == client.username
   end
 
   describe do
     before(:each) do
-      @user = client.users.create(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid)
+      @user = client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid)
     end
 
     let(:user) { @user }
@@ -103,6 +101,25 @@ describe "users" do
       user.errors.should == {"email" => ["Email: #{email} is already being used by another user"]}
     end
 
+    it "should create another identity when updating email" do
+      original_email = user.email
+      user.email = (new_email = "zendesk2+#{Zendesk2.uuid}@example.org")
+      user.save!
+
+      (identities = user.identities.all).size.should == 2
+      new_identity = identities.find{|i| i.value == new_email}
+      new_identity.should_not be_nil
+
+      new_identity.primary.should be_false
+
+      original_identity = identities.find{|i| i.value == original_email}
+      original_identity.should_not be_nil
+
+      original_identity.primary.should be_true
+
+      user.reload.email.should == original_email
+    end
+
     it "should form login url" do
       return_to = "http://engineyard.com"
       uri = Addressable::URI.parse(user.login_url(Time.now.to_s, return_to: return_to))

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: cistern
   prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.3
-  name: cistern
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.3
+    none: false
 - !ruby/object:Gem::Dependency
+  name: faraday
   prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  name: faraday_middleware
   prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  name: addressable
   prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Zendesk V2 API client
 email:
 - me@joshualane.com
@@ -154,6 +154,7 @@ files:
 - lib/zendesk2/client/requests/get_users.rb
 - lib/zendesk2/client/requests/mark_user_identity_primary.rb
 - lib/zendesk2/client/requests/search.rb
+- lib/zendesk2/client/requests/search_user.rb
 - lib/zendesk2/client/requests/update_category.rb
 - lib/zendesk2/client/requests/update_forum.rb
 - lib/zendesk2/client/requests/update_organization.rb
@@ -188,17 +189,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24