mongoid-elasticsearch 0.5.1 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.ruby-version +1 -1
  3. data/.travis.yml +1 -2
  4. data/README.md +31 -0
  5. data/lib/mongoid/elasticsearch.rb +3 -1
  6. data/lib/mongoid/elasticsearch/monkeypatches.rb +56 -0
  7. data/lib/mongoid/elasticsearch/version.rb +1 -1
  8. data/mongoid-elasticsearch.gemspec +1 -1
  9. data/spec/spec_helper.rb +2 -0
  10. metadata +36 -36
  11. data/gemfiles/es-0.4.1.gemfile +0 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5fccb1027e5e75109d622f5d3e739f86cc98e974
4
- data.tar.gz: 26828679705d5ef28df814ac561c07bc770ac0e2
3
+ metadata.gz: f4677ca4d511880593ad4caaa3db6a94d7b94eb8
4
+ data.tar.gz: ce66a3fd85bf6b7ac28049076071fed86fbd935e
5
5
  SHA512:
6
- metadata.gz: b7624a2bef1ee0ba77aedb27854e87c4ac245b90d041ed0390be4b8e5c16add984ab1517e953a52cad78d143ad6db9cdaf81988be64123afe6f3bb0114e4c66d
7
- data.tar.gz: 65571126df2b71fb3dff69358f609e343ea83157dfe6f69daa8e0ca07ab4e8bdb49c191b57cd33d8698c61682fd1e781fd144ee8eadb9f7af5f5f66f96222b82
6
+ metadata.gz: 2d49b4a4f21afde4f6b0f9bc567c90867a543b43738f067fe48dbdf90fbb6fd84bc948606dc6b08c700352b56be795e596f93d89c7810524da45c252a20c8e1e
7
+ data.tar.gz: c1adf29ebb70a6afc79a0180c7f690902520b91a660b91dcb4b5664cbfd9c4e601365199d3a7888798756a214be267639e541e8162d48b20b9cb71fd72b79a60
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.0.0
1
+ 2.1.1
data/.travis.yml CHANGED
@@ -9,7 +9,7 @@ language: ruby
9
9
  rvm:
10
10
  - 1.9.3
11
11
  - 2.0.0
12
- - 2.1.0
12
+ - 2.1.1
13
13
  - jruby-19mode
14
14
  - jruby-20mode
15
15
 
@@ -17,4 +17,3 @@ gemfile:
17
17
  - Gemfile
18
18
  - gemfiles/mongoid3.gemfile
19
19
  - gemfiles/es-git.gemfile
20
- - gemfiles/es-0.4.1.gemfile
data/README.md CHANGED
@@ -150,6 +150,37 @@ index definition options and custom model serialization:
150
150
  # mongoid_slug note: add _slugs to as_indexed_json, NOT slug
151
151
  end
152
152
 
153
+ Example mapping with boost field:
154
+
155
+ elasticsearch!({
156
+ index_name: Rails.env.test? ? 'vv_test_articles' : 'vv_articles',
157
+ index_options: {
158
+ settings: {
159
+ index: {
160
+ analysis: {
161
+ analyzer: {
162
+ my_analyzer: {
163
+ type: "snowball",
164
+ language: "Russian"
165
+ }
166
+ }
167
+ }
168
+ }
169
+ },
170
+ mappings: {
171
+ "articles/article" => {
172
+ _boost: {name: '_boost', null_value: 1},
173
+ properties: {
174
+ name: {type: 'string', boost: 10, analyzer: 'my_analyzer'},
175
+ tags: {type: 'string', analyzer: 'my_analyzer'}
176
+ }
177
+ }
178
+ }
179
+ },
180
+ wrapper: :load
181
+ })
182
+
183
+
153
184
  [Mapping definition docs](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-core-types.html)
154
185
 
155
186
  ### Pagination
data/lib/mongoid/elasticsearch.rb CHANGED
@@ -10,6 +10,8 @@ require 'mongoid/elasticsearch/index'
10
10
  require 'mongoid/elasticsearch/indexing'
11
11
  require 'mongoid/elasticsearch/response'
12
12
 
13
+ require 'mongoid/elasticsearch/monkeypatches'
14
+
13
15
  module Mongoid
14
16
  module Elasticsearch
15
17
  mattr_accessor :prefix
@@ -87,7 +89,7 @@ module Mongoid
87
89
  # use `_all` or empty string to perform the operation on all indices
88
90
  # regardless whether they are managed by Mongoid::Elasticsearch or not
89
91
  unless query.key?(:index)
90
- query.merge!(index: Mongoid::Elasticsearch.registered_indexes.join(','), ignore_indices: 'missing')
92
+ query.merge!(index: Mongoid::Elasticsearch.registered_indexes.join(','), ignore_indices: 'missing', ignore_unavailable: true)
91
93
  end
92
94
 
93
95
  page = options[:page]
data/lib/mongoid/elasticsearch/monkeypatches.rb ADDED
@@ -0,0 +1,56 @@
1
+ # Quick fix for https://github.com/elasticsearch/elasticsearch-ruby/issues/43
2
+
3
+ require 'elasticsearch/api/actions/search'
4
+ module Elasticsearch
5
+ module API
6
+ module Actions
7
+ def search(arguments={})
8
+ arguments[:index] = '_all' if ! arguments[:index] && arguments[:type]
9
+
10
+ valid_params = [
11
+ :analyzer,
12
+ :analyze_wildcard,
13
+ :default_operator,
14
+ :df,
15
+ :explain,
16
+ :fields,
17
+ :from,
18
+ :ignore_indices,
19
+ :ignore_unavailable,
20
+ :allow_no_indices,
21
+ :expand_wildcards,
22
+ :indices_boost,
23
+ :lenient,
24
+ :lowercase_expanded_terms,
25
+ :preference,
26
+ :q,
27
+ :routing,
28
+ :scroll,
29
+ :search_type,
30
+ :size,
31
+ :sort,
32
+ :source,
33
+ :_source,
34
+ :_source_include,
35
+ :_source_exclude,
36
+ :stats,
37
+ :suggest_field,
38
+ :suggest_mode,
39
+ :suggest_size,
40
+ :suggest_text,
41
+ :timeout,
42
+ :version ]
43
+
44
+ method = 'GET'
45
+ path = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_search' )
46
+
47
+ params = Utils.__validate_and_extract_params arguments, valid_params
48
+ body = arguments[:body]
49
+
50
+ params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
51
+
52
+ perform_request(method, path, params, body).body
53
+ end
54
+ end
55
+ end
56
+ end
data/lib/mongoid/elasticsearch/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Mongoid
2
2
  module Elasticsearch
3
- VERSION = "0.5.1"
3
+ VERSION = "0.6.0"
4
4
  end
5
5
  end
data/mongoid-elasticsearch.gemspec CHANGED
@@ -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.2"
22
+ spec.add_dependency "elasticsearch", "~> 1.0.1"
23
23
 
24
24
  spec.add_development_dependency "bundler"
25
25
  spec.add_development_dependency "rake"
data/spec/spec_helper.rb CHANGED
@@ -21,6 +21,8 @@ require "database_cleaner"
21
21
 
22
22
  require "mongoid-elasticsearch"
23
23
 
24
+ # Mongoid::Elasticsearch.client_options = {log: true}
25
+
24
26
  Mongoid::Elasticsearch.prefix = "mongoid_es_test_"
25
27
  I18n.enforce_available_locales = true
26
28
 
metadata CHANGED
@@ -1,159 +1,159 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mongoid-elasticsearch
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.1
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-29 00:00:00.000000000 Z
11
+ date: 2014-03-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mongoid
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '3.0'
20
- - - <
20
+ - - "<"
21
21
  - !ruby/object:Gem::Version
22
22
  version: '4.1'
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
- - - '>='
27
+ - - ">="
28
28
  - !ruby/object:Gem::Version
29
29
  version: '3.0'
30
- - - <
30
+ - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '4.1'
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: 0.4.2
39
+ version: 1.0.1
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.2
46
+ version: 1.0.1
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  requirements:
51
- - - '>='
51
+ - - ">="
52
52
  - !ruby/object:Gem::Version
53
53
  version: '0'
54
54
  type: :development
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
- - - '>='
58
+ - - ">="
59
59
  - !ruby/object:Gem::Version
60
60
  version: '0'
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: rake
63
63
  requirement: !ruby/object:Gem::Requirement
64
64
  requirements:
65
- - - '>='
65
+ - - ">="
66
66
  - !ruby/object:Gem::Version
67
67
  version: '0'
68
68
  type: :development
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
- - - '>='
72
+ - - ">="
73
73
  - !ruby/object:Gem::Version
74
74
  version: '0'
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: rspec
77
77
  requirement: !ruby/object:Gem::Requirement
78
78
  requirements:
79
- - - '>='
79
+ - - ">="
80
80
  - !ruby/object:Gem::Version
81
81
  version: '0'
82
82
  type: :development
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
- - - '>='
86
+ - - ">="
87
87
  - !ruby/object:Gem::Version
88
88
  version: '0'
89
89
  - !ruby/object:Gem::Dependency
90
90
  name: kaminari
91
91
  requirement: !ruby/object:Gem::Requirement
92
92
  requirements:
93
- - - '>='
93
+ - - ">="
94
94
  - !ruby/object:Gem::Version
95
95
  version: '0'
96
96
  type: :development
97
97
  prerelease: false
98
98
  version_requirements: !ruby/object:Gem::Requirement
99
99
  requirements:
100
- - - '>='
100
+ - - ">="
101
101
  - !ruby/object:Gem::Version
102
102
  version: '0'
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: database_cleaner
105
105
  requirement: !ruby/object:Gem::Requirement
106
106
  requirements:
107
- - - '>='
107
+ - - ">="
108
108
  - !ruby/object:Gem::Version
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
112
  version_requirements: !ruby/object:Gem::Requirement
113
113
  requirements:
114
- - - '>='
114
+ - - ">="
115
115
  - !ruby/object:Gem::Version
116
116
  version: '0'
117
117
  - !ruby/object:Gem::Dependency
118
118
  name: coveralls
119
119
  requirement: !ruby/object:Gem::Requirement
120
120
  requirements:
121
- - - '>='
121
+ - - ">="
122
122
  - !ruby/object:Gem::Version
123
123
  version: '0'
124
124
  type: :development
125
125
  prerelease: false
126
126
  version_requirements: !ruby/object:Gem::Requirement
127
127
  requirements:
128
- - - '>='
128
+ - - ">="
129
129
  - !ruby/object:Gem::Version
130
130
  version: '0'
131
131
  - !ruby/object:Gem::Dependency
132
132
  name: hashie
133
133
  requirement: !ruby/object:Gem::Requirement
134
134
  requirements:
135
- - - '>='
135
+ - - ">="
136
136
  - !ruby/object:Gem::Version
137
137
  version: '0'
138
138
  type: :development
139
139
  prerelease: false
140
140
  version_requirements: !ruby/object:Gem::Requirement
141
141
  requirements:
142
- - - '>='
142
+ - - ">="
143
143
  - !ruby/object:Gem::Version
144
144
  version: '0'
145
145
  - !ruby/object:Gem::Dependency
146
146
  name: mongoid_slug
147
147
  requirement: !ruby/object:Gem::Requirement
148
148
  requirements:
149
- - - '>='
149
+ - - ">="
150
150
  - !ruby/object:Gem::Version
151
151
  version: '0'
152
152
  type: :development
153
153
  prerelease: false
154
154
  version_requirements: !ruby/object:Gem::Requirement
155
155
  requirements:
156
- - - '>='
156
+ - - ">="
157
157
  - !ruby/object:Gem::Version
158
158
  version: '0'
159
159
  description: Simple and easy integration of mongoid with the new elasticsearch gem
@@ -163,17 +163,16 @@ executables: []
163
163
  extensions: []
164
164
  extra_rdoc_files: []
165
165
  files:
166
- - .coveralls.yml
167
- - .gitignore
168
- - .rspec
169
- - .ruby-gemset
170
- - .ruby-version
171
- - .travis.yml
166
+ - ".coveralls.yml"
167
+ - ".gitignore"
168
+ - ".rspec"
169
+ - ".ruby-gemset"
170
+ - ".ruby-version"
171
+ - ".travis.yml"
172
172
  - Gemfile
173
173
  - MIT-LICENSE.txt
174
174
  - README.md
175
175
  - Rakefile
176
- - gemfiles/es-0.4.1.gemfile
177
176
  - gemfiles/es-git.gemfile
178
177
  - gemfiles/mongoid3.gemfile
179
178
  - lib/mongoid-elasticsearch.rb
@@ -182,6 +181,7 @@ files:
182
181
  - lib/mongoid/elasticsearch/es.rb
183
182
  - lib/mongoid/elasticsearch/index.rb
184
183
  - lib/mongoid/elasticsearch/indexing.rb
184
+ - lib/mongoid/elasticsearch/monkeypatches.rb
185
185
  - lib/mongoid/elasticsearch/pagination.rb
186
186
  - lib/mongoid/elasticsearch/response.rb
187
187
  - lib/mongoid/elasticsearch/utils.rb
@@ -203,17 +203,17 @@ require_paths:
203
203
  - lib
204
204
  required_ruby_version: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - '>='
206
+ - - ">="
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  required_rubygems_version: !ruby/object:Gem::Requirement
210
210
  requirements:
211
- - - '>='
211
+ - - ">="
212
212
  - !ruby/object:Gem::Version
213
213
  version: '0'
214
214
  requirements: []
215
215
  rubyforge_project:
216
- rubygems_version: 2.2.1
216
+ rubygems_version: 2.2.2
217
217
  signing_key:
218
218
  specification_version: 4
219
219
  summary: Simple and easy integration of mongoid with the new elasticsearch gem
data/gemfiles/es-0.4.1.gemfile DELETED
@@ -1,7 +0,0 @@
1
- source "https://rubygems.org"
2
-
3
- gem "mongoid", github: "mongoid/mongoid", branch: "master"
4
- gem 'elasticsearch', '0.4.1'
5
- gem 'mongoid_slug', github: 'glebtv/mongoid-slug'
6
-
7
- gemspec path: "../"