From 36916f445fe94232c40f5ffc9b981fb65ab90370 Mon Sep 17 00:00:00 2001
From: Andrew Kane <acekane1@gmail.com>
Date: Wed, 16 Jul 2014 21:52:39 -0700
Subject: [PATCH] Updated search_method_name option

---
 CHANGELOG.md            |  4 ++++
 README.md               |  2 +-
 lib/searchkick.rb       |  9 +++------
 lib/searchkick/model.rb |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fa9e23..04b35f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.1 [unreleased]
+
+- Added `search_method_name` option
+
 ## 0.8.0
 
 - Added support for Elasticsearch 1.2
diff --git a/README.md b/README.md
index da8e48a..414b636 100644
--- a/README.md
+++ b/README.md
@@ -757,7 +757,7 @@ Product.enable_search_callbacks # or use Searchkick.enable_callbacks for all mod
 Product.reindex
 ```
 
-Change the #search method name in `config/initializers/searchkick.rb`
+Change the search method name in `config/initializers/searchkick.rb` [master]
 
 ```ruby
 Searchkick.search_method_name = :lookup
diff --git a/lib/searchkick.rb b/lib/searchkick.rb
index 3411c2c..028b15c 100644
--- a/lib/searchkick.rb
+++ b/lib/searchkick.rb
@@ -16,13 +16,10 @@ module Searchkick
   class UnsupportedVersionError < StandardError; end
   class InvalidQueryError < Elasticsearch::Transport::Transport::Errors::BadRequest; end
 
-  def self.search_method_name=(_search_method_name)
-    @search_method_name ||= _search_method_name
-  end
-
-  def self.search_method_name
-    @search_method_name || :search
+  class << self
+    attr_accessor :search_method_name
   end
+  self.search_method_name = :search
 
   def self.client
     @client ||= Elasticsearch::Client.new(url: ENV["ELASTICSEARCH_URL"])
diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb
index 3c2e56d..759c2f2 100644
--- a/lib/searchkick/model.rb
+++ b/lib/searchkick/model.rb
@@ -19,7 +19,7 @@ module Searchkick
           Searchkick::Index.new(index)
         end
 
-        define_singleton_method(Searchkick.search_method_name) do |term, options={}|
+        define_singleton_method(Searchkick.search_method_name) do |term = nil, options={}|
           query = Searchkick::Query.new(self, term, options)
           if options[:execute] == false
             query
--
libgit2 0.21.0