mongoid-elasticsearch 0.9.1 → 0.10.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/Gemfile.lock +96 -96
- data/README.md +2 -0
- data/lib/mongoid/elasticsearch.rb +3 -1
- data/lib/mongoid/elasticsearch/es.rb +1 -1
- data/lib/mongoid/elasticsearch/index.rb +1 -1
- data/lib/mongoid/elasticsearch/version.rb +1 -1
- data/mongoid-elasticsearch.gemspec +3 -3
- data/spec/mongoid_elasticsearch_spec.rb +2 -0
- data/spec/spec_helper.rb +1 -0
- metadata +7 -21
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 7c140d37c4e1497f03d4c361eb3b9d32f0607281130e078ff8f992316e79e46b
|
4
|
+
data.tar.gz: 7e66350c52b8b12651ac1de5aa3cc6807dec90a9345aced3ccba07b2a321790d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3807b14317deb5cd0838dbaec189f74870cb7f8b752556457741eadfbaf74a204eed2e50888558fc0865d484d6c5749eeb196ae12254051a08750951006143eb
|
7
|
+
data.tar.gz: 84898ba9d19f3c79e47ca168430cc31c0c37240cdf8d2a776d7094b2f3ee851c739cc5599e4e591148db2b9a8e67f393fb7aef7ab0a42b5ef241233d7ff15e99
|
data/Gemfile.lock
CHANGED
@@ -1,133 +1,133 @@
|
|
1
1
|
GIT
|
2
2
|
remote: git://github.com/DatabaseCleaner/database_cleaner.git
|
3
|
-
revision:
|
3
|
+
revision: 4c2408ffdbbd990e78d6590f4ef6ba5e58aca673
|
4
4
|
specs:
|
5
|
-
database_cleaner (1.
|
5
|
+
database_cleaner (1.7.0)
|
6
6
|
|
7
7
|
PATH
|
8
8
|
remote: .
|
9
9
|
specs:
|
10
|
-
mongoid-elasticsearch (0.
|
11
|
-
elasticsearch (~> 1.0
|
12
|
-
mongoid (>= 3.0, <
|
10
|
+
mongoid-elasticsearch (0.10.0)
|
11
|
+
elasticsearch (~> 1.0)
|
12
|
+
mongoid (>= 3.0, < 8.0)
|
13
13
|
ruby-progressbar
|
14
14
|
|
15
15
|
GEM
|
16
16
|
remote: https://rubygems.org/
|
17
17
|
specs:
|
18
|
-
|
19
|
-
|
20
|
-
activesupport (= 4.2.6)
|
21
|
-
rack (~> 1.6)
|
22
|
-
rack-test (~> 0.6.2)
|
23
|
-
rails-dom-testing (~> 1.0, >= 1.0.5)
|
24
|
-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
25
|
-
actionview (4.2.6)
|
26
|
-
activesupport (= 4.2.6)
|
18
|
+
actionview (5.2.1)
|
19
|
+
activesupport (= 5.2.1)
|
27
20
|
builder (~> 3.1)
|
28
|
-
|
29
|
-
rails-dom-testing (~>
|
30
|
-
rails-html-sanitizer (~> 1.0, >= 1.0.
|
31
|
-
activemodel (
|
32
|
-
activesupport (=
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
21
|
+
erubi (~> 1.4)
|
22
|
+
rails-dom-testing (~> 2.0)
|
23
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
24
|
+
activemodel (5.2.1)
|
25
|
+
activesupport (= 5.2.1)
|
26
|
+
activerecord (5.2.1)
|
27
|
+
activemodel (= 5.2.1)
|
28
|
+
activesupport (= 5.2.1)
|
29
|
+
arel (>= 9.0)
|
30
|
+
activesupport (5.2.1)
|
31
|
+
concurrent-ruby (~> 1.0, >= 1.0.2)
|
32
|
+
i18n (>= 0.7, < 2)
|
37
33
|
minitest (~> 5.1)
|
38
|
-
thread_safe (~> 0.3, >= 0.3.4)
|
39
34
|
tzinfo (~> 1.1)
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
35
|
+
arel (9.0.0)
|
36
|
+
bson (4.3.0)
|
37
|
+
builder (3.2.3)
|
38
|
+
concurrent-ruby (1.1.3)
|
39
|
+
coveralls (0.8.22)
|
40
|
+
json (>= 1.8, < 3)
|
41
|
+
simplecov (~> 0.16.1)
|
45
42
|
term-ansicolor (~> 1.3)
|
46
|
-
thor (~> 0.19.
|
47
|
-
tins (~> 1.6
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
elasticsearch-
|
53
|
-
|
43
|
+
thor (~> 0.19.4)
|
44
|
+
tins (~> 1.6)
|
45
|
+
crass (1.0.4)
|
46
|
+
diff-lcs (1.3)
|
47
|
+
docile (1.3.1)
|
48
|
+
elasticsearch (1.1.3)
|
49
|
+
elasticsearch-api (= 1.1.3)
|
50
|
+
elasticsearch-transport (= 1.1.3)
|
51
|
+
elasticsearch-api (1.1.3)
|
54
52
|
multi_json
|
55
|
-
elasticsearch-transport (1.
|
53
|
+
elasticsearch-transport (1.1.3)
|
56
54
|
faraday
|
57
55
|
multi_json
|
58
|
-
|
59
|
-
faraday (0.
|
56
|
+
erubi (1.7.1)
|
57
|
+
faraday (0.15.3)
|
60
58
|
multipart-post (>= 1.2, < 3)
|
61
59
|
glebtv-httpclient (3.2.8)
|
62
60
|
lru_redux
|
63
|
-
hashie (3.
|
64
|
-
i18n (
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
activesupport (>=
|
69
|
-
|
61
|
+
hashie (3.6.0)
|
62
|
+
i18n (1.1.1)
|
63
|
+
concurrent-ruby (~> 1.0)
|
64
|
+
json (2.1.0)
|
65
|
+
kaminari (1.1.1)
|
66
|
+
activesupport (>= 4.1.0)
|
67
|
+
kaminari-actionview (= 1.1.1)
|
68
|
+
kaminari-activerecord (= 1.1.1)
|
69
|
+
kaminari-core (= 1.1.1)
|
70
|
+
kaminari-actionview (1.1.1)
|
71
|
+
actionview
|
72
|
+
kaminari-core (= 1.1.1)
|
73
|
+
kaminari-activerecord (1.1.1)
|
74
|
+
activerecord
|
75
|
+
kaminari-core (= 1.1.1)
|
76
|
+
kaminari-core (1.1.1)
|
77
|
+
loofah (2.2.3)
|
78
|
+
crass (~> 1.0.2)
|
70
79
|
nokogiri (>= 1.5.9)
|
71
80
|
lru_redux (1.1.0)
|
72
|
-
mini_portile2 (2.
|
73
|
-
minitest (5.
|
74
|
-
mongo (2.2
|
75
|
-
bson (
|
76
|
-
mongoid (
|
77
|
-
activemodel (
|
78
|
-
mongo (
|
79
|
-
|
80
|
-
tzinfo (>= 0.3.37)
|
81
|
-
mongoid-compatibility (0.3.1)
|
81
|
+
mini_portile2 (2.3.0)
|
82
|
+
minitest (5.11.3)
|
83
|
+
mongo (2.6.2)
|
84
|
+
bson (>= 4.3.0, < 5.0.0)
|
85
|
+
mongoid (7.0.2)
|
86
|
+
activemodel (>= 5.1, < 6.0.0)
|
87
|
+
mongo (>= 2.5.1, < 3.0.0)
|
88
|
+
mongoid-compatibility (0.5.1)
|
82
89
|
activesupport
|
83
90
|
mongoid (>= 2.0)
|
84
91
|
mongoid-slug (5.0.0)
|
85
92
|
mongoid (>= 3.0)
|
86
93
|
mongoid-compatibility
|
87
94
|
stringex (~> 2.0)
|
88
|
-
multi_json (1.
|
95
|
+
multi_json (1.13.1)
|
89
96
|
multipart-post (2.0.0)
|
90
|
-
nokogiri (1.
|
91
|
-
mini_portile2 (~> 2.
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
rspec (3.4.0)
|
106
|
-
rspec-core (~> 3.4.0)
|
107
|
-
rspec-expectations (~> 3.4.0)
|
108
|
-
rspec-mocks (~> 3.4.0)
|
109
|
-
rspec-core (3.4.4)
|
110
|
-
rspec-support (~> 3.4.0)
|
111
|
-
rspec-expectations (3.4.0)
|
97
|
+
nokogiri (1.8.5)
|
98
|
+
mini_portile2 (~> 2.3.0)
|
99
|
+
rails-dom-testing (2.0.3)
|
100
|
+
activesupport (>= 4.2.0)
|
101
|
+
nokogiri (>= 1.6)
|
102
|
+
rails-html-sanitizer (1.0.4)
|
103
|
+
loofah (~> 2.2, >= 2.2.2)
|
104
|
+
rake (12.3.1)
|
105
|
+
rspec (3.8.0)
|
106
|
+
rspec-core (~> 3.8.0)
|
107
|
+
rspec-expectations (~> 3.8.0)
|
108
|
+
rspec-mocks (~> 3.8.0)
|
109
|
+
rspec-core (3.8.0)
|
110
|
+
rspec-support (~> 3.8.0)
|
111
|
+
rspec-expectations (3.8.2)
|
112
112
|
diff-lcs (>= 1.2.0, < 2.0)
|
113
|
-
rspec-support (~> 3.
|
114
|
-
rspec-mocks (3.
|
113
|
+
rspec-support (~> 3.8.0)
|
114
|
+
rspec-mocks (3.8.0)
|
115
115
|
diff-lcs (>= 1.2.0, < 2.0)
|
116
|
-
rspec-support (~> 3.
|
117
|
-
rspec-support (3.
|
118
|
-
ruby-progressbar (1.
|
119
|
-
simplecov (0.
|
120
|
-
docile (~> 1.1
|
121
|
-
json (
|
116
|
+
rspec-support (~> 3.8.0)
|
117
|
+
rspec-support (3.8.0)
|
118
|
+
ruby-progressbar (1.10.0)
|
119
|
+
simplecov (0.16.1)
|
120
|
+
docile (~> 1.1)
|
121
|
+
json (>= 1.8, < 3)
|
122
122
|
simplecov-html (~> 0.10.0)
|
123
|
-
simplecov-html (0.10.
|
124
|
-
stringex (2.
|
125
|
-
term-ansicolor (1.
|
123
|
+
simplecov-html (0.10.2)
|
124
|
+
stringex (2.8.5)
|
125
|
+
term-ansicolor (1.7.0)
|
126
126
|
tins (~> 1.0)
|
127
|
-
thor (0.19.
|
128
|
-
thread_safe (0.3.
|
129
|
-
tins (1.
|
130
|
-
tzinfo (1.2.
|
127
|
+
thor (0.19.4)
|
128
|
+
thread_safe (0.3.6)
|
129
|
+
tins (1.20.2)
|
130
|
+
tzinfo (1.2.5)
|
131
131
|
thread_safe (~> 0.1)
|
132
132
|
|
133
133
|
PLATFORMS
|
@@ -146,4 +146,4 @@ DEPENDENCIES
|
|
146
146
|
rspec
|
147
147
|
|
148
148
|
BUNDLED WITH
|
149
|
-
1.
|
149
|
+
1.17.1
|
data/README.md
CHANGED
@@ -50,6 +50,7 @@ module Mongoid
|
|
50
50
|
options = {
|
51
51
|
prefix_name: true,
|
52
52
|
index_name: nil,
|
53
|
+
index_type: nil,
|
53
54
|
client_options: {},
|
54
55
|
index_options: {},
|
55
56
|
index_mappings: nil,
|
@@ -62,10 +63,11 @@ module Mongoid
|
|
62
63
|
attr_accessor :_type, :_score, :_source
|
63
64
|
end
|
64
65
|
|
65
|
-
cattr_accessor :es_client_options, :es_index_name, :es_index_options, :es_wrapper, :es_skip_create
|
66
|
+
cattr_accessor :es_client_options, :es_index_name, :es_index_type, :es_index_options, :es_wrapper, :es_skip_create
|
66
67
|
|
67
68
|
self.es_client_options = Mongoid::Elasticsearch.client_options.dup.merge(options[:client_options])
|
68
69
|
self.es_index_name = (options[:prefix_name] ? Mongoid::Elasticsearch.prefix : '') + (options[:index_name] || model_name.plural)
|
70
|
+
self.es_index_type = options[:index_type] || model_name.collection.singularize
|
69
71
|
self.es_index_options = options[:index_options]
|
70
72
|
self.es_wrapper = options[:wrapper]
|
71
73
|
self.es_skip_create = options[:skip_create]
|
@@ -58,7 +58,7 @@ module Mongoid
|
|
58
58
|
|
59
59
|
options[:wrapper] ||= klass.es_wrapper
|
60
60
|
|
61
|
-
Response.new(client, query.merge(custom_type_options(options)), false, klass, options)
|
61
|
+
Response.new(client, query.merge(custom_type_options(options)), false, options[:scope] || klass, options)
|
62
62
|
end
|
63
63
|
|
64
64
|
def all(options = {})
|
@@ -18,15 +18,15 @@ Gem::Specification.new do |spec|
|
|
18
18
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
19
19
|
spec.require_paths = ["lib"]
|
20
20
|
|
21
|
-
spec.add_dependency "mongoid", [">= 3.0", "<
|
22
|
-
spec.add_dependency "elasticsearch", "~> 1.0
|
21
|
+
spec.add_dependency "mongoid", [">= 3.0", "< 8.0"]
|
22
|
+
spec.add_dependency "elasticsearch", "~> 1.0"
|
23
23
|
spec.add_dependency "ruby-progressbar"
|
24
24
|
|
25
25
|
spec.add_development_dependency "bundler"
|
26
26
|
spec.add_development_dependency "rake"
|
27
27
|
spec.add_development_dependency "rspec"
|
28
28
|
spec.add_development_dependency "kaminari"
|
29
|
-
spec.add_development_dependency "database_cleaner"
|
29
|
+
# spec.add_development_dependency "database_cleaner"
|
30
30
|
spec.add_development_dependency "coveralls"
|
31
31
|
spec.add_development_dependency "hashie"
|
32
32
|
spec.add_development_dependency "mongoid-slug", '~> 5.0.0'
|
@@ -6,6 +6,7 @@ describe Article do
|
|
6
6
|
it 'properly uses options' do
|
7
7
|
expect(Article.es_index_name).to eq 'mongoid_es_news'
|
8
8
|
expect(Article.es.index.name).to eq 'mongoid_es_news'
|
9
|
+
expect(Article.es_index_type).to eq 'article'
|
9
10
|
expect(Article.es.index.type).to eq 'article'
|
10
11
|
expect(Article.es_wrapper).to eq :load
|
11
12
|
expect(Article.es_client_options).to eq(DEFAULT_OPT)
|
@@ -308,6 +309,7 @@ describe Namespaced::Model do
|
|
308
309
|
it 'properly uses options' do
|
309
310
|
expect(Namespaced::Model.es_index_name).to eq 'mongoid_es_test_namespaced_models'
|
310
311
|
expect(Namespaced::Model.es.index.name).to eq 'mongoid_es_test_namespaced_models'
|
312
|
+
expect(Namespaced::Model.es_index_type).to eq 'namespaced/model'
|
311
313
|
expect(Namespaced::Model.es.index.type).to eq 'namespaced/model'
|
312
314
|
expect(Namespaced::Model.es_wrapper).to eq :model
|
313
315
|
expect(Namespaced::Model.es_client_options).to eq(DEFAULT_OPT)
|
data/spec/spec_helper.rb
CHANGED
@@ -32,6 +32,7 @@ Mongo::Logger.logger.level = ::Logger::FATAL
|
|
32
32
|
|
33
33
|
# Mongoid::Elasticsearch.client_options = {log: true}
|
34
34
|
|
35
|
+
# Mongoid::Elasticsearch.client_options = {urls: ['http://127.0.0.1:9205']}
|
35
36
|
Mongoid::Elasticsearch.prefix = "mongoid_es_test_"
|
36
37
|
I18n.enforce_available_locales = true
|
37
38
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mongoid-elasticsearch
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.10.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- glebtv
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-11-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mongoid
|
@@ -19,7 +19,7 @@ dependencies:
|
|
19
19
|
version: '3.0'
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: '
|
22
|
+
version: '8.0'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -29,21 +29,21 @@ dependencies:
|
|
29
29
|
version: '3.0'
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: '
|
32
|
+
version: '8.0'
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: elasticsearch
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
36
36
|
requirements:
|
37
37
|
- - "~>"
|
38
38
|
- !ruby/object:Gem::Version
|
39
|
-
version: 1.0
|
39
|
+
version: '1.0'
|
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: 1.0
|
46
|
+
version: '1.0'
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: ruby-progressbar
|
49
49
|
requirement: !ruby/object:Gem::Requirement
|
@@ -114,20 +114,6 @@ dependencies:
|
|
114
114
|
- - ">="
|
115
115
|
- !ruby/object:Gem::Version
|
116
116
|
version: '0'
|
117
|
-
- !ruby/object:Gem::Dependency
|
118
|
-
name: database_cleaner
|
119
|
-
requirement: !ruby/object:Gem::Requirement
|
120
|
-
requirements:
|
121
|
-
- - ">="
|
122
|
-
- !ruby/object:Gem::Version
|
123
|
-
version: '0'
|
124
|
-
type: :development
|
125
|
-
prerelease: false
|
126
|
-
version_requirements: !ruby/object:Gem::Requirement
|
127
|
-
requirements:
|
128
|
-
- - ">="
|
129
|
-
- !ruby/object:Gem::Version
|
130
|
-
version: '0'
|
131
117
|
- !ruby/object:Gem::Dependency
|
132
118
|
name: coveralls
|
133
119
|
requirement: !ruby/object:Gem::Requirement
|
@@ -244,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
244
230
|
version: '0'
|
245
231
|
requirements: []
|
246
232
|
rubyforge_project:
|
247
|
-
rubygems_version: 2.
|
233
|
+
rubygems_version: 2.7.7
|
248
234
|
signing_key:
|
249
235
|
specification_version: 4
|
250
236
|
summary: Simple and easy integration of mongoid with the new elasticsearch gem
|