[MODEL] Added the ability to pass a custom index name to .create_index!, .delete_index! and .refresh_index!

Author: karmi

elasticsearch-model/lib/elasticsearch/model/indexing.rb

@@ -175,15 +175,21 @@ def settings(settings={}, &block)
         #
         #     Article.__elasticsearch__.create_index! force: true
         #
+        # @example Pass a specific index name
+        #
+        #     Article.__elasticsearch__.create_index! index: 'my-index'
+        #
         def create_index!(options={})
-          delete_index!(options) if options[:force]
+          target_index = options.delete(:index) || self.index_name
+
+          delete_index!(options.merge index: target_index) if options[:force]
 
-          unless ( self.client.indices.exists(index: self.index_name) rescue false )
+          unless ( self.client.indices.exists(index: target_index) rescue false )
             begin
-              self.client.indices.create index: self.index_name,
-                                                           body: {
-                                                             settings: self.settings.to_hash,
-                                                             mappings: self.mappings.to_hash }
+              self.client.indices.create index: target_index,
+                                         body: {
+                                           settings: self.settings.to_hash,
+                                           mappings: self.mappings.to_hash }
             rescue Exception => e
               unless e.class.to_s =~ /NotFound/ && options[:force]
                 STDERR.puts "[!!!] Error when creating the index: #{e.class}", "#{e.message}"
@@ -199,9 +205,15 @@ def create_index!(options={})
         #
         #     Article.__elasticsearch__.delete_index!
         #
+        # @example Pass a specific index name
+        #
+        #     Article.__elasticsearch__.delete_index! index: 'my-index'
+        #
         def delete_index!(options={})
+          target_index = options.delete(:index) || self.index_name
+
           begin
-            self.client.indices.delete index: self.index_name
+            self.client.indices.delete index: target_index
           rescue Exception => e
             unless e.class.to_s =~ /NotFound/ && options[:force]
               STDERR.puts "[!!!] Error when deleting the index: #{e.class}", "#{e.message}"
@@ -215,11 +227,17 @@ def delete_index!(options={})
         #
         #     Article.__elasticsearch__.refresh_index!
         #
+        # @example Pass a specific index name
+        #
+        #     Article.__elasticsearch__.refresh_index! index: 'my-index'
+        #
         # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html
         #
         def refresh_index!(options={})
+          target_index = options.delete(:index) || self.index_name
+
           begin
-            self.client.indices.refresh index: self.index_name
+            self.client.indices.refresh index: target_index
           rescue Exception => e
             unless e.class.to_s =~ /NotFound/ && options[:force]
               STDERR.puts "[!!!] Error when refreshing the index: #{e.class}", "#{e.message}"

elasticsearch-model/test/unit/indexing_test.rb

@@ -358,6 +358,43 @@ class ::DummyIndexingModelForRecreate
           DummyIndexingModelForRecreate.refresh_index!
         end
       end
+
+      context "with a custom index name" do
+        setup do
+          @client  = stub('client')
+          @indices = stub('indices')
+          @client.stubs(:indices).returns(@indices)
+          DummyIndexingModelForRecreate.expects(:client).returns(@client).at_least_once
+        end
+
+        should "create the custom index" do
+          @indices.expects(:exists).with do |arguments|
+            assert_equal 'custom-foo', arguments[:index]
+          end
+
+          @indices.expects(:create).with do |arguments|
+            assert_equal 'custom-foo', arguments[:index]
+          end
+
+          DummyIndexingModelForRecreate.create_index! index: 'custom-foo'
+        end
+
+        should "delete the custom index" do
+          @indices.expects(:delete).with do |arguments|
+            assert_equal 'custom-foo', arguments[:index]
+          end
+
+          DummyIndexingModelForRecreate.delete_index! index: 'custom-foo'
+        end
+
+        should "refresh the custom index" do
+          @indices.expects(:refresh).with do |arguments|
+            assert_equal 'custom-foo', arguments[:index]
+          end
+
+          DummyIndexingModelForRecreate.refresh_index! index: 'custom-foo'
+        end
+      end
     end
 
   end