From 6281297d371648c11843a0d90845c4e2cec44893 Mon Sep 17 00:00:00 2001
From: Andrew Kane <acekane1@gmail.com>
Date: Wed, 5 Mar 2014 00:15:03 -0800
Subject: [PATCH] Use elasticsearch-model

---
 lib/searchkick.rb         |  4 ++--
 lib/searchkick/logger.rb  | 19 -------------------
 lib/searchkick/results.rb |  2 +-
 searchkick.gemspec        |  2 +-
 4 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 lib/searchkick/logger.rb

diff --git a/lib/searchkick.rb b/lib/searchkick.rb
index 48c6f42..1b867cf 100644
--- a/lib/searchkick.rb
+++ b/lib/searchkick.rb
@@ -1,4 +1,4 @@
-require "elasticsearch"
+require "elasticsearch/model"
 require "searchkick/version"
 require "searchkick/index"
 require "searchkick/reindex"
@@ -13,7 +13,7 @@ require "searchkick/tasks"
 module Searchkick
 
   def self.client
-    @client ||= Elasticsearch::Client.new log: true
+    @client ||= Elasticsearch::Client.new(log: true)
   end
 
   @callbacks = true
diff --git a/lib/searchkick/logger.rb b/lib/searchkick/logger.rb
deleted file mode 100644
index 096dbe8..0000000
--- a/lib/searchkick/logger.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "tire/rails/logger"
-require "tire/rails/logger/log_subscriber"
-
-class Tire::Rails::LogSubscriber
-
-  # better output format
-  def search(event)
-    self.class.runtime += event.duration
-    return unless logger.debug?
-
-    payload = event.payload
-
-    name    = "%s (%.1fms)" % [payload[:name], event.duration]
-    query   = payload[:search].to_s
-
-    debug "  #{color(name, YELLOW, true)}  #{query}"
-  end
-
-end
diff --git a/lib/searchkick/results.rb b/lib/searchkick/results.rb
index 2882937..6f3fcfe 100644
--- a/lib/searchkick/results.rb
+++ b/lib/searchkick/results.rb
@@ -1,5 +1,5 @@
 module Searchkick
-  class Results
+  class Results < Elasticsearch::Model::Response::Results
 
     def suggestions
       if @response["suggest"]
diff --git a/searchkick.gemspec b/searchkick.gemspec
index 9aa1e73..9db4ca1 100644
--- a/searchkick.gemspec
+++ b/searchkick.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "elasticsearch"
+  spec.add_dependency "elasticsearch-model"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
--
libgit2 0.21.0