elasticsearch-rails 7.2.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 041a9dec4e1503685e7ad4ec433c942c6d82880223362836f771993a6da414b7
-  data.tar.gz: c55ca098f388ebce76c36b8126215b57b4b3b0bdeebd524a89d04f49cb08674a
+  metadata.gz: feb6cc50443134d9f6bc424aee2e46edd208f111d98b66e0bcba2c13eed8905f
+  data.tar.gz: bc01ddaec5725cc35431e89318eef5d021c8eadb12fe6ae047419adaec82e9d2
 SHA512:
-  metadata.gz: c59f6fe732e9466e30190b08370f9ce90682b3738d72a118b7240995a1458d6cfb6d768f7bfd077b55dbb74244ed531a8b1ba528b7805541d12f82e2429d397e
-  data.tar.gz: 378d3e5a1558925bc5542e1d6a20a526966c16878766738f6b172e8a21e84ca66458c385f15e851c91c0a17a7735ba08fb6ad44318a1e086bbd8f09683abb1fd
+  metadata.gz: daba8716f145f0b4ffbb953832eff315c3c09821a1439923fbc9ed8ac7d3e3bd2c6e9dc0a3e37f97b355d2bac828329ef0ee3b23786977d9c96117faed92ab87
+  data.tar.gz: d7956874bf60225e7d6d2d520951b446feb32b1b184836e86b8a04592c4d860cedbfd604be143a57d1afaf8be26118ae91dc4c6abf091a409a6556706ffa6a98

data/Gemfile

@@ -31,5 +31,8 @@ gem 'elasticsearch-persistence',
 group :development, :testing do
   gem 'pry-nav'
   gem 'rspec'
-  gem 'sqlite3' unless defined?(JRUBY_VERSION)
+  unless defined?(JRUBY_VERSION)
+    gem 'sqlite3', '~> 1.4'
+    gem 'debug'
+  end
 end

data/README.md

@@ -1,24 +1,24 @@
 # Elasticsearch::Rails
 
 The `elasticsearch-rails` library is a companion for the
-the [`elasticsearch-model`](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model)
+the [`elasticsearch-model`](https://github.com/elastic/elasticsearch-rails/tree/main/elasticsearch-model)
 library, providing features suitable for Ruby on Rails applications.
 
 ## Compatibility
 
-This library is compatible with Ruby 1.9.3 and higher.
+This library is compatible with Ruby 3.1 and higher.
 
-The library version numbers follow the Elasticsearch major versions, and the `master` branch
-is compatible with the Elasticsearch `master` branch, therefore, with the next major version.
+The version numbers follow the Elasticsearch major versions. Currently the `main` branch is compatible with version `8.x` of the Elasticsearch stack.
 
-| Rubygem       |   | Elasticsearch |
-|:-------------:|:-:| :-----------: |
-| 0.1           | → | 1.x           |
-| 2.x           | → | 2.x           |
-| 5.x           | → | 5.x           |
-| 6.x           | → | 6.x           |
-| 7.x           | → | 7.x           |
-| master        | → | master        |
+| Rubygem |   | Elasticsearch |
+|:-------:|:-:|:-------------:|
+| 0.1     | → | 1.x           |
+| 2.x     | → | 2.x           |
+| 5.x     | → | 5.x           |
+| 6.x     | → | 6.x           |
+| 7.x     | → | 7.x           |
+| 8.x     | → | 8.x           |
+| main    | → | 8.x           |
 
 ## Installation
 
@@ -101,22 +101,22 @@ You should see the duration of the request to Elasticsearch as part of each log
 You can generate a fully working example Ruby on Rails application, with an `Article` model and a search form,
 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:
+[`01-basic.rb`](https://github.com/elastic/elasticsearch-rails/blob/main/elasticsearch-rails/lib/rails/templates/01-basic.rb) template:
 
 ```bash
-rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/01-basic.rb
+rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/01-basic.rb
 ```
 
 Run the same command again, in the same folder, with the
-[`02-pretty`](https://github.com/elastic/elasticsearch-rails/blob/master/elasticsearch-rails/lib/rails/templates/02-pretty.rb)
+[`02-pretty`](https://github.com/elastic/elasticsearch-rails/blob/main/elasticsearch-rails/lib/rails/templates/02-pretty.rb)
 template to add features such as a custom `Article.search` method, result highlighting and
 [_Bootstrap_](http://getbootstrap.com) integration:
 
 ```bash
-rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/02-pretty.rb
+rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/02-pretty.rb
 ```
 
-Run the same command with the [`03-expert.rb`](https://github.com/elastic/elasticsearch-rails/blob/master/elasticsearch-rails/lib/rails/templates/03-expert.rb)
+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)
 template to refactor the application into a more complex use case,
 with couple of hundreds of The New York Times articles as the example content.
 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
 a complex query, and add a _Sidekiq_-based worker for updating the index in the background.
 
 ```bash
-rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/03-expert.rb
+rails new searchapp --skip --skip-bundle --template https://raw.github.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/03-expert.rb
 ```
 
 ## License
@@ -138,9 +138,9 @@ This software is licensed under the Apache 2 license, quoted below.
     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

data/Rakefile

@@ -34,6 +34,8 @@ namespace :test do
     test.warning = false
     test.deps = [:spec] unless defined?(JRUBY_VERSION)
   end
+
+  task unit: :spec
 end
 
 namespace :bundle do

data/elasticsearch-rails.gemspec

@@ -23,15 +23,15 @@ require 'elasticsearch/rails/version'
 Gem::Specification.new do |s|
   s.name          = 'elasticsearch-rails'
   s.version       = Elasticsearch::Rails::VERSION
-  s.authors       = ['Karel Minarik']
-  s.email         = ['karel.minarik@elasticsearch.org']
+  s.authors       = ['Elastic Client Library Maintainers']
+  s.email         = ['client-libs@elastic.co']
   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',
+    'changelog_uri' => 'https://github.com/elastic/elasticsearch-rails/blob/main/CHANGELOG.md',
     'source_code_uri' => 'https://github.com/elastic/elasticsearch-rails/',
     'bug_tracker_uri' => 'https://github.com/elastic/elasticsearch-rails/issues'
   }
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files  = ['README.md', 'LICENSE.txt']
   s.rdoc_options      = ['--charset=UTF-8']
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 3'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'cane'

data/lib/elasticsearch/rails/instrumentation/log_subscriber.rb

@@ -46,8 +46,19 @@ module Elasticsearch
           payload = event.payload
           name    = "#{payload[:klass]} #{payload[:name]} (#{event.duration.round(1)}ms)"
           search  = payload[:search].inspect.gsub(/:(\w+)=>/, '\1: ')
+          debug %Q|  #{color(name, GREEN, color_option(true))} #{colorize_logging ? "\e[2m#{search}\e[0m" : search}|
+        end
+
+        private
+
+        def color_option(bold_value)
+          new_color_syntax? ? { bold: bold_value } : bold_value
+        end
+
+        def new_color_syntax?
+          return @new_color_syntax if defined?(@new_color_syntax)
 
-          debug %Q|  #{color(name, GREEN, true)} #{colorize_logging ? "\e[2m#{search}\e[0m" : search}|
+          @new_color_syntax = ::Rails.respond_to?(:gem_version) && ::Rails.gem_version >= '7.1'
         end
       end
 

data/lib/elasticsearch/rails/tasks/import.rb

@@ -57,7 +57,7 @@ namespace :elasticsearch do
         $ rake environment elasticsearch:import:model CLASS='Article' SCOPE='published'
     DESC
     desc import_model_desc
-    task :model do
+    task model: :environment do
       if ENV['CLASS'].to_s == ''
         puts '='*90, 'USAGE', '='*90, import_model_desc, ""
         exit(1)
@@ -97,7 +97,7 @@ namespace :elasticsearch do
 
         $ rake environment elasticsearch:import:all DIR=app/models
     DESC
-    task :all do
+    task all: :environment do
       dir    = ENV['DIR'].to_s != '' ? ENV['DIR'] : Rails.root.join("app/models")
 
       puts "[IMPORT] Loading models from: #{dir}"

data/lib/elasticsearch/rails/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Rails
-    VERSION = "7.2.0"
+    VERSION = '8.0.0'.freeze
   end
 end

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

@@ -32,7 +32,7 @@
 # Usage:
 # ------
 #
-#     $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/01-basic.rb
+#     $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/01-basic.rb
 #
 # =====================================================================================================
 
@@ -112,7 +112,7 @@ This application is an example of integrating the {Elasticsearch}[https://www.el
 search engine with the {Ruby On Rails}[http://rubyonrails.org] web framework.
 
 It has been generated by application templates available at
-https://github.com/elasticsearch/elasticsearch-rails/tree/master/elasticsearch-rails/lib/rails/templates.
+https://github.com/elasticsearch/elasticsearch-rails/tree/main/elasticsearch-rails/lib/rails/templates.
 
 ## [1] Basic
 
@@ -157,8 +157,8 @@ say_status  "Rubygems", "Adding Elasticsearch libraries into Gemfile...\n", :yel
 puts        '-'*80, ''; sleep 0.75
 
 gem 'elasticsearch'
-gem 'elasticsearch-model', git: 'https://github.com/elasticsearch/elasticsearch-rails.git'
-gem 'elasticsearch-rails', git: 'https://github.com/elasticsearch/elasticsearch-rails.git'
+gem 'elasticsearch-model', git: 'https://github.com/elasticsearch/elasticsearch-rails.git', branch: 'main'
+gem 'elasticsearch-rails', git: 'https://github.com/elasticsearch/elasticsearch-rails.git', branch: 'main'
 
 
 git add:    "Gemfile*"

data/lib/rails/templates/02-pretty.rb

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/02-pretty.rb
+# $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/02-pretty.rb
 
 unless File.read('README.md').include? '## [1] Basic'
   say_status  "ERROR", "You have to run the 01-basic.rb template first.", :red

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

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-#     $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/03-expert.rb
+#     $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/03-expert.rb
 
 unless File.read('README.md').include? '## [2] Pretty'
   say_status  "ERROR", "You have to run the 01-basic.rb and 02-pretty.rb templates first.", :red
@@ -181,7 +181,7 @@ CODE
 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]"
 
 # copy_file File.expand_path('../searchable.rb', __FILE__), 'app/models/concerns/searchable.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/searchable.rb', 'app/models/concerns/searchable.rb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/searchable.rb', 'app/models/concerns/searchable.rb'
 
 insert_into_file "app/models/article.rb", after: "ActiveRecord::Base" do
   <<-CODE
@@ -209,7 +209,7 @@ gem "sidekiq"
 run "bundle install"
 
 # copy_file File.expand_path('../indexer.rb', __FILE__), 'app/workers/indexer.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/indexer.rb', 'app/workers/indexer.rb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/indexer.rb', 'app/workers/indexer.rb'
 
 insert_into_file "test/test_helper.rb",
                  "require 'sidekiq/testing'\n\n",
@@ -244,16 +244,16 @@ create_file 'app/controllers/search_controller.rb' do
 end
 
 # copy_file File.expand_path('../search_controller_test.rb', __FILE__), 'test/controllers/search_controller_test.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search_controller_test.rb', 'test/controllers/search_controller_test.rb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/search_controller_test.rb', 'test/controllers/search_controller_test.rb'
 
 route "get '/search', to: 'search#index', as: 'search'"
 gsub_file 'config/routes.rb', %r{root to: 'articles#index'$}, "root to: 'search#index'"
 
 # copy_file File.expand_path('../index.html.erb', __FILE__), 'app/views/search/index.html.erb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/index.html.erb', 'app/views/search/index.html.erb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/index.html.erb', 'app/views/search/index.html.erb'
 
 # copy_file File.expand_path('../search.css', __FILE__), 'app/assets/stylesheets/search.css'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search.css', 'app/assets/stylesheets/search.css'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/search.css', 'app/assets/stylesheets/search.css'
 
 git add:    "app/controllers/ test/controllers/ config/routes.rb"
 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
 puts        '-'*80, ''; sleep 0.25
 
 # copy_file File.expand_path('../articles.yml.gz', __FILE__), 'db/articles.yml.gz'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/articles.yml.gz', 'db/articles.yml.gz'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/articles.yml.gz', 'db/articles.yml.gz'
 
 remove_file 'db/seeds.rb'
 # copy_file File.expand_path('../seeds.rb', __FILE__), 'db/seeds.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/seeds.rb', 'db/seeds.rb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/seeds.rb', 'db/seeds.rb'
 
 rake "db:reset"
 rake "environment elasticsearch:import:model CLASS='Article' BATCH=100 FORCE=y"

data/lib/rails/templates/04-dsl.rb

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-#     $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/04-dsl.rb
+#     $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/04-dsl.rb
 
 unless File.read('README.md').include? '## [3] Expert'
   say_status  "ERROR", "You have to run the 01-basic.rb, 02-pretty.rb and 03-expert.rb templates first.", :red
@@ -27,7 +27,7 @@ append_to_file 'README.md', <<-README
 ## [4] DSL
 
 The `dsl` template refactors the search definition in SearchController#index
-to use the [`elasticsearch-dsl`](https://github.com/elastic/elasticsearch-ruby/tree/dsl/elasticsearch-dsl)
+to use the [`elasticsearch-dsl`](https://github.com/elastic/elasticsearch-dsl-ruby)
 Rubygem for better expresivity and readability of the code.
 
 README
@@ -44,7 +44,7 @@ puts
 say_status  "Rubygems", "Adding Rubygems into Gemfile...\n", :yellow
 puts        '-'*80, ''; sleep 0.25
 
-gem "elasticsearch-dsl", git: "git://github.com/elastic/elasticsearch-ruby.git"
+gem "elasticsearch-dsl", git: "git://github.com/elastic/elasticsearch-dsl-ruby.git"
 
 git add:    "Gemfile*"
 git commit: "-m 'Added the `elasticsearch-dsl` gem'"
@@ -56,10 +56,10 @@ run "bundle install"
 # ----- Change the search definition implementation and associated views and tests ----------------
 
 # copy_file File.expand_path('../searchable.dsl.rb', __FILE__), 'app/models/concerns/searchable.rb', force: true
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/searchable.dsl.rb', 'app/models/concerns/searchable.rb', force: true
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/searchable.dsl.rb', 'app/models/concerns/searchable.rb', force: true
 
 # copy_file File.expand_path('../index.html.dsl.erb', __FILE__), 'app/views/search/index.html.erb', force: true
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/index.html.dsl.erb', 'app/views/search/index.html.erb', force: true
+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
 
 gsub_file "test/controllers/search_controller_test.rb", %r{test "should return facets" do.*?end}m, <<-CODE
 test "should return aggregations" do

data/lib/rails/templates/05-settings-files.rb

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-#     $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/05-settings-files.rb
+#     $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/05-settings-files.rb
 
 # (See: 01-basic.rb, 02-pretty.rb, 03-expert.rb, 04-dsl.rb)
 
@@ -43,7 +43,7 @@ git commit: "-m 'Setup the Searchable module to load settings from file'"
 # ----- Copy the articles_settings.json file -------------------------------------------------------
 
 # copy_file File.expand_path('../articles_settings.json', __FILE__), 'config/elasticsearch/articles_settings.json'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/articles_settings.json',
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/main/elasticsearch-rails/lib/rails/templates/articles_settings.json',
     'config/elasticsearch/articles_settings.json', force: true
 
 git add:    "config/elasticsearch/articles_settings.json"

data/lib/rails/templates/indexer.rb

@@ -37,7 +37,7 @@ class Indexer
         record.__elasticsearch__.client = Client
         record.__elasticsearch__.__send__ "#{operation}_document"
       when /delete/
-        Client.delete index: klass.constantize.index_name, type: klass.constantize.document_type, id: record_id
+        Client.delete index: klass.constantize.index_name, id: record_id
       else raise ArgumentError, "Unknown operation '#{operation}'"
     end
   end

data/spec/instrumentation/log_subscriber_spec.rb

@@ -0,0 +1,57 @@
+# 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.
+
+require 'spec_helper'
+require 'elasticsearch/rails/instrumentation/log_subscriber'
+
+describe Elasticsearch::Rails::Instrumentation::LogSubscriber do
+  subject(:instance) { described_class.new }
+
+  let(:logger) { instance_double(Logger) }
+
+  before do
+    allow(instance).to receive(:logger) { logger }
+  end
+
+  describe "#search" do
+    subject { instance.search(event) }
+
+    let(:event) { double("search.elasticsearch", duration: 1.2345, payload: { name: "execute", search: { query: { match_all: {}}}}) }
+
+    it "logs the event" do
+      expect(instance).to receive(:color).with(" execute (1.2ms)", described_class::GREEN, { bold: true }).and_call_original
+      expect(logger).to receive(:debug?) { true }
+      expect(logger).to receive(:debug).with("  \e[1m\e[32m execute (1.2ms)\e[0m \e[2m{query: {match_all: {}}}\e[0m")
+      subject
+    end
+
+    context "when Rails version is older" do
+      let(:rails_version) { "7.0.0" }
+
+      before do
+        allow(::Rails).to receive(:gem_version) { Gem::Version.new(rails_version) }
+      end
+
+      it "logs the event" do
+        expect(instance).to receive(:color).with(" execute (1.2ms)", described_class::GREEN, true).and_call_original
+        expect(logger).to receive(:debug?) { true }
+        expect(logger).to receive(:debug).with("  \e[1m\e[32m execute (1.2ms)\e[0m \e[2m{query: {match_all: {}}}\e[0m")
+        subject
+      end
+    end
+  end
+end

data/spec/instrumentation_spec.rb

@@ -18,13 +18,10 @@
 require 'spec_helper'
 
 describe 'ActiveSupport::Instrumentation integration' do
-
   before(:all) do
     class DummyInstrumentationModel
       extend Elasticsearch::Model::Searching::ClassMethods
-
-      def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
+      def self.index_name; 'foo'; end
     end
   end
 
@@ -33,10 +30,14 @@ describe 'ActiveSupport::Instrumentation integration' do
   end
 
   let(:response_document) do
-    { 'took' => '5ms',
-      'hits' => { 'total' => 123,
-                  'max_score' => 456,
-                  'hits' => [] } }
+    {
+      'took' => '5ms',
+      'hits' => {
+        'total' => 123,
+        'max_score' => 456,
+        'hits' => []
+      }
+    }
   end
 
   let(:search) do
@@ -53,7 +54,6 @@ describe 'ActiveSupport::Instrumentation integration' do
   end
 
   context 'SearchRequest#execute!' do
-
     it 'wraps the method with instrumentation' do
       expect(search).to respond_to(:execute_without_instrumentation!)
       expect(search).to respond_to(:execute_with_instrumentation!)
@@ -61,14 +61,19 @@ describe 'ActiveSupport::Instrumentation integration' do
   end
 
   context 'Model#search' do
-
     before do
-      expect(ActiveSupport::Notifications).to receive(:instrument).with('search.elasticsearch',
-                                                                        { klass: 'DummyInstrumentationModel',
-                                                                          name: 'Search',
-                                                                          search: { body: query,
-                                                                          index: 'foo',
-                                                                          type: 'bar' } }).and_return({})
+      expect(ActiveSupport::Notifications).
+        to receive(:instrument).
+             with('search.elasticsearch',
+                  {
+                    klass: 'DummyInstrumentationModel',
+                    name: 'Search',
+                    search: {
+                      body: query,
+                      index: 'foo',
+                    }
+                  }
+                 ).and_return({})
     end
 
     let(:query) do

data/spec/lograge_spec.rb

@@ -38,14 +38,15 @@ require 'lograge'
 require 'elasticsearch/rails/lograge'
 
 describe 'ActiveSupport::Instrumentation integration' do
-
   before do
     Elasticsearch::Rails::Lograge::Railtie.run_initializers
   end
 
   it 'customizes the Lograge configuration' do
-    expect(Elasticsearch::Rails::Lograge::Railtie.initializers
-               .select { |i| i.name == 'elasticsearch.lograge' }
-               .first).not_to be_nil
+    expect(
+      Elasticsearch::Rails::Lograge::Railtie.initializers
+        .select { |i| i.name == 'elasticsearch.lograge' }
+        .first
+    ).not_to be_nil
   end
 end

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ require 'active_record'
 require 'elasticsearch/model'
 require 'elasticsearch/rails'
 require 'rails/railtie'
+require 'rails/version'
 require 'elasticsearch/rails/instrumentation'
 
 
@@ -36,7 +37,8 @@ RSpec.configure do |config|
     tracer = ::Logger.new(STDERR)
     tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }.ansi(:faint)}\n" }
     Elasticsearch::Model.client = Elasticsearch::Client.new host: ELASTICSEARCH_URL,
-                                                            tracer: (ENV['QUIET'] ? nil : tracer)
+                                                            tracer: (ENV['QUIET'] ? nil : tracer),
+                                                            transport_options: { :ssl => { verify: false } }
     puts "Elasticsearch Version: #{Elasticsearch::Model.client.info['version']}"
 
     unless ActiveRecord::Base.connected?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 8.0.0
 platform: ruby
 authors:
-- Karel Minarik
+- Elastic Client Library Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -236,7 +236,7 @@ dependencies:
         version: '0'
 description: Ruby on Rails integrations for Elasticsearch.
 email:
-- karel.minarik@elasticsearch.org
+- client-libs@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -275,6 +275,7 @@ files:
 - lib/rails/templates/searchable.dsl.rb
 - lib/rails/templates/searchable.rb
 - lib/rails/templates/seeds.rb
+- spec/instrumentation/log_subscriber_spec.rb
 - spec/instrumentation_spec.rb
 - spec/lograge_spec.rb
 - spec/spec_helper.rb
@@ -283,7 +284,7 @@ licenses:
 - Apache 2
 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
+  changelog_uri: https://github.com/elastic/elasticsearch-rails/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/elastic/elasticsearch-rails/
   bug_tracker_uri: https://github.com/elastic/elasticsearch-rails/issues
 post_install_message: 
@@ -295,18 +296,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails integrations for Elasticsearch.
 test_files:
+- spec/instrumentation/log_subscriber_spec.rb
 - spec/instrumentation_spec.rb
 - spec/lograge_spec.rb
 - spec/spec_helper.rb