mongoid-elasticsearch 0.8.3 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +0 -1
- data/.ruby-version +1 -1
- data/.travis.yml +1 -3
- data/Gemfile +2 -0
- data/Gemfile.lock +162 -0
- data/README.md +5 -2
- data/lib/mongoid/elasticsearch/es.rb +9 -3
- data/lib/mongoid/elasticsearch/version.rb +1 -1
- data/mongoid-elasticsearch.gemspec +3 -3
- data/spec/spec_helper.rb +2 -1
- metadata +13 -14
- data/gemfiles/es-git.gemfile +0 -6
- data/gemfiles/mongoid3.gemfile +0 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7513fa8314b5c54a7586c309ce159c1a49f17d4b
|
4
|
+
data.tar.gz: ddba9566dd1a2b8d8348bcddad754a226d6d2f06
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 198512e9c03ef70021fa67dfdde7d4d181b42f99e0f68f6a0884c5db9f54bdb2d17687dee58d8914358366e8792c0c9963f88743a8c900cb00da165503639b70
|
7
|
+
data.tar.gz: b3f425d37fd8710891c5d8e051c8d7ef0c2dc854454e4048eaf3bce64f24a9e1dc84a8055b1a6e926959f78edce5ab56795a2328c5c9a3ffcf98150f231a9ab5
|
data/.gitignore
CHANGED
data/.ruby-version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.
|
1
|
+
2.2.3
|
data/.travis.yml
CHANGED
data/Gemfile
CHANGED
data/Gemfile.lock
ADDED
@@ -0,0 +1,162 @@
|
|
1
|
+
GIT
|
2
|
+
remote: git://github.com/DatabaseCleaner/database_cleaner.git
|
3
|
+
revision: b87f00320f8aa0f7e499d183128f05ce29cedc33
|
4
|
+
specs:
|
5
|
+
database_cleaner (1.5.1)
|
6
|
+
|
7
|
+
PATH
|
8
|
+
remote: .
|
9
|
+
specs:
|
10
|
+
mongoid-elasticsearch (0.9.0)
|
11
|
+
elasticsearch (~> 1.0.13)
|
12
|
+
mongoid (>= 3.0, < 6.0)
|
13
|
+
ruby-progressbar
|
14
|
+
|
15
|
+
GEM
|
16
|
+
remote: https://rubygems.org/
|
17
|
+
specs:
|
18
|
+
actionpack (4.2.4)
|
19
|
+
actionview (= 4.2.4)
|
20
|
+
activesupport (= 4.2.4)
|
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.4)
|
26
|
+
activesupport (= 4.2.4)
|
27
|
+
builder (~> 3.1)
|
28
|
+
erubis (~> 2.7.0)
|
29
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
30
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
31
|
+
activemodel (4.2.4)
|
32
|
+
activesupport (= 4.2.4)
|
33
|
+
builder (~> 3.1)
|
34
|
+
activesupport (4.2.4)
|
35
|
+
i18n (~> 0.7)
|
36
|
+
json (~> 1.7, >= 1.7.7)
|
37
|
+
minitest (~> 5.1)
|
38
|
+
thread_safe (~> 0.3, >= 0.3.4)
|
39
|
+
tzinfo (~> 1.1)
|
40
|
+
bson (3.2.4)
|
41
|
+
builder (3.2.2)
|
42
|
+
coveralls (0.8.2)
|
43
|
+
json (~> 1.8)
|
44
|
+
rest-client (>= 1.6.8, < 2)
|
45
|
+
simplecov (~> 0.10.0)
|
46
|
+
term-ansicolor (~> 1.3)
|
47
|
+
thor (~> 0.19.1)
|
48
|
+
diff-lcs (1.2.5)
|
49
|
+
docile (1.1.5)
|
50
|
+
domain_name (0.5.24)
|
51
|
+
unf (>= 0.0.5, < 1.0.0)
|
52
|
+
elasticsearch (1.0.13)
|
53
|
+
elasticsearch-api (= 1.0.13)
|
54
|
+
elasticsearch-transport (= 1.0.13)
|
55
|
+
elasticsearch-api (1.0.13)
|
56
|
+
multi_json
|
57
|
+
elasticsearch-transport (1.0.13)
|
58
|
+
faraday
|
59
|
+
multi_json
|
60
|
+
erubis (2.7.0)
|
61
|
+
faraday (0.9.1)
|
62
|
+
multipart-post (>= 1.2, < 3)
|
63
|
+
glebtv-httpclient (3.2.8)
|
64
|
+
lru_redux
|
65
|
+
hashie (3.4.2)
|
66
|
+
http-cookie (1.0.2)
|
67
|
+
domain_name (~> 0.5)
|
68
|
+
i18n (0.7.0)
|
69
|
+
json (1.8.3)
|
70
|
+
kaminari (0.16.3)
|
71
|
+
actionpack (>= 3.0.0)
|
72
|
+
activesupport (>= 3.0.0)
|
73
|
+
loofah (2.0.3)
|
74
|
+
nokogiri (>= 1.5.9)
|
75
|
+
lru_redux (1.1.0)
|
76
|
+
mime-types (2.6.2)
|
77
|
+
mini_portile (0.6.2)
|
78
|
+
minitest (5.8.1)
|
79
|
+
mongo (2.1.1)
|
80
|
+
bson (~> 3.0)
|
81
|
+
mongoid (5.0.0)
|
82
|
+
activemodel (~> 4.0)
|
83
|
+
mongo (~> 2.1)
|
84
|
+
origin (~> 2.1)
|
85
|
+
tzinfo (>= 0.3.37)
|
86
|
+
mongoid-compatibility (0.3.1)
|
87
|
+
activesupport
|
88
|
+
mongoid (>= 2.0)
|
89
|
+
mongoid-slug (5.0.0)
|
90
|
+
mongoid (>= 3.0)
|
91
|
+
mongoid-compatibility
|
92
|
+
stringex (~> 2.0)
|
93
|
+
multi_json (1.11.2)
|
94
|
+
multipart-post (2.0.0)
|
95
|
+
netrc (0.10.3)
|
96
|
+
nokogiri (1.6.6.2)
|
97
|
+
mini_portile (~> 0.6.0)
|
98
|
+
origin (2.1.1)
|
99
|
+
rack (1.6.4)
|
100
|
+
rack-test (0.6.3)
|
101
|
+
rack (>= 1.0)
|
102
|
+
rails-deprecated_sanitizer (1.0.3)
|
103
|
+
activesupport (>= 4.2.0.alpha)
|
104
|
+
rails-dom-testing (1.0.7)
|
105
|
+
activesupport (>= 4.2.0.beta, < 5.0)
|
106
|
+
nokogiri (~> 1.6.0)
|
107
|
+
rails-deprecated_sanitizer (>= 1.0.1)
|
108
|
+
rails-html-sanitizer (1.0.2)
|
109
|
+
loofah (~> 2.0)
|
110
|
+
rake (10.4.2)
|
111
|
+
rest-client (1.8.0)
|
112
|
+
http-cookie (>= 1.0.2, < 2.0)
|
113
|
+
mime-types (>= 1.16, < 3.0)
|
114
|
+
netrc (~> 0.7)
|
115
|
+
rspec (3.3.0)
|
116
|
+
rspec-core (~> 3.3.0)
|
117
|
+
rspec-expectations (~> 3.3.0)
|
118
|
+
rspec-mocks (~> 3.3.0)
|
119
|
+
rspec-core (3.3.2)
|
120
|
+
rspec-support (~> 3.3.0)
|
121
|
+
rspec-expectations (3.3.1)
|
122
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
123
|
+
rspec-support (~> 3.3.0)
|
124
|
+
rspec-mocks (3.3.2)
|
125
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
126
|
+
rspec-support (~> 3.3.0)
|
127
|
+
rspec-support (3.3.0)
|
128
|
+
ruby-progressbar (1.7.5)
|
129
|
+
simplecov (0.10.0)
|
130
|
+
docile (~> 1.1.0)
|
131
|
+
json (~> 1.8)
|
132
|
+
simplecov-html (~> 0.10.0)
|
133
|
+
simplecov-html (0.10.0)
|
134
|
+
stringex (2.5.2)
|
135
|
+
term-ansicolor (1.3.2)
|
136
|
+
tins (~> 1.0)
|
137
|
+
thor (0.19.1)
|
138
|
+
thread_safe (0.3.5)
|
139
|
+
tins (1.6.0)
|
140
|
+
tzinfo (1.2.2)
|
141
|
+
thread_safe (~> 0.1)
|
142
|
+
unf (0.1.4)
|
143
|
+
unf_ext
|
144
|
+
unf_ext (0.0.7.1)
|
145
|
+
|
146
|
+
PLATFORMS
|
147
|
+
ruby
|
148
|
+
|
149
|
+
DEPENDENCIES
|
150
|
+
bundler
|
151
|
+
coveralls
|
152
|
+
database_cleaner!
|
153
|
+
glebtv-httpclient
|
154
|
+
hashie
|
155
|
+
kaminari
|
156
|
+
mongoid-elasticsearch!
|
157
|
+
mongoid-slug (~> 5.0.0)
|
158
|
+
rake
|
159
|
+
rspec
|
160
|
+
|
161
|
+
BUNDLED WITH
|
162
|
+
1.10.6
|
data/README.md
CHANGED
@@ -3,7 +3,10 @@
|
|
3
3
|
[![Build Status](https://travis-ci.org/rs-pro/mongoid-elasticsearch.png?branch=master)](https://travis-ci.org/rs-pro/mongoid-elasticsearch)
|
4
4
|
[![Coverage Status](https://coveralls.io/repos/rs-pro/mongoid-elasticsearch/badge.png?branch=master)](https://coveralls.io/r/rs-pro/mongoid-elasticsearch?branch=master)
|
5
5
|
[![Gem Version](https://badge.fury.io/rb/mongoid-elasticsearch.png)](http://badge.fury.io/rb/mongoid-elasticsearch)
|
6
|
-
[![Dependency Status](https://www.versioneye.com/
|
6
|
+
[![Dependency Status](https://www.versioneye.com/user/projects/53e73fe735080d1e4d00009c/badge.svg)](https://www.versioneye.com/user/projects/53e73fe735080d1e4d00009c)
|
7
|
+
[![Issues](http://img.shields.io/github/issues/rs-pro/mongoid-elasticsearch.svg)](https://github.com/rs-pro/mongoid-elasticsearch/issues)
|
8
|
+
[![License](http://img.shields.io/:license-mit-blue.svg)](https://github.com/rs-pro/mongoid-elasticsearch/blob/master/MIT-LICENSE.txt)
|
9
|
+
|
7
10
|
|
8
11
|
Use [Elasticsearch](http://www.elasticsearch.org/) with mongoid with just a few
|
9
12
|
lines of code
|
@@ -65,7 +68,7 @@ Or install it yourself as:
|
|
65
68
|
result.results # by default returns an Enumerable with Post instances exactly
|
66
69
|
# like they were loaded from MongoDB
|
67
70
|
Post.es.index.create # create index (done automatically on app boot)
|
68
|
-
Post.es.index.
|
71
|
+
Post.es.index.delete # drop index
|
69
72
|
Post.es.index.reset # recreate index
|
70
73
|
Post.es.index.refresh # force index update (useful for specs)
|
71
74
|
Post.es.client # Elasticsearch::Client instance
|
@@ -20,10 +20,16 @@ module Mongoid
|
|
20
20
|
|
21
21
|
def index_all(step_size = INDEX_STEP)
|
22
22
|
index.reset
|
23
|
-
q = klass.
|
23
|
+
q = klass.asc(:id)
|
24
24
|
steps = (q.count / step_size) + 1
|
25
|
+
last_id = nil
|
25
26
|
steps.times do |step|
|
26
|
-
|
27
|
+
if last_id
|
28
|
+
docs = q.gt(id: last_id).limit(step_size).to_a
|
29
|
+
else
|
30
|
+
docs = q.limit(step_size).to_a
|
31
|
+
end
|
32
|
+
last_id = docs.last.try(:id)
|
27
33
|
docs = docs.map do |obj|
|
28
34
|
if obj.es_index?
|
29
35
|
{ index: {data: obj.as_indexed_json}.merge(_id: obj.id.to_s) }
|
@@ -36,7 +42,7 @@ module Mongoid
|
|
36
42
|
if block_given?
|
37
43
|
yield steps, step
|
38
44
|
end
|
39
|
-
end
|
45
|
+
end
|
40
46
|
end
|
41
47
|
|
42
48
|
def search(query, options = {})
|
@@ -18,8 +18,8 @@ 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", "< 6.0"]
|
22
|
+
spec.add_dependency "elasticsearch", "~> 1.0.13"
|
23
23
|
spec.add_dependency "ruby-progressbar"
|
24
24
|
|
25
25
|
spec.add_development_dependency "bundler"
|
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
|
|
29
29
|
spec.add_development_dependency "database_cleaner"
|
30
30
|
spec.add_development_dependency "coveralls"
|
31
31
|
spec.add_development_dependency "hashie"
|
32
|
-
spec.add_development_dependency "
|
32
|
+
spec.add_development_dependency "mongoid-slug", '~> 5.0.0'
|
33
33
|
spec.add_development_dependency "glebtv-httpclient"
|
34
34
|
end
|
data/spec/spec_helper.rb
CHANGED
@@ -28,6 +28,7 @@ else
|
|
28
28
|
DEFAULT_OPT = {}
|
29
29
|
end
|
30
30
|
Mongoid::Elasticsearch.client_options = DEFAULT_OPT.dup
|
31
|
+
Mongo::Logger.logger.level = ::Logger::FATAL
|
31
32
|
|
32
33
|
# Mongoid::Elasticsearch.client_options = {log: true}
|
33
34
|
|
@@ -46,7 +47,7 @@ DatabaseCleaner.orm = "mongoid"
|
|
46
47
|
|
47
48
|
RSpec.configure do |config|
|
48
49
|
config.before(:all) do
|
49
|
-
DatabaseCleaner.strategy = :truncation
|
50
|
+
#DatabaseCleaner.strategy = :truncation
|
50
51
|
Article.es.index.reset
|
51
52
|
Post.es.index.reset
|
52
53
|
Nowrapper.es.index.reset
|
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.9.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: 2015-10-01 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: '6.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: '6.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.13
|
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.13
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: ruby-progressbar
|
49
49
|
requirement: !ruby/object:Gem::Requirement
|
@@ -157,19 +157,19 @@ dependencies:
|
|
157
157
|
- !ruby/object:Gem::Version
|
158
158
|
version: '0'
|
159
159
|
- !ruby/object:Gem::Dependency
|
160
|
-
name:
|
160
|
+
name: mongoid-slug
|
161
161
|
requirement: !ruby/object:Gem::Requirement
|
162
162
|
requirements:
|
163
|
-
- - "
|
163
|
+
- - "~>"
|
164
164
|
- !ruby/object:Gem::Version
|
165
|
-
version:
|
165
|
+
version: 5.0.0
|
166
166
|
type: :development
|
167
167
|
prerelease: false
|
168
168
|
version_requirements: !ruby/object:Gem::Requirement
|
169
169
|
requirements:
|
170
|
-
- - "
|
170
|
+
- - "~>"
|
171
171
|
- !ruby/object:Gem::Version
|
172
|
-
version:
|
172
|
+
version: 5.0.0
|
173
173
|
- !ruby/object:Gem::Dependency
|
174
174
|
name: glebtv-httpclient
|
175
175
|
requirement: !ruby/object:Gem::Requirement
|
@@ -199,11 +199,10 @@ files:
|
|
199
199
|
- ".travis.yml"
|
200
200
|
- CHANGELOG.md
|
201
201
|
- Gemfile
|
202
|
+
- Gemfile.lock
|
202
203
|
- MIT-LICENSE.txt
|
203
204
|
- README.md
|
204
205
|
- Rakefile
|
205
|
-
- gemfiles/es-git.gemfile
|
206
|
-
- gemfiles/mongoid3.gemfile
|
207
206
|
- lib/mongoid-elasticsearch.rb
|
208
207
|
- lib/mongoid/elasticsearch.rb
|
209
208
|
- lib/mongoid/elasticsearch/callbacks.rb
|
@@ -245,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
245
244
|
version: '0'
|
246
245
|
requirements: []
|
247
246
|
rubyforge_project:
|
248
|
-
rubygems_version: 2.
|
247
|
+
rubygems_version: 2.4.5.1
|
249
248
|
signing_key:
|
250
249
|
specification_version: 4
|
251
250
|
summary: Simple and easy integration of mongoid with the new elasticsearch gem
|
data/gemfiles/es-git.gemfile
DELETED