mongoid-elasticsearch 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f0c6eaa6812978af90ec347086edbcc03e71d8d
-  data.tar.gz: 9d8f30124b7a438dfab87a4e605f5c288050e466
+  metadata.gz: 5fccb1027e5e75109d622f5d3e739f86cc98e974
+  data.tar.gz: 26828679705d5ef28df814ac561c07bc770ac0e2
 SHA512:
-  metadata.gz: 2f403b7966a91e238c8cdd7e4d3b990d5a5344f5cf60a51bf76178ed06cd75f998cb96efc5850a5a834c8e6a012709b52f40dd8df7cf7588daa039d4b1c799c9
-  data.tar.gz: 9396e8ac12fb662c50cc3e159d957a862952635747a9946c1fce4dc054eee67b491b067f7ff3ebb6f79e4a02d6f6c9cf175677aa1a4a98a303600ec0153589d4
+  metadata.gz: b7624a2bef1ee0ba77aedb27854e87c4ac245b90d041ed0390be4b8e5c16add984ab1517e953a52cad78d143ad6db9cdaf81988be64123afe6f3bb0114e4c66d
+  data.tar.gz: 65571126df2b71fb3dff69358f609e343ea83157dfe6f69daa8e0ca07ab4e8bdb49c191b57cd33d8698c61682fd1e781fd144ee8eadb9f7af5f5f66f96222b82

data/lib/mongoid/elasticsearch.rb

@@ -10,10 +10,6 @@ require 'mongoid/elasticsearch/index'
 require 'mongoid/elasticsearch/indexing'
 require 'mongoid/elasticsearch/response'
 
-if Elasticsearch::VERSION < '0.4.1'
-  require 'mongoid/elasticsearch/slash_monkeypatch'
-end
-
 module Mongoid
   module Elasticsearch
     mattr_accessor :prefix

data/lib/mongoid/elasticsearch/response.rb

@@ -151,6 +151,7 @@ module Mongoid
       def multi_without_load
         hits.map do |h|
           klass = find_klass(h['_type'])
+          h[:_highlight] = h.delete('highlight') if h.key?('highlight')
           source = h.delete('_source')
           if defined?(Moped::BSON)
             source.each do |k,v|
@@ -174,7 +175,7 @@ module Mongoid
             end
           rescue Mongoid::Errors::UnknownAttribute
             klass.class_eval <<-RUBY, __FILE__, __LINE__+1
-              attr_accessor :_type, :_score, :_source
+              attr_accessor :_type, :_score, :_source, :_highlight
             RUBY
             m = klass.new(h.merge(source))
           end

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/mongoid-elasticsearch.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mongoid", [">= 3.0", "< 4.1"]
-  spec.add_dependency "elasticsearch", "~> 0.4.1"
+  spec.add_dependency "elasticsearch", "~> 0.4.2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - glebtv
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,6 @@ files:
 - lib/mongoid/elasticsearch/indexing.rb
 - lib/mongoid/elasticsearch/pagination.rb
 - lib/mongoid/elasticsearch/response.rb
-- lib/mongoid/elasticsearch/slash_monkeypatch.rb
 - lib/mongoid/elasticsearch/utils.rb
 - lib/mongoid/elasticsearch/version.rb
 - mongoid-elasticsearch.gemspec

data/lib/mongoid/elasticsearch/slash_monkeypatch.rb

@@ -1,14 +0,0 @@
-# Monkeypatch for slashes to work
-
-module Elasticsearch
-  module API
-    # Generic utility methods
-    #
-    module Utils
-      alias_method :__pathify_without_slashes, :__pathify
-      def __pathify(*segments)
-        __pathify_without_slashes(*segments.map { |s| s.gsub('/', '%2F')}).gsub('%252F', '%2F')
-      end
-    end
-  end
-end