zendesk2 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da53e74ee09d2c85abc260d39f02878a346d769e
-  data.tar.gz: 255c672c805f8bfd51b8bd3ee682fa6f5de1d30d
+  metadata.gz: 81bba9f58f738ec52054105fc508707dd9a7223b
+  data.tar.gz: 017e53e26dd7ba508aacd23094f96f966da76136
 SHA512:
-  metadata.gz: 35529ac971be807243949d67d763a07192dd27491f8e16822ec0a2d27056c163bf5dbb2a590815c63d178ca2fffe82c4c2a5b5444ab9d22f9472a4a6823dffc9
-  data.tar.gz: 53945ba5705d696416c9d7e073d3e9bdeb85b2143ee592f8e5874f6cdcb62940c97ae6c1493e0ce9fa77a99a84fa1dde864da810d262a2f4a85e85fa2341257c
+  metadata.gz: ab3815ee90b96f12fce67acf78a7aeed1fb90a98e52bf88d9dc246ecc085228b4dd587d2216b844107fb67ecdbe18979eae2e8658aabd46364ebd39d2bd459f5
+  data.tar.gz: dc2b8a2b14a1fac2179beb6b941aedae05b05289dd9cfa4ac984889f0ec68a7ece263e5130805ef53083e6d0295474efd0d3b460de9628ab3ed853006eea4bf4

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

@@ -9,13 +9,42 @@ class Zendesk2::Client
       terms.delete("type") # context already provided
 
       collection = self.data[:users].values
+
+      # 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|
           user.merge("email" => identity["value"])
         end
       end.flatten
 
-      results = collection.select { |v| terms.all?{ |term, condition| v[term.to_s].to_s == condition.to_s } }
+      # allow searching by organization name
+      collection = collection.map do |user|
+        if organization = self.data[:organizations][user["organization_id"]]
+          user.merge("organization" => organization["name"])
+        else
+          user
+        end
+      end
+
+      # organization name is fuzzy matched
+      if organization_name = terms.delete("organization")
+        terms.merge!("organization" => "*#{organization_name}*")
+      end
+
+      compiled_terms = terms.inject({}) do |r,(term, raw_condition)|
+        condition = if raw_condition.include?("*")
+                      Regexp.compile(raw_condition.gsub("*", ".*"), Regexp::IGNORECASE)
+                    else
+                      raw_condition
+                    end
+        r.merge(term => condition)
+      end
+
+      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
 
       response(
         :path => "/search.json",

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/spec_helper.rb

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

data/spec/users_spec.rb

@@ -14,6 +14,23 @@ describe "users" do
     expect(current_user.email).to eq(client.username)
   end
 
+  describe "#search" do
+    it "should find a user based on details criteria with wildcards and by organization name", mock_only: true do
+      # detached user
+      client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid)
+
+      # possible match
+      bad_org = client.organizations.create!(name: Zendesk2.uuid)
+      client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: bad_org)
+
+      org = client.organizations.create!(name: Zendesk2.uuid)
+      user = client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: org, details: "anything_hello-something-michelle")
+
+      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
+  end
+
   describe do
     before(:each) do
       @user = client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable