[MODEL] Allow passing the index settings and mappings as arguments to create_index!

Author: karmi

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

@@ -220,15 +220,19 @@ def load_settings_from_io(settings)
         #     Article.__elasticsearch__.create_index! index: 'my-index'
         #
         def create_index!(options={})
-          target_index = options.delete(:index) || self.index_name
+          options = options.clone
+
+          target_index = options.delete(:index)    || self.index_name
+          settings     = options.delete(:settings) || self.settings.to_hash
+          mappings     = options.delete(:mappings) || self.mappings.to_hash
 
           delete_index!(options.merge index: target_index) if options[:force]
 
           unless index_exists?(index: target_index)
             self.client.indices.create index: target_index,
                                        body: {
-                                         settings: self.settings.to_hash,
-                                         mappings: self.mappings.to_hash }
+                                         settings: settings,
+                                         mappings: mappings }
           end
         end
 

elasticsearch-model/test/unit/indexing_test.rb

@@ -528,6 +528,27 @@ class ::DummyIndexingModelForRecreate
         assert_nothing_raised { DummyIndexingModelForRecreate.create_index! }
       end
 
+      should "get the index settings and mappings from options" do
+        client  = stub('client')
+        indices = stub('indices')
+        client.stubs(:indices).returns(indices)
+
+        indices.expects(:create).with do |payload|
+          assert_equal 'foobar', payload[:index]
+          assert_equal 3,        payload[:body][:settings][:index][:number_of_shards]
+          assert_equal 'bar', payload[:body][:mappings][:foobar][:properties][:foo][:analyzer]
+          true
+        end.returns({})
+
+        DummyIndexingModelForRecreate.expects(:index_exists?).returns(false)
+        DummyIndexingModelForRecreate.expects(:client).returns(client).at_least_once
+
+        DummyIndexingModelForRecreate.create_index! \
+          index: 'foobar',
+          settings: { index: { number_of_shards: 3 } },
+          mappings: { foobar: { properties: { foo: { analyzer: 'bar' } } } }
+      end
+
       should "not create the index when it exists" do
         client  = stub('client')
         indices = stub('indices')