wj-mongoid-elasticsearch 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578a2f4897aa691d5e5be10fe7101e434b566795
-  data.tar.gz: 37be0ba588cc85d59df49e520bcee7c34640f18e
+  metadata.gz: ed51025a8797c0ead1ce01e9bce500f465aeed22
+  data.tar.gz: 3e40c6978d0d607a0f6a0335a1389447285c7a4b
 SHA512:
-  metadata.gz: a06026e6ea7f345909c325e3b671cc6236304154715295ba680141f32169a0446d990f889bdfe3d52c61e46bb3e65cd14436395833129f28caca8d72fe58fb0b
-  data.tar.gz: adbf2fa97b6f63a9c2d2218e3a7ab1621609ba148f0070b5faefdffbca7cca3a561f1bbc4d6646cb3a0936c97a31765cd9c0c151431d640b8e1bdb59ad444594
+  metadata.gz: 6645b0ca4a9b00c7d390e4dfa8851bf6b547be099b14ec739d3b57d2650219bd907e8aa99c6c3d038a1120fc8dcdac9115f20322cc9457dddd7c012dcbef8a6f
+  data.tar.gz: 3990872125e3d7700ee9b7902468f7e4eb9beb623cf948e044aae4bc369c0ca35b71722da488d72da0d5aa6d1b5fd3258b6e4038775b12029816be7e15461b60

data/lib/mongoid/elasticsearch/es.rb

@@ -79,6 +79,7 @@ module Mongoid
         search({body: {query: {match_all: {}}}}, options)
       end
 
+
       def options_for(obj)
         {id: obj.id.to_s}.merge type_options
       end

data/lib/mongoid/elasticsearch/index.rb

@@ -13,8 +13,12 @@ module Mongoid
         klass.es_index_name
       end
 
+      ## mapping names should not be specified, it will direclty use the type from here, which will default to document.
+      ## if specified, mapping name should be document.
+      ## this was modified to set the type of all documents as "document", because in newer versions elasticsearch supports only one mapping/type per index.
       def type
-        klass.model_name.collection.singularize
+        "document"
+        #klass.model_name.collection.singularize
       end
 
       def options

data/lib/mongoid/elasticsearch/response.rb

@@ -147,10 +147,15 @@ module Mongoid
       end
 
       def multi_with_load
+        #puts "--------------- Inside multi with load -------------"
+        #puts "returned since hits were empty."
         return [] if hits.empty?
-
+        #puts "hits not empty."
+        #type has been shorted out to be document_type
+        #type for all documents is the same and it is called 'document'
+        #so now the document_type is the actual class of the model.
         records = {}
-        hits.group_by { |item| item['_type'] }.each do |type, items|
+        hits.group_by { |item| item['_source']['document_type'] }.each do |type, items|
           klass = find_klass(type)
           ####################################################
           ##
@@ -174,7 +179,7 @@ module Mongoid
               records[type]||= []
               records[type] << klass.find(h['_id'])
             rescue => e
-              
+              puts e.to_s
             end
           end
 
@@ -183,8 +188,8 @@ module Mongoid
         # Reorder records to preserve the order from search results
         hits.map do |item|
           ### THIS LINE WAS ADDED TO CHECK IF THE TYPE EXISTS.
-          if records[item['_type']]
-            records[item['_type']].detect do |record|
+          if records[item['_source']['document_type']]
+            records[item['_source']['document_type']].detect do |record|
               record.id.to_s == item['_id'].to_s
             end
           end
@@ -193,7 +198,7 @@ module Mongoid
 
       def multi_without_load
         hits.map do |h|
-          klass = find_klass(h['_type'])
+          klass = find_klass(h['_source']['document_type'])
           h[:_highlight] = h.delete('highlight') if h.key?('highlight')
           source = h.delete('_source')
           if defined?(Moped::BSON)

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wj-mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid