elasticsearch-rails 7.0.0.pre → 7.1.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea34d9f8fd6e257ef34067c2f36061877bfe4e955093f18aa8c9e9f3f36db219
-  data.tar.gz: 4ee8dd8c41886d6246963ae232939297c8998bec7e5f9ef0de1d55faedcd0788
+  metadata.gz: d890cc946c2d2b586b12ebaaa9b9f94872c2f71c5b108ca8635af0dd16010e80
+  data.tar.gz: 2d9b6f65775e229f29486ba6b6f9a440d473c080f33064af8e15a751294429d1
 SHA512:
-  metadata.gz: 99a01745eb65e8c26676bc6102ac20f4d92bf934320755e002b63a43489cb7c2d2e091d78f2a1cb8fc5a31afe9c7040cd73501fe03e3994eed0dd5158950014f
-  data.tar.gz: 53fdca88b893ba301da2402ea8af38a4da36000888fecd681d737478781758bbdfc558e30dba6dbdd42f52929314e2df1939f18a7e8543f047ed8dd4a3ebf240
+  metadata.gz: 14df18f4f29918c7c8dcd072300a25f5a687f84dbfc72ee990ce8b02f7e1114b4176e25eddef1d269a9464df8a310f298168f9c55f6594bdd8ae96336f074c9f
+  data.tar.gz: 1fbfb94a731e643cf38ae289374fcc448894ff662fa8c30f1cee5e1a65c34d1ebcadf8ed5f2acc7021b81b339a642bf144d929dbfa7bd1c54e4a00ab78af7110

data/Gemfile

@@ -20,12 +20,16 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-rails.gemspec
 gemspec
 
-gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => false
-gem 'elasticsearch-persistence', :path => File.expand_path("../../elasticsearch-persistence", __FILE__), :require => false
+gem 'elasticsearch-model',
+    path: File.expand_path('../elasticsearch-model', __dir__),
+    require: false
 
+gem 'elasticsearch-persistence',
+    path: File.expand_path('../elasticsearch-persistence', __dir__),
+    require: false
 
 group :development, :testing do
-  gem 'rspec'
   gem 'pry-nav'
+  gem 'rspec'
   gem 'sqlite3' unless defined?(JRUBY_VERSION)
 end

data/README.md

@@ -16,6 +16,8 @@ is compatible with the Elasticsearch `master` branch, therefore, with the next m
 | 0.1           | → | 1.x           |
 | 2.x           | → | 2.x           |
 | 5.x           | → | 5.x           |
+| 6.x           | → | 6.x           |
+| 7.x           | → | 7.x           |
 | master        | → | master        |
 
 ## Installation
@@ -97,8 +99,8 @@ You should see the duration of the request to Elasticsearch as part of each log
 ### Rails Application Templates
 
 You can generate a fully working example Ruby on Rails application, with an `Article` model and a search form,
-to play with (it even downloads _Elasticsearch_ itself, generates the application skeleton and leaves you with
-a _Git_ repository to explore the steps and the code) with the
+to play with (it generates the application skeleton and leaves you with a _Git_ repository to explore the
+steps and the code) with the
 [`01-basic.rb`](https://github.com/elastic/elasticsearch-rails/blob/master/elasticsearch-rails/lib/rails/templates/01-basic.rb) template:
 
 ```bash
@@ -129,16 +131,19 @@ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elast
 
 This software is licensed under the Apache 2 license, quoted below.
 
-    Copyright (c) 2014 Elasticsearch <http://www.elasticsearch.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
+    Licensed to Elasticsearch B.V. under one or more contributor
+    license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright
+    ownership. Elasticsearch B.V. licenses this file to you under
+    the Apache License, Version 2.0 (the "License"); you may
+    not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+    
+    	http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.

data/elasticsearch-rails.gemspec

@@ -21,45 +21,48 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'elasticsearch/rails/version'
 
 Gem::Specification.new do |s|
-  s.name          = "elasticsearch-rails"
+  s.name          = 'elasticsearch-rails'
   s.version       = Elasticsearch::Rails::VERSION
-  s.authors       = ["Karel Minarik"]
-  s.email         = ["karel.minarik@elasticsearch.org"]
-  s.description   = "Ruby on Rails integrations for Elasticsearch."
-  s.summary       = "Ruby on Rails integrations for Elasticsearch."
-  s.homepage      = "https://github.com/elasticsearch/elasticsearch-rails/"
-  s.license       = "Apache 2"
+  s.authors       = ['Karel Minarik']
+  s.email         = ['karel.minarik@elasticsearch.org']
+  s.description   = 'Ruby on Rails integrations for Elasticsearch.'
+  s.summary       = 'Ruby on Rails integrations for Elasticsearch.'
+  s.homepage      = 'https://github.com/elasticsearch/elasticsearch-rails/'
+  s.license       = 'Apache 2'
+  s.metadata = {
+    'homepage_uri' => 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/ruby_on_rails.html',
+    'changelog_uri' => 'https://github.com/elastic/elasticsearch-rails/blob/master/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/elastic/elasticsearch-rails/',
+    'bug_tracker_uri' => 'https://github.com/elastic/elasticsearch-rails/issues'
+  }
 
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
-  s.rdoc_options      = [ "--charset=UTF-8" ]
+  s.extra_rdoc_files  = ['README.md', 'LICENSE.txt']
+  s.rdoc_options      = ['--charset=UTF-8']
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = '>= 2.4'
 
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rake", "~> 11.1"
-
-  s.add_development_dependency "elasticsearch-extensions"
-
-  s.add_development_dependency "rails",  ">= 3.1"
-
-  s.add_development_dependency "lograge"
-
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "shoulda-context"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "turn"
-  s.add_development_dependency "yard"
-  s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
-  s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
-  s.add_development_dependency "pry"
-
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "cane"
-  s.add_development_dependency "require-prof"
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'cane'
+  s.add_development_dependency 'elasticsearch-extensions'
+  s.add_development_dependency 'lograge'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rails', '> 3.1'
+  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'require-prof'
+  s.add_development_dependency 'shoulda-context'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'turn'
+  s.add_development_dependency 'yard'
+  unless defined?(JRUBY_VERSION)
+    s.add_development_dependency 'oj'
+    s.add_development_dependency 'ruby-prof'
+  end
 end

data/lib/elasticsearch/rails/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Rails
-    VERSION = "7.0.0.pre"
+    VERSION = "7.1.2.pre"
   end
 end

data/lib/rails/templates/01-basic.rb

@@ -44,7 +44,7 @@ $elasticsearch_url = ENV.fetch('ELASTICSEARCH_URL', 'http://localhost:9200')
 
 # ----- Check for Elasticsearch -------------------------------------------------------------------
 
-required_elasticsearch_version = '6'
+required_elasticsearch_version = '7'
 
 docker_command =<<-CMD.gsub(/\s{1,}/, ' ').strip
   docker run \
@@ -54,7 +54,7 @@ docker_command =<<-CMD.gsub(/\s{1,}/, ' ').strip
     --env "cluster.name=elasticsearch-rails" \
     --env "cluster.routing.allocation.disk.threshold_enabled=false" \
     --rm \
-    docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.0
+    docker.elastic.co/elasticsearch/elasticsearch-oss:7.6.0
 CMD
 
 begin
@@ -108,7 +108,7 @@ remove_file 'README.md'
 create_file 'README.md', <<-README
 # Ruby on Rails and Elasticsearch: Example application
 
-This application is an example of integrating the {Elasticsearch}[http://www.elasticsearch.org]
+This application is an example of integrating the {Elasticsearch}[https://www.elastic.co]
 search engine with the {Ruby On Rails}[http://rubyonrails.org] web framework.
 
 It has been generated by application templates available at
@@ -338,6 +338,10 @@ puts        '-'*80, ''
 git tag: "basic"
 git log: "--reverse --oneline"
 
+# ----- Install Webpacker -------------------------------------------------------------------------
+
+run 'rails webpacker:install'
+
 # ----- Start the application ---------------------------------------------------------------------
 
 unless ENV['RAILS_NO_SERVER_START']

data/lib/rails/templates/03-expert.rb

@@ -34,7 +34,8 @@ begin
 rescue Redis::CannotConnectError
   puts
   say_status  "ERROR", "Redis not available", :red
-  say_status  "", "This template uses an asynchronous indexer via Sidekiq, and requires a running Redis server."
+  say_status  "", "This template uses an asynchronous indexer via Sidekiq, and requires a running Redis server.
+  Make sure you have installed Redis (brew install redis) and that you have launched the server"
   exit(1)
 end
 

data/spec/lograge_spec.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 # Licensed to Elasticsearch B.V. under one or more contributor
 # license agreements. See the NOTICE file distributed with

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails
 version: !ruby/object:Gem::Version
-  version: 7.0.0.pre
+  version: 7.1.2.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -53,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: lograge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: lograge
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,35 +109,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: require-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: require-prof
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -295,7 +295,11 @@ files:
 homepage: https://github.com/elasticsearch/elasticsearch-rails/
 licenses:
 - Apache 2
-metadata: {}
+metadata:
+  homepage_uri: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/ruby_on_rails.html
+  changelog_uri: https://github.com/elastic/elasticsearch-rails/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/elastic/elasticsearch-rails/
+  bug_tracker_uri: https://github.com/elastic/elasticsearch-rails/issues
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -305,14 +309,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails integrations for Elasticsearch.