[STORE] Refactored the :index paramter to use repository index_name

Author: karmi

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

@@ -18,12 +18,12 @@ def find(*args)
 
         def exists?(id, options={})
           type     = (klass ? __get_type_from_class(klass) : '_all')
-          client.exists( { index: 'test', type: type, id: id }.merge(options) )
+          client.exists( { index: index_name, type: type, id: id }.merge(options) )
         end
 
         def __find_one(id, options={})
           type     = (klass ? __get_type_from_class(klass) : '_all')
-          document = client.get( { index: 'test', type: type, id: id }.merge(options) )
+          document = client.get( { index: index_name, type: type, id: id }.merge(options) )
 
           deserialize(document)
         rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
@@ -32,7 +32,7 @@ def __find_one(id, options={})
 
         def __find_many(ids, options={})
           type     = (klass ? __get_type_from_class(klass) : '_all')
-          documents = client.mget( { index: 'test', type: type, body: { ids: ids } }.merge(options) )
+          documents = client.mget( { index: index_name, type: type, body: { ids: ids } }.merge(options) )
 
           documents['docs'].map { |document| document['found'] ? deserialize(document) : nil }
         end

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

@@ -7,9 +7,9 @@ def search(query_or_definition, options={})
           type     = (klass ? __get_type_from_class(klass) : nil  )
           case
           when query_or_definition.respond_to?(:to_hash)
-            response = client.search( { index: 'test', type: type, body: query_or_definition.to_hash }.merge(options) )
+            response = client.search( { index: index_name, type: type, body: query_or_definition.to_hash }.merge(options) )
           when query_or_definition.is_a?(String)
-            response = client.search( { index: 'test', type: type, q: query_or_definition }.merge(options) )
+            response = client.search( { 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" +
                                  " -- #{query_or_definition.class} given."

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

@@ -7,7 +7,7 @@ def save(document, options={})
           serialized = serialize(document)
           id   = __get_id_from_document(serialized)
           type = klass || __get_type_from_class(document.class)
-          client.index( { index: 'test', type: type, id: id, body: serialized }.merge(options) )
+          client.index( { index: index_name, type: type, id: id, body: serialized }.merge(options) )
         end
 
         def delete(document, options={})
@@ -19,7 +19,7 @@ def delete(document, options={})
             id   = __get_id_from_document(serialized)
             type = klass || __get_type_from_class(document.class)
           end
-          client.delete( { index: 'test', type: type, id: id }.merge(options) )
+          client.delete( { index: index_name, type: type, id: id }.merge(options) )
         end
       end
 

elasticsearch-persistence/test/unit/repository_find_test.rb

@@ -9,6 +9,7 @@ class MyDocument; end
 
       @client = mock
       @shoulda_subject.stubs(:klass).returns(nil)
+      @shoulda_subject.stubs(:index_name).returns('my_index')
       @shoulda_subject.stubs(:client).returns(@client)
     end
 
@@ -78,10 +79,11 @@ class MyDocument; end
 
       should "pass options to the client" do
         @client.expects(:exists).with do |arguments|
-          assert_equal 'bambam', arguments[:routing]
+          assert_equal 'foobarbam', arguments[:index]
+          assert_equal 'bambam',    arguments[:routing]
         end
 
-        subject.exists? '1', routing: 'bambam'
+        subject.exists? '1', index: 'foobarbam', routing: 'bambam'
       end
     end
 
@@ -155,25 +157,26 @@ class MyDocument; end
         @client
           .expects(:get)
           .with do |arguments|
-            assert_equal 'bambam', arguments[:routing]
+            assert_equal 'foobarbam', arguments[:index]
+            assert_equal 'bambam',    arguments[:routing]
           end
           .returns({'_source' => { 'foo' => 'bar' }})
 
-        subject.__find_one '1', routing: 'bambam'
+        subject.__find_one '1', index: 'foobarbam', routing: 'bambam'
       end
     end
 
     context "'__find_many' method" do
       setup do
         @response = {"docs"=>
-        [ {"_index"=>"test",
+        [ {"_index"=>"my_index",
            "_type"=>"note",
            "_id"=>"1",
            "_version"=>1,
            "found"=>true,
            "_source"=>{"id"=>"1", "title"=>"Test 1"}},
 
-          {"_index"=>"test",
+          {"_index"=>"my_index",
            "_type"=>"note",
            "_id"=>"2",
            "_version"=>1,
@@ -241,20 +244,20 @@ class MyDocument; end
 
       should "find keep missing documents in the result as nil" do
         @response = {"docs"=>
-        [ {"_index"=>"test",
+        [ {"_index"=>"my_index",
            "_type"=>"note",
            "_id"=>"1",
            "_version"=>1,
            "found"=>true,
            "_source"=>{"id"=>"1", "title"=>"Test 1"}},
 
-          {"_index"=>"test",
+          {"_index"=>"my_index",
            "_type"=>"note",
            "_id"=>"3",
            "_version"=>1,
            "found"=>false},
 
-          {"_index"=>"test",
+          {"_index"=>"my_index",
            "_type"=>"note",
            "_id"=>"2",
            "_version"=>1,
@@ -299,11 +302,12 @@ class MyDocument; end
         @client
           .expects(:mget)
           .with do |arguments|
-            assert_equal 'bambam', arguments[:routing]
+            assert_equal 'foobarbam', arguments[:index]
+            assert_equal 'bambam',    arguments[:routing]
           end
           .returns(@response)
 
-        subject.__find_many ['1', '2'], routing: 'bambam'
+        subject.__find_many ['1', '2'], index: 'foobarbam', routing: 'bambam'
       end
     end
 

elasticsearch-persistence/test/unit/repository_response_results_test.rb

@@ -15,13 +15,13 @@ class MyDocument; end
                     { "total" => 2,
                       "max_score" => 0.19,
                       "hits" =>
-                       [{"_index" => "test",
+                       [{"_index" => "my_index",
                          "_type" => "note",
                          "_id" => "1",
                          "_score" => 0.19,
                          "_source" => {"id" => 1, "title" => "Test 1"}},
 
-                         {"_index" => "test",
+                         {"_index" => "my_index",
                          "_type" => "note",
                          "_id" => "2",
                          "_score" => 0.19,

elasticsearch-persistence/test/unit/repository_search_test.rb

@@ -9,6 +9,7 @@ class MyDocument; end
 
       @client = mock
       @shoulda_subject.stubs(:klass).returns(nil)
+      @shoulda_subject.stubs(:index_name).returns('test')
       @shoulda_subject.stubs(:client).returns(@client)
     end
 

elasticsearch-persistence/test/unit/repository_store_test.rb

@@ -6,6 +6,7 @@ class MyDocument; end
 
     setup do
       @shoulda_subject = Class.new() { include Elasticsearch::Persistence::Repository::Store }.new
+      @shoulda_subject.stubs(:index_name).returns('test')
     end
 
     context "save" do
@@ -49,11 +50,12 @@ class MyDocument; end
 
         client = mock
         client.expects(:index).with do |arguments|
+          assert_equal 'foobarbam', arguments[:index]
           assert_equal 'bambam', arguments[:routing]
         end
         subject.expects(:client).returns(client)
 
-        subject.save({foo: 'bar'}, routing: 'bambam')
+        subject.save({foo: 'bar'}, { index: 'foobarbam', routing: 'bambam' })
       end
     end
 
@@ -109,11 +111,12 @@ class MyDocument; end
 
         client = mock
         client.expects(:delete).with do |arguments|
+          assert_equal 'foobarbam', arguments[:index]
           assert_equal 'bambam', arguments[:routing]
         end
         subject.expects(:client).returns(client)
 
-        subject.delete('1', routing: 'bambam')
+        subject.delete('1', index: 'foobarbam', routing: 'bambam')
       end
     end
   end