zendesk2 1.5.14 → 1.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e30a6a3ade989e2e3166e895b89fd5144cd75160
-  data.tar.gz: 44adf5ddfced294636662b813a873469ae2733a3
+  metadata.gz: e823cea0adfb5da98e4a120de30bc3519dff8e84
+  data.tar.gz: baf13f4e2729391fa5f1861435dd0a623478560d
 SHA512:
-  metadata.gz: 678d5dd6407d26bcad0206369e549d0dcd2c1bf48b068ab974eef3c37c830ace5580196b51cb99d08b16acd49f9a93295d7dba008fefe51507983eb2b37ceebf
-  data.tar.gz: 8c9064a0348b665e23560dd70574b0ae9cbeb010e9e233b01105779b1c7daf156c1a9986cc34d6384bd9b9b9cb4d3b1bd5f35a30a1209daf87b76653f8011e37
+  metadata.gz: 76ef365c7f1943c5a90143137a2008e065d28797b6b2c4aea704a1d300384373e7df30bf5a179deb0609203d35b2ee6e0ebafdbc2ab0796448c22b6634436741
+  data.tar.gz: 438f9bdd820f2bb9a9a1ac3d688aa11b1afcd256e4695425b9e72fcfc1e418d71493b736434e3b0caba9cb110178dbc00e1cb3d9fd625723ac3e5af2832f3511

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

@@ -27,7 +27,7 @@ class Zendesk2::Client::SearchUser < Zendesk2::Client::Request
 
     # create a copy of each user mapped to a specific user identity
     collection = collection.map do |user|
-      self.data[:identities].values.select{|i| i["type"] == "email" && i["user_id"] == user["id"]}.map do |identity|
+      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
@@ -55,12 +55,21 @@ class Zendesk2::Client::SearchUser < Zendesk2::Client::Request
       r.merge(term => condition)
     end
 
-    results = collection.select do |v|
+    munged_results = collection.select do |v|
       compiled_terms.all? do |term, condition|
         condition.is_a?(Regexp) ? condition.match(v[term.to_s]) : v[term.to_s].to_s == condition.to_s
       end
     end
 
+    # return the unmunged data
+    results = munged_results.map { |u|
+      identities = self.data[:identities].values.select { |i| i["user_id"] == u["id"] }
+
+      if identity = identities.find { |i| i["type"] == "email" && i["primary"] } || identities.find { |i| i["type"] == "email" }
+        u.merge!("email" => identity["value"])
+      end
+    }
+
     page(results, params: {"query" => query}, root: "results")
   end
 end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.5.14"
+  VERSION = "1.5.15"
 end

data/spec/users_spec.rb

@@ -44,8 +44,8 @@ describe "users" do
     end
   end
 
-  describe "#search" do
-    it "should find a user based on details criteria with wildcards and by organization name", mock_only: true do
+  describe "#search", :mock_only do
+    it "should find a user based on details criteria with wildcards and by organization name" do
       # detached user
       client.users.create!(email: mock_email, name: mock_uuid)
 
@@ -59,6 +59,19 @@ describe "users" do
       expect(client.users.search(details: "*michelle*", organization: org.name)).to contain_exactly(user)
       expect(client.users.search(details: "*michelle*", organization: org.name[0..6])).to include(user)
     end
+
+    context "when a user has multiple identities and searching by email" do
+      it "should display the primary email in the results" do
+        user = client.users.create!(email: (primary = mock_email), name: mock_uuid)
+
+        # create some extra identities
+        user.identities.create!(value: mock_email, type: "email")
+        user.identities.create!(value: (target = mock_email), type: "email")
+
+        # primary email should be returned in the results
+        expect(client.users.search(email: target).first.email).to eq(primary)
+      end
+    end
   end
 
   context "with a user" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.5.14
+  version: 1.5.15
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern