[MODEL] Minor changes for dynamic index_name implementation in f2b0918

Related: elastic#159

Author: karmi

elasticsearch-model/lib/elasticsearch/model/naming.rb

@@ -15,7 +15,7 @@ module ClassMethods
         #       index_name "articles-#{Rails.env}"
         #     end
         #
-        # @example Set the index name for the `Article` model and reevaluate it on each call
+        # @example Set the index name for the `Article` model and re-evaluate it on each call
         #
         #     class Article
         #       index_name { "articles-#{Time.now.year}" }
@@ -25,9 +25,6 @@ module ClassMethods
         #
         #     Article.index_name "articles-#{Rails.env}"
         #
-        # @example Directly set the index name for the `Article` model and reevaluate it on each call
-        #
-        #     Article.index_name { "articles-#{Time.now.year}" }
         #
         def index_name name=nil, &block
           if name || block_given?

elasticsearch-model/test/integration/dynamic_index_name_test.rb

@@ -1,57 +1,44 @@
 require 'test_helper'
+require 'active_record'
 
 module Elasticsearch
   module Model
     class DynamicIndexNameTest < Elasticsearch::Test::IntegrationTestCase
+      context "Dynamic index name" do
+        setup do
+          class ::ArticleWithDynamicIndexName < ActiveRecord::Base
+            include Elasticsearch::Model
+            include Elasticsearch::Model::Callbacks
 
-      class ::ArticleWithDynamicIndexName < ActiveRecord::Base
-        include Elasticsearch::Model
-        include Elasticsearch::Model::Callbacks
+            def self.counter=(value)
+              @counter = 0
+            end
 
-        class << self
-          attr_accessor :year
-        end
+            def self.counter
+              (@counter ||= 0) && @counter += 1
+            end
 
-        mapping { indexes :title }
-        index_name { "articles-#{year}" }
-      end
+            mapping    { indexes :title }
+            index_name { "articles-#{counter}" }
+          end
 
-      context "Dynamic index name" do
-        setup do
-          ActiveRecord::Schema.define(:version => 1) do
-            create_table :article_with_dynamic_index_names do |t|
-              t.string   :title
+          ::ActiveRecord::Schema.define(:version => 1) do
+            create_table ::ArticleWithDynamicIndexName.table_name do |t|
+              t.string :title
             end
           end
-        end
 
-        should 'evaluate the index_name value' do
-          ArticleWithDynamicIndexName.year = '2014'
-
-          assert_equal ArticleWithDynamicIndexName.index_name, "articles-2014"
+          ::ArticleWithDynamicIndexName.counter = 0
         end
 
-        should 'reevaluate the index_name value each time' do
-          ArticleWithDynamicIndexName.year = '2015'
-
-          assert_equal ArticleWithDynamicIndexName.index_name, "articles-2015"
+        should 'evaluate the index_name value' do
+          assert_equal ArticleWithDynamicIndexName.index_name, "articles-1"
         end
 
-        should "write and read at the the defined index" do
-          ArticleWithDynamicIndexName.year = '2016'
-
-          ArticleWithDynamicIndexName.delete_all
-          ArticleWithDynamicIndexName.__elasticsearch__.create_index! force: true
-
-          ::ArticleWithDynamicIndexName.create! title: 'Test'
-
-          ArticleWithDynamicIndexName.__elasticsearch__.refresh_index!
-
-          response = ArticleWithDynamicIndexName.search(query: { match_all: {} })
-
-          assert_equal response.results.total, 1
-          assert_equal response.search.definition[:index], ArticleWithDynamicIndexName.index_name
-          assert_equal response.search.definition[:index], 'articles-2016'
+        should 're-evaluate the index_name value each time' do
+          assert_equal ArticleWithDynamicIndexName.index_name, "articles-1"
+          assert_equal ArticleWithDynamicIndexName.index_name, "articles-2"
+          assert_equal ArticleWithDynamicIndexName.index_name, "articles-3"
         end
       end