lycra 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d27bab410270aa40ec1423f7f5c5d3934e6235f
-  data.tar.gz: 7da381430a05731f12ac5fff47c66bc94e2b8585
+  metadata.gz: 3bf98e0a1f8a9f2bbf07e8ec4ed449669079f2cb
+  data.tar.gz: cc1efe7e1ee2bdb305488dc0a97bebbf34a065a6
 SHA512:
-  metadata.gz: 091f3735691bed6d06340f67879a6490a0f9a6c1ca7194d0973e749251b55ab6014cc0e390bacecdf3bce96ad1326c6f1de7bc5a5b5edbdc3e432e6f7597125c
-  data.tar.gz: 6c885b617b7a83d03650ebb5df08417af76c4bd7b9643b11c149c736fc693f2d95ece8dba1db8b58f7a8bb1c6f186e701b538f48fad01fb3fa3790d53b38d3d6
+  metadata.gz: 314c097c97abde4c8887a8a6fc24cdbd2ce72c2a691f1f46316b7a7cecb708260bf7cb75be9ecb08deb480e1dd71466d6c4ed2e9a85df5809587d47b1720d8af
+  data.tar.gz: 3d328434187df390fe1a50f845f2c237d124ec0dafe579b7d089dbe7783b38a6d973e79494cb118fc60219d18de5fcc13bef48d4b41924d2c722aff477275d07

data/lib/lycra.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'canfig'
 require 'elasticsearch/persistence'
 require 'elasticsearch/model'
+require 'lycra/monkeypatches'
 require 'lycra/errors'
 require 'lycra/model'
 require 'lycra/search'

data/lib/lycra/monkeypatches.rb

@@ -0,0 +1,46 @@
+# The Problem:
+#
+# https://github.com/elastic/elasticsearch-rails/issues/421
+#
+# We create our indices with a timestamp, then alias the basename (without the timestamp) to the timestamped index. When
+# you ask the elasticsearch-model gem for records (instead of results), and it tries to use your models to look them up,
+# it decides which model to use based on the index name and document type. This is a problem for us because our documents
+# use the alias name (i.e. 'my-index') as their index name, but the hits that come back when searching use the timestamped
+# index name (i.e. 'my-index-123456789'), which don't match up using the `==` operator in the original implementation of
+# this method.
+
+# The Solution:
+#
+# Instead of checking whether the hit's index name and the model's index name are exactly equal, we use a simple regex pattern
+# to match the index names against each other. The regex pattern used below makes the timestamp optional, and allows for both
+# 'my-index' and 'my-index-123456789' to match against 'my-index'
+
+module Elasticsearch
+  module Model
+    module Adapter
+      module Multiple
+        module Records
+          # Returns the class of the model corresponding to a specific `hit` in Elasticsearch results
+          #
+          # @see Elasticsearch::Model::Registry
+          #
+          # @api private
+          #
+          def __type_for_hit(hit)
+            @@__types ||= {}
+
+            @@__types[ "#{hit[:_index]}::#{hit[:_type]}" ] ||= begin
+              Registry.all.detect do |model|
+                # Original Implementation
+                #model.index_name == hit[:_index] && model.document_type == hit[:_type]
+
+                # Our Monkeypatch
+                hit[:_index] =~ /\A#{model.index_name}(-\d+)?\Z/ && model.document_type == hit[:_type]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lycra/version.rb

@@ -2,7 +2,7 @@ module Lycra
   module Version
     MAJOR = '0'
     MINOR = '0'
-    PATCH = '5'
+    PATCH = '6'
     VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lycra
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mark Rebec
@@ -163,6 +163,7 @@ files:
 - lib/lycra/engine.rb
 - lib/lycra/errors.rb
 - lib/lycra/model.rb
+- lib/lycra/monkeypatches.rb
 - lib/lycra/search.rb
 - lib/lycra/search/aggregations.rb
 - lib/lycra/search/enumerable.rb