elasticsearch-rails 7.1.1 → 7.2.1
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.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/README.md +9 -9
- data/Rakefile +7 -8
- data/elasticsearch-rails.gemspec +2 -3
- data/lib/elasticsearch/rails/instrumentation/controller_runtime.rb +1 -1
- data/lib/elasticsearch/rails/instrumentation/log_subscriber.rb +1 -1
- data/lib/elasticsearch/rails/instrumentation/publishers.rb +1 -1
- data/lib/elasticsearch/rails/instrumentation/railtie.rb +1 -1
- data/lib/elasticsearch/rails/instrumentation.rb +1 -1
- data/lib/elasticsearch/rails/lograge.rb +1 -1
- data/lib/elasticsearch/rails/tasks/import.rb +1 -1
- data/lib/elasticsearch/rails/version.rb +2 -2
- data/lib/elasticsearch/rails.rb +1 -1
- data/lib/rails/templates/01-basic.rb +4 -4
- data/lib/rails/templates/02-pretty.rb +2 -2
- data/lib/rails/templates/03-expert.rb +9 -9
- data/lib/rails/templates/04-dsl.rb +4 -4
- data/lib/rails/templates/05-settings-files.rb +3 -3
- data/lib/rails/templates/index.html.dsl.erb +18 -0
- data/lib/rails/templates/index.html.erb +18 -0
- data/lib/rails/templates/indexer.rb +1 -1
- data/lib/rails/templates/search_controller_test.dsl.rb +1 -1
- data/lib/rails/templates/search_controller_test.rb +1 -1
- data/lib/rails/templates/searchable.dsl.rb +1 -1
- data/lib/rails/templates/searchable.rb +1 -1
- data/lib/rails/templates/seeds.rb +1 -1
- data/spec/instrumentation_spec.rb +1 -1
- data/spec/lograge_spec.rb +1 -1
- data/spec/spec_helper.rb +1 -1
- metadata +4 -18
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fde69c2ec154f7a98baad2cf8d80d1a9d13164dc8799b797c66764913146fc89
|
4
|
+
data.tar.gz: a807a316c88525182491fc9366d41644581edccfe6458df9c9fcb163082e05f0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c84a6de2ee5ae1cc6597ed11d95dc6979268d30297c3d51b5927794948d55dfc59352fb2db829ce40f59c40801bb969b2d72501cd530ea97981072360f83ac0c
|
7
|
+
data.tar.gz: '039d903aacf4c20ffa2111dec33d5e44ff7a413d3d834e5944fa861f7a9f5fbedae66c2be9b1eb42003860447b25f738c2914bfdbcba17120a8811462213185a'
|
data/Gemfile
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
data/README.md
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
# Elasticsearch::Rails
|
2
2
|
|
3
3
|
The `elasticsearch-rails` library is a companion for the
|
4
|
-
the [`elasticsearch-model`](https://github.com/elastic/elasticsearch-rails/tree/
|
4
|
+
the [`elasticsearch-model`](https://github.com/elastic/elasticsearch-rails/tree/main/elasticsearch-model)
|
5
5
|
library, providing features suitable for Ruby on Rails applications.
|
6
6
|
|
7
7
|
## Compatibility
|
8
8
|
|
9
9
|
This library is compatible with Ruby 1.9.3 and higher.
|
10
10
|
|
11
|
-
The library version numbers follow the Elasticsearch major versions, and the `
|
11
|
+
The library version numbers follow the Elasticsearch major versions, and the `main` branch
|
12
12
|
is compatible with the Elasticsearch `master` branch, therefore, with the next major version.
|
13
13
|
|
14
14
|
| Rubygem | | Elasticsearch |
|
@@ -18,7 +18,7 @@ is compatible with the Elasticsearch `master` branch, therefore, with the next m
|
|
18
18
|
| 5.x | → | 5.x |
|
19
19
|
| 6.x | → | 6.x |
|
20
20
|
| 7.x | → | 7.x |
|
21
|
-
|
|
21
|
+
| main | → | master |
|
22
22
|
|
23
23
|
## Installation
|
24
24
|
|
@@ -101,22 +101,22 @@ You should see the duration of the request to Elasticsearch as part of each log
|
|
101
101
|
You can generate a fully working example Ruby on Rails application, with an `Article` model and a search form,
|
102
102
|
to play with (it generates the application skeleton and leaves you with a _Git_ repository to explore the
|
103
103
|
steps and the code) with the
|
104
|
-
[`01-basic.rb`](https://github.com/elastic/elasticsearch-rails/blob/
|
104
|
+
[`01-basic.rb`](https://github.com/elastic/elasticsearch-rails/blob/main/elasticsearch-rails/lib/rails/templates/01-basic.rb) template:
|
105
105
|
|
106
106
|
```bash
|
107
|
-
rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/
|
107
|
+
rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/01-basic.rb
|
108
108
|
```
|
109
109
|
|
110
110
|
Run the same command again, in the same folder, with the
|
111
|
-
[`02-pretty`](https://github.com/elastic/elasticsearch-rails/blob/
|
111
|
+
[`02-pretty`](https://github.com/elastic/elasticsearch-rails/blob/main/elasticsearch-rails/lib/rails/templates/02-pretty.rb)
|
112
112
|
template to add features such as a custom `Article.search` method, result highlighting and
|
113
113
|
[_Bootstrap_](http://getbootstrap.com) integration:
|
114
114
|
|
115
115
|
```bash
|
116
|
-
rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/
|
116
|
+
rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/02-pretty.rb
|
117
117
|
```
|
118
118
|
|
119
|
-
Run the same command with the [`03-expert.rb`](https://github.com/elastic/elasticsearch-rails/blob/
|
119
|
+
Run the same command with the [`03-expert.rb`](https://github.com/elastic/elasticsearch-rails/blob/main/elasticsearch-rails/lib/rails/templates/03-expert.rb)
|
120
120
|
template to refactor the application into a more complex use case,
|
121
121
|
with couple of hundreds of The New York Times articles as the example content.
|
122
122
|
The template will extract the Elasticsearch integration into a `Searchable` "concern" module,
|
@@ -124,7 +124,7 @@ define complex mapping, custom serialization, implement faceted navigation and s
|
|
124
124
|
a complex query, and add a _Sidekiq_-based worker for updating the index in the background.
|
125
125
|
|
126
126
|
```bash
|
127
|
-
rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/
|
127
|
+
rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/03-expert.rb
|
128
128
|
```
|
129
129
|
|
130
130
|
## License
|
data/Rakefile
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -18,8 +18,8 @@
|
|
18
18
|
require "bundler/gem_tasks"
|
19
19
|
|
20
20
|
desc "Run unit tests"
|
21
|
-
task :
|
22
|
-
task :
|
21
|
+
task default: 'test:unit'
|
22
|
+
task test: 'test:unit'
|
23
23
|
|
24
24
|
# ----- Test tasks ------------------------------------------------------------
|
25
25
|
|
@@ -27,24 +27,23 @@ require 'rake/testtask'
|
|
27
27
|
require 'rspec/core/rake_task'
|
28
28
|
|
29
29
|
namespace :test do
|
30
|
-
|
31
30
|
RSpec::Core::RakeTask.new(:spec)
|
32
31
|
|
33
32
|
Rake::TestTask.new(:all) do |test|
|
34
33
|
test.verbose = false
|
35
34
|
test.warning = false
|
36
|
-
test.deps = [
|
35
|
+
test.deps = [:spec] unless defined?(JRUBY_VERSION)
|
37
36
|
end
|
38
37
|
end
|
39
38
|
|
40
39
|
namespace :bundle do
|
41
40
|
desc 'Install gem dependencies'
|
42
41
|
task :install do
|
43
|
-
puts '-'*80
|
44
|
-
Bundler.
|
42
|
+
puts '-' * 80
|
43
|
+
Bundler.with_unbundled_env do
|
45
44
|
sh 'bundle install'
|
46
45
|
end
|
47
|
-
puts '-'*80
|
46
|
+
puts '-' * 80
|
48
47
|
end
|
49
48
|
end
|
50
49
|
|
data/elasticsearch-rails.gemspec
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
|
|
31
31
|
s.license = 'Apache 2'
|
32
32
|
s.metadata = {
|
33
33
|
'homepage_uri' => 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/ruby_on_rails.html',
|
34
|
-
'changelog_uri' => 'https://github.com/elastic/elasticsearch-rails/blob/
|
34
|
+
'changelog_uri' => 'https://github.com/elastic/elasticsearch-rails/blob/main/CHANGELOG.md',
|
35
35
|
'source_code_uri' => 'https://github.com/elastic/elasticsearch-rails/',
|
36
36
|
'bug_tracker_uri' => 'https://github.com/elastic/elasticsearch-rails/issues'
|
37
37
|
}
|
@@ -48,7 +48,6 @@ Gem::Specification.new do |s|
|
|
48
48
|
|
49
49
|
s.add_development_dependency 'bundler'
|
50
50
|
s.add_development_dependency 'cane'
|
51
|
-
s.add_development_dependency 'elasticsearch-extensions'
|
52
51
|
s.add_development_dependency 'lograge'
|
53
52
|
s.add_development_dependency 'minitest'
|
54
53
|
s.add_development_dependency 'mocha'
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -17,6 +17,6 @@
|
|
17
17
|
|
18
18
|
module Elasticsearch
|
19
19
|
module Rails
|
20
|
-
VERSION = "7.
|
20
|
+
VERSION = "7.2.1"
|
21
21
|
end
|
22
22
|
end
|
data/lib/elasticsearch/rails.rb
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -32,7 +32,7 @@
|
|
32
32
|
# Usage:
|
33
33
|
# ------
|
34
34
|
#
|
35
|
-
# $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/
|
35
|
+
# $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/01-basic.rb
|
36
36
|
#
|
37
37
|
# =====================================================================================================
|
38
38
|
|
@@ -112,7 +112,7 @@ This application is an example of integrating the {Elasticsearch}[https://www.el
|
|
112
112
|
search engine with the {Ruby On Rails}[http://rubyonrails.org] web framework.
|
113
113
|
|
114
114
|
It has been generated by application templates available at
|
115
|
-
https://github.com/elasticsearch/elasticsearch-rails/tree/
|
115
|
+
https://github.com/elasticsearch/elasticsearch-rails/tree/main/elasticsearch-rails/lib/rails/templates.
|
116
116
|
|
117
117
|
## [1] Basic
|
118
118
|
|
@@ -156,7 +156,7 @@ puts
|
|
156
156
|
say_status "Rubygems", "Adding Elasticsearch libraries into Gemfile...\n", :yellow
|
157
157
|
puts '-'*80, ''; sleep 0.75
|
158
158
|
|
159
|
-
gem 'elasticsearch'
|
159
|
+
gem 'elasticsearch'
|
160
160
|
gem 'elasticsearch-model', git: 'https://github.com/elasticsearch/elasticsearch-rails.git'
|
161
161
|
gem 'elasticsearch-rails', git: 'https://github.com/elasticsearch/elasticsearch-rails.git'
|
162
162
|
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -15,7 +15,7 @@
|
|
15
15
|
# specific language governing permissions and limitations
|
16
16
|
# under the License.
|
17
17
|
|
18
|
-
# $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/
|
18
|
+
# $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/02-pretty.rb
|
19
19
|
|
20
20
|
unless File.read('README.md').include? '## [1] Basic'
|
21
21
|
say_status "ERROR", "You have to run the 01-basic.rb template first.", :red
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -15,7 +15,7 @@
|
|
15
15
|
# specific language governing permissions and limitations
|
16
16
|
# under the License.
|
17
17
|
|
18
|
-
# $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/
|
18
|
+
# $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/03-expert.rb
|
19
19
|
|
20
20
|
unless File.read('README.md').include? '## [2] Pretty'
|
21
21
|
say_status "ERROR", "You have to run the 01-basic.rb and 02-pretty.rb templates first.", :red
|
@@ -181,7 +181,7 @@ CODE
|
|
181
181
|
gsub_file "test/models/article_test.rb", %r{assert_equal 'foo', definition\[:query\]\[:multi_match\]\[:query\]}, "assert_equal 'foo', definition.to_hash[:query][:bool][:should][0][:multi_match][:query]"
|
182
182
|
|
183
183
|
# copy_file File.expand_path('../searchable.rb', __FILE__), 'app/models/concerns/searchable.rb'
|
184
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
184
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/searchable.rb', 'app/models/concerns/searchable.rb'
|
185
185
|
|
186
186
|
insert_into_file "app/models/article.rb", after: "ActiveRecord::Base" do
|
187
187
|
<<-CODE
|
@@ -209,7 +209,7 @@ gem "sidekiq"
|
|
209
209
|
run "bundle install"
|
210
210
|
|
211
211
|
# copy_file File.expand_path('../indexer.rb', __FILE__), 'app/workers/indexer.rb'
|
212
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
212
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/indexer.rb', 'app/workers/indexer.rb'
|
213
213
|
|
214
214
|
insert_into_file "test/test_helper.rb",
|
215
215
|
"require 'sidekiq/testing'\n\n",
|
@@ -244,16 +244,16 @@ create_file 'app/controllers/search_controller.rb' do
|
|
244
244
|
end
|
245
245
|
|
246
246
|
# copy_file File.expand_path('../search_controller_test.rb', __FILE__), 'test/controllers/search_controller_test.rb'
|
247
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
247
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/search_controller_test.rb', 'test/controllers/search_controller_test.rb'
|
248
248
|
|
249
249
|
route "get '/search', to: 'search#index', as: 'search'"
|
250
250
|
gsub_file 'config/routes.rb', %r{root to: 'articles#index'$}, "root to: 'search#index'"
|
251
251
|
|
252
252
|
# copy_file File.expand_path('../index.html.erb', __FILE__), 'app/views/search/index.html.erb'
|
253
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
253
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/index.html.erb', 'app/views/search/index.html.erb'
|
254
254
|
|
255
255
|
# copy_file File.expand_path('../search.css', __FILE__), 'app/assets/stylesheets/search.css'
|
256
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
256
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/search.css', 'app/assets/stylesheets/search.css'
|
257
257
|
|
258
258
|
git add: "app/controllers/ test/controllers/ config/routes.rb"
|
259
259
|
git add: "app/views/search/ app/assets/stylesheets/search.css"
|
@@ -315,11 +315,11 @@ say_status "Database", "Re-creating the database with data and importing into E
|
|
315
315
|
puts '-'*80, ''; sleep 0.25
|
316
316
|
|
317
317
|
# copy_file File.expand_path('../articles.yml.gz', __FILE__), 'db/articles.yml.gz'
|
318
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
318
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/articles.yml.gz', 'db/articles.yml.gz'
|
319
319
|
|
320
320
|
remove_file 'db/seeds.rb'
|
321
321
|
# copy_file File.expand_path('../seeds.rb', __FILE__), 'db/seeds.rb'
|
322
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
322
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/seeds.rb', 'db/seeds.rb'
|
323
323
|
|
324
324
|
rake "db:reset"
|
325
325
|
rake "environment elasticsearch:import:model CLASS='Article' BATCH=100 FORCE=y"
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -15,7 +15,7 @@
|
|
15
15
|
# specific language governing permissions and limitations
|
16
16
|
# under the License.
|
17
17
|
|
18
|
-
# $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
18
|
+
# $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/04-dsl.rb
|
19
19
|
|
20
20
|
unless File.read('README.md').include? '## [3] Expert'
|
21
21
|
say_status "ERROR", "You have to run the 01-basic.rb, 02-pretty.rb and 03-expert.rb templates first.", :red
|
@@ -56,10 +56,10 @@ run "bundle install"
|
|
56
56
|
# ----- Change the search definition implementation and associated views and tests ----------------
|
57
57
|
|
58
58
|
# copy_file File.expand_path('../searchable.dsl.rb', __FILE__), 'app/models/concerns/searchable.rb', force: true
|
59
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
59
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/searchable.dsl.rb', 'app/models/concerns/searchable.rb', force: true
|
60
60
|
|
61
61
|
# copy_file File.expand_path('../index.html.dsl.erb', __FILE__), 'app/views/search/index.html.erb', force: true
|
62
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
62
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/index.html.dsl.erb', 'app/views/search/index.html.erb', force: true
|
63
63
|
|
64
64
|
gsub_file "test/controllers/search_controller_test.rb", %r{test "should return facets" do.*?end}m, <<-CODE
|
65
65
|
test "should return aggregations" do
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -15,7 +15,7 @@
|
|
15
15
|
# specific language governing permissions and limitations
|
16
16
|
# under the License.
|
17
17
|
|
18
|
-
# $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
18
|
+
# $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/05-settings-files.rb
|
19
19
|
|
20
20
|
# (See: 01-basic.rb, 02-pretty.rb, 03-expert.rb, 04-dsl.rb)
|
21
21
|
|
@@ -43,7 +43,7 @@ git commit: "-m 'Setup the Searchable module to load settings from file'"
|
|
43
43
|
# ----- Copy the articles_settings.json file -------------------------------------------------------
|
44
44
|
|
45
45
|
# copy_file File.expand_path('../articles_settings.json', __FILE__), 'config/elasticsearch/articles_settings.json'
|
46
|
-
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/
|
46
|
+
get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/articles_settings.json',
|
47
47
|
'config/elasticsearch/articles_settings.json', force: true
|
48
48
|
|
49
49
|
git add: "config/elasticsearch/articles_settings.json"
|
@@ -1,3 +1,21 @@
|
|
1
|
+
<%#
|
2
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
3
|
+
# license agreements. See the NOTICE file distributed with
|
4
|
+
# this work for additional information regarding copyright
|
5
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
6
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
7
|
+
# not use this file except in compliance with the License.
|
8
|
+
# You may obtain a copy of the License at
|
9
|
+
#
|
10
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
#
|
12
|
+
# Unless required by applicable law or agreed to in writing,
|
13
|
+
# software distributed under the License is distributed on an
|
14
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
15
|
+
# KIND, either express or implied. See the License for the
|
16
|
+
# specific language governing permissions and limitations
|
17
|
+
# under the License.
|
18
|
+
%>
|
1
19
|
<div class="col-md-12">
|
2
20
|
<h1 class="text-right"><%= link_to 'Search New York Times articles', root_path %></h1>
|
3
21
|
|
@@ -1,3 +1,21 @@
|
|
1
|
+
<%#
|
2
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
3
|
+
# license agreements. See the NOTICE file distributed with
|
4
|
+
# this work for additional information regarding copyright
|
5
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
6
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
7
|
+
# not use this file except in compliance with the License.
|
8
|
+
# You may obtain a copy of the License at
|
9
|
+
#
|
10
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
#
|
12
|
+
# Unless required by applicable law or agreed to in writing,
|
13
|
+
# software distributed under the License is distributed on an
|
14
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
15
|
+
# KIND, either express or implied. See the License for the
|
16
|
+
# specific language governing permissions and limitations
|
17
|
+
# under the License.
|
18
|
+
%>
|
1
19
|
<div class="col-md-12">
|
2
20
|
<h1 class="text-right"><%= link_to 'Search New York Times articles', root_path %></h1>
|
3
21
|
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
data/spec/lograge_spec.rb
CHANGED
@@ -24,7 +24,7 @@
|
|
24
24
|
# not use this file except in compliance with the License.
|
25
25
|
# You may obtain a copy of the License at
|
26
26
|
#
|
27
|
-
#
|
27
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
28
28
|
#
|
29
29
|
# Unless required by applicable law or agreed to in writing,
|
30
30
|
# software distributed under the License is distributed on an
|
data/spec/spec_helper.rb
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# not use this file except in compliance with the License.
|
7
7
|
# You may obtain a copy of the License at
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
#
|
11
11
|
# Unless required by applicable law or agreed to in writing,
|
12
12
|
# software distributed under the License is distributed on an
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: elasticsearch-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.
|
4
|
+
version: 7.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Karel Minarik
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-02-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -38,20 +38,6 @@ dependencies:
|
|
38
38
|
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '0'
|
41
|
-
- !ruby/object:Gem::Dependency
|
42
|
-
name: elasticsearch-extensions
|
43
|
-
requirement: !ruby/object:Gem::Requirement
|
44
|
-
requirements:
|
45
|
-
- - ">="
|
46
|
-
- !ruby/object:Gem::Version
|
47
|
-
version: '0'
|
48
|
-
type: :development
|
49
|
-
prerelease: false
|
50
|
-
version_requirements: !ruby/object:Gem::Requirement
|
51
|
-
requirements:
|
52
|
-
- - ">="
|
53
|
-
- !ruby/object:Gem::Version
|
54
|
-
version: '0'
|
55
41
|
- !ruby/object:Gem::Dependency
|
56
42
|
name: lograge
|
57
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -297,7 +283,7 @@ licenses:
|
|
297
283
|
- Apache 2
|
298
284
|
metadata:
|
299
285
|
homepage_uri: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/ruby_on_rails.html
|
300
|
-
changelog_uri: https://github.com/elastic/elasticsearch-rails/blob/
|
286
|
+
changelog_uri: https://github.com/elastic/elasticsearch-rails/blob/main/CHANGELOG.md
|
301
287
|
source_code_uri: https://github.com/elastic/elasticsearch-rails/
|
302
288
|
bug_tracker_uri: https://github.com/elastic/elasticsearch-rails/issues
|
303
289
|
post_install_message:
|
@@ -316,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
316
302
|
- !ruby/object:Gem::Version
|
317
303
|
version: '0'
|
318
304
|
requirements: []
|
319
|
-
rubygems_version: 3.
|
305
|
+
rubygems_version: 3.3.3
|
320
306
|
signing_key:
|
321
307
|
specification_version: 4
|
322
308
|
summary: Ruby on Rails integrations for Elasticsearch.
|