Addressing elastic#838, STI issues when code is reloaded in development, fix index name to klass lookup methodology

Author: vanboom

elasticsearch-model/lib/elasticsearch/model/adapters/multiple.rb

@@ -106,16 +106,16 @@ def __ids_by_type
           # @api private
           #
           def __type_for_hit(hit)
-            @@__types ||= {}
 
             key = "#{hit[:_index]}::#{hit[:_type]}" if hit[:_type] && hit[:_type] != '_doc'
             key = hit[:_index] unless key
 
-            @@__types[key] ||= begin
-              Registry.all.detect do |model|
-                (model.index_name == hit[:_index] && __no_type?(hit)) ||
-                    (model.index_name == hit[:_index] && model.document_type == hit[:_type])
-              end
+            # DVB -- not sure the ramifications of this - but do not memoize the model/klass
+            # I do not think that caching the types is necessary, minimal processing savings
+            # at the expense of broken STI autoloading in development, see #848
+            Registry.all.detect do |model|
+              (model.index_name == hit[:_index] && __no_type?(hit)) ||
+                  (model.index_name == hit[:_index] && model.document_type == hit[:_type])
             end
           end
 

elasticsearch-model/lib/elasticsearch/model/multimodel.rb

@@ -48,7 +48,12 @@ def self.all
       # Adds a model to the registry
       #
       def add(klass)
-        @models << klass
+        # Detect already loaded models and ensure that a duplicate is not stored
+        if i = @models.index{ |_class| _class.name == klass.name }
+          @models[i] = klass
+        else
+          @models << klass
+        end
       end
 
       # Returns a copy of the registered models