mongoid-elasticsearch 0.5.0 → 0.5.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1f0c6eaa6812978af90ec347086edbcc03e71d8d
4
- data.tar.gz: 9d8f30124b7a438dfab87a4e605f5c288050e466
3
+ metadata.gz: 5fccb1027e5e75109d622f5d3e739f86cc98e974
4
+ data.tar.gz: 26828679705d5ef28df814ac561c07bc770ac0e2
5
5
  SHA512:
6
- metadata.gz: 2f403b7966a91e238c8cdd7e4d3b990d5a5344f5cf60a51bf76178ed06cd75f998cb96efc5850a5a834c8e6a012709b52f40dd8df7cf7588daa039d4b1c799c9
7
- data.tar.gz: 9396e8ac12fb662c50cc3e159d957a862952635747a9946c1fce4dc054eee67b491b067f7ff3ebb6f79e4a02d6f6c9cf175677aa1a4a98a303600ec0153589d4
6
+ metadata.gz: b7624a2bef1ee0ba77aedb27854e87c4ac245b90d041ed0390be4b8e5c16add984ab1517e953a52cad78d143ad6db9cdaf81988be64123afe6f3bb0114e4c66d
7
+ data.tar.gz: 65571126df2b71fb3dff69358f609e343ea83157dfe6f69daa8e0ca07ab4e8bdb49c191b57cd33d8698c61682fd1e781fd144ee8eadb9f7af5f5f66f96222b82
@@ -10,10 +10,6 @@ require 'mongoid/elasticsearch/index'
10
10
  require 'mongoid/elasticsearch/indexing'
11
11
  require 'mongoid/elasticsearch/response'
12
12
 
13
- if Elasticsearch::VERSION < '0.4.1'
14
- require 'mongoid/elasticsearch/slash_monkeypatch'
15
- end
16
-
17
13
  module Mongoid
18
14
  module Elasticsearch
19
15
  mattr_accessor :prefix
@@ -151,6 +151,7 @@ module Mongoid
151
151
  def multi_without_load
152
152
  hits.map do |h|
153
153
  klass = find_klass(h['_type'])
154
+ h[:_highlight] = h.delete('highlight') if h.key?('highlight')
154
155
  source = h.delete('_source')
155
156
  if defined?(Moped::BSON)
156
157
  source.each do |k,v|
@@ -174,7 +175,7 @@ module Mongoid
174
175
  end
175
176
  rescue Mongoid::Errors::UnknownAttribute
176
177
  klass.class_eval <<-RUBY, __FILE__, __LINE__+1
177
- attr_accessor :_type, :_score, :_source
178
+ attr_accessor :_type, :_score, :_source, :_highlight
178
179
  RUBY
179
180
  m = klass.new(h.merge(source))
180
181
  end
@@ -1,5 +1,5 @@
1
1
  module Mongoid
2
2
  module Elasticsearch
3
- VERSION = "0.5.0"
3
+ VERSION = "0.5.1"
4
4
  end
5
5
  end
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ["lib"]
20
20
 
21
21
  spec.add_dependency "mongoid", [">= 3.0", "< 4.1"]
22
- spec.add_dependency "elasticsearch", "~> 0.4.1"
22
+ spec.add_dependency "elasticsearch", "~> 0.4.2"
23
23
 
24
24
  spec.add_development_dependency "bundler"
25
25
  spec.add_development_dependency "rake"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mongoid-elasticsearch
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
@@ -36,14 +36,14 @@ dependencies:
36
36
  requirements:
37
37
  - - ~>
38
38
  - !ruby/object:Gem::Version
39
- version: 0.4.1
39
+ version: 0.4.2
40
40
  type: :runtime
41
41
  prerelease: false
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - ~>
45
45
  - !ruby/object:Gem::Version
46
- version: 0.4.1
46
+ version: 0.4.2
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
49
  requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,6 @@ files:
184
184
  - lib/mongoid/elasticsearch/indexing.rb
185
185
  - lib/mongoid/elasticsearch/pagination.rb
186
186
  - lib/mongoid/elasticsearch/response.rb
187
- - lib/mongoid/elasticsearch/slash_monkeypatch.rb
188
187
  - lib/mongoid/elasticsearch/utils.rb
189
188
  - lib/mongoid/elasticsearch/version.rb
190
189
  - mongoid-elasticsearch.gemspec
@@ -1,14 +0,0 @@
1
- # Monkeypatch for slashes to work
2
-
3
- module Elasticsearch
4
- module API
5
- # Generic utility methods
6
- #
7
- module Utils
8
- alias_method :__pathify_without_slashes, :__pathify
9
- def __pathify(*segments)
10
- __pathify_without_slashes(*segments.map { |s| s.gsub('/', '%2F')}).gsub('%252F', '%2F')
11
- end
12
- end
13
- end
14
- end