[STORE] Updated the count method in the "repository" module

Since the `search_type: 'count'` parameter has been deprecated in Elasticsearch 2
and removed in Elasticsearch 5, the `Elasticsearch::Persistence::Model::Find::ClassMethods#count`
method has been updated to use the "Count" API, instead of the "Search" API with the deprecated
parameter.

See: https://www.elastic.co/guide/en/elasticsearch/reference/2.1/breaking_21_search_changes.html#_literal_search_type_count_literal_deprecated

Author: karmi

elasticsearch-persistence/lib/elasticsearch/persistence/repository/search.rb

@@ -75,8 +75,18 @@ def search(query_or_definition, options={})
         #
         def count(query_or_definition=nil, options={})
           query_or_definition ||= { query: { match_all: {} } }
-          response = search query_or_definition, options.update(search_type: 'count')
-          response.response.hits.total
+          type = document_type || (klass ? __get_type_from_class(klass) : nil  )
+
+          case
+          when query_or_definition.respond_to?(:to_hash)
+            response = client.count( { index: index_name, type: type, body: query_or_definition.to_hash }.merge(options) )
+          when query_or_definition.is_a?(String)
+            response = client.count( { index: index_name, type: type, q: query_or_definition }.merge(options) )
+          else
+            raise ArgumentError, "[!] Pass the search definition as a Hash-like object or pass the query as a String, not as [#{query_or_definition.class}]"
+          end
+
+          response['count']
         end
       end
 

elasticsearch-persistence/test/unit/repository_search_test.rb

@@ -96,21 +96,21 @@ class MyDocument; end
     end
 
     should "return the number of domain objects" do
-      subject.expects(:search)
-        .returns(Elasticsearch::Persistence::Repository::Response::Results.new( subject, {'hits' => { 'total' => 1 }}))
+      subject.client.expects(:count).returns({'count' => 1})
       assert_equal 1, subject.count
     end
 
-    should "pass arguments from count to search" do
-      subject.expects(:search)
-        .with do |query_or_definition, options|
-          assert_equal 'bar', query_or_definition[:query][:match][:foo]
-          assert_equal true, options[:ignore_unavailable]
+    should "pass arguments to count" do
+      subject.client.expects(:count)
+        .with do |arguments|
+          assert_equal 'test', arguments[:index]
+          assert_equal 'bar',  arguments[:body][:query][:match][:foo]
+          assert_equal true,   arguments[:ignore_unavailable]
           true
         end
-        .returns(Elasticsearch::Persistence::Repository::Response::Results.new( subject, {'hits' => { 'total' => 1 }}))
+        .returns({'count' => 1})
 
-      subject.count( { query: { match: { foo: 'bar' } } }, { ignore_unavailable: true } )
+      assert_equal 1, subject.count( { query: { match: { foo: 'bar' } } }, { ignore_unavailable: true } )
     end
   end