elasticsearch-rails 8.0.0.pre → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ebf5844db4e95b8dfe3713ca0059c700d6a75907f96de772f0446c07e4f5da
-  data.tar.gz: 290065237c0e894f0d905b2f74a867fb8a2fff13cd6a0c9f7bbe3a0a5681382f
+  metadata.gz: ad1605494dc4d7e8b3e47dbece4aa520f4407117f3abc0b774277e9a52baa0da
+  data.tar.gz: 19a2243d269e8ddb6ab17bb5e2e9272e4dc6bb36855b4fe83b84ea3eb82ef60e
 SHA512:
-  metadata.gz: d3e5e62c7a52f4bd25ea892f3336f9b27d66b04a1599cab018e44565b594b562a5fb906234cacc23b7eb6898455f1c2f6064737493754c4c779059d997467ef4
-  data.tar.gz: 2c02e8ba745189d9d38996d4b5d6dc25de0b45cbe00cde33a37fc6cca033404e5a81d67f2ea77a9c62c66864cc6cee8542214a9ead2f51378be7995a0d05546f
+  metadata.gz: 2a9f94de3cd3b297af45123027010d0dce6ffcee38577a06f4fbfe1023b58eea8f257d3970ea05d8c2403e288ae03945d20789ef8a1b3f08a1577639d4e9b39a
+  data.tar.gz: 0c2f2455b7f27fcd1ee0c6b246f2bbc289655ffc920aed28a1b07cbe04cd38e9b2eb1e8ad433ce613c0c85787ff11e9bc2d71be7e0db921c8ea7a39ffd349a9b

data/README.md

@@ -6,18 +6,19 @@ 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 version numbers follow the Elasticsearch major versions. Currently the `main` branch is compatible with version `7.x` of the Elasticsearch stack. **We haven't tested and updated the code for Elasticsearch `8.0` yet**.
+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           |
-| main          | → | 7.x           |
+| 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
 
@@ -137,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/lib/elasticsearch/rails/instrumentation/log_subscriber.rb

@@ -18,7 +18,6 @@
 module Elasticsearch
   module Rails
     module Instrumentation
-
       # A log subscriber to attach to Elasticsearch related events
       #
       # @see https://github.com/rails/rails/blob/master/activerecord/lib/active_record/log_subscriber.rb
@@ -46,11 +45,21 @@ 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
 
-          debug %Q|  #{color(name, GREEN, true)} #{colorize_logging ? "\e[2m#{search}\e[0m" : search}|
+        private
+
+        def color_option(bold_value)
+          new_color_syntax? ? { bold: bold_value } : bold_value
         end
-      end
 
+        def new_color_syntax?
+          return @new_color_syntax if defined?(@new_color_syntax)
+
+          @new_color_syntax = ::ActiveSupport.respond_to?(:gem_version) && ::ActiveSupport::gem_version >= '7.1'
+        end
+      end
     end
   end
 end

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

@@ -80,7 +80,6 @@ namespace :elasticsearch do
       total_errors = klass.__elasticsearch__.import force:      ENV.fetch('FORCE', false),
                                   batch_size: ENV.fetch('BATCH', 1000).to_i,
                                   index:      ENV.fetch('INDEX', nil),
-                                  type:       ENV.fetch('TYPE',  nil),
                                   scope:      ENV.fetch('SCOPE', nil) do |response|
         pbar.inc response['items'].size if pbar
         STDERR.flush

data/lib/elasticsearch/rails/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Rails
-    VERSION = '8.0.0.pre'.freeze
+    VERSION = '8.0.1'.freeze
   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 ActiveSupport version is older' do
+      let(:active_support_version) { '7.0.0' }
+
+      before do
+        allow(::ActiveSupport).to receive(:gem_version) { Gem::Version.new(active_support_version) }
+      end
+
+      it 'logs the event' do
+        expect(instance).to receive(:color).with(' execute (1.2ms)', described_class::GREEN, true).and_return "\e[1m\e[32m execute (1.2ms)\e[0m"
+        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/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'
 
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre
+  version: 8.0.1
 platform: ruby
 authors:
 - Elastic Client Library Maintainers
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -240,8 +239,8 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE.txt
+- README.md
 files:
 - ".gitignore"
 - CHANGELOG.md
@@ -275,6 +274,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
@@ -286,7 +286,6 @@ metadata:
   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: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -302,11 +301,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.7.1
 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