elasticsearch-rails 7.2.1 → 8.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fde69c2ec154f7a98baad2cf8d80d1a9d13164dc8799b797c66764913146fc89
-  data.tar.gz: a807a316c88525182491fc9366d41644581edccfe6458df9c9fcb163082e05f0
+  metadata.gz: 64ebf5844db4e95b8dfe3713ca0059c700d6a75907f96de772f0446c07e4f5da
+  data.tar.gz: 290065237c0e894f0d905b2f74a867fb8a2fff13cd6a0c9f7bbe3a0a5681382f
 SHA512:
-  metadata.gz: c84a6de2ee5ae1cc6597ed11d95dc6979268d30297c3d51b5927794948d55dfc59352fb2db829ce40f59c40801bb969b2d72501cd530ea97981072360f83ac0c
-  data.tar.gz: '039d903aacf4c20ffa2111dec33d5e44ff7a413d3d834e5944fa861f7a9f5fbedae66c2be9b1eb42003860447b25f738c2914bfdbcba17120a8811462213185a'
+  metadata.gz: d3e5e62c7a52f4bd25ea892f3336f9b27d66b04a1599cab018e44565b594b562a5fb906234cacc23b7eb6898455f1c2f6064737493754c4c779059d997467ef4
+  data.tar.gz: 2c02e8ba745189d9d38996d4b5d6dc25de0b45cbe00cde33a37fc6cca033404e5a81d67f2ea77a9c62c66864cc6cee8542214a9ead2f51378be7995a0d05546f

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'
+    gem 'debug'
+  end
 end

data/README.md

@@ -8,8 +8,7 @@ library, providing features suitable for Ruby on Rails applications.
 
 This library is compatible with Ruby 1.9.3 and higher.
 
-The library version numbers follow the Elasticsearch major versions, and the `main` 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 `7.x` of the Elasticsearch stack. **We haven't tested and updated the code for Elasticsearch `8.0` yet**.
 
 | Rubygem       |   | Elasticsearch |
 |:-------------:|:-:| :-----------: |
@@ -18,7 +17,7 @@ is compatible with the Elasticsearch `master` branch, therefore, with the next m
 | 5.x           | → | 5.x           |
 | 6.x           | → | 6.x           |
 | 7.x           | → | 7.x           |
-| main          | → | master        |
+| main          | → | 7.x           |
 
 ## Installation
 

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,8 +23,8 @@ 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/'
@@ -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/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.1"
+    VERSION = '8.0.0.pre'.freeze
   end
 end

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

@@ -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/04-dsl.rb

@@ -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'"

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_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

@@ -36,7 +36,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.1
+  version: 8.0.0.pre
 platform: ruby
 authors:
-- Karel Minarik
+- Elastic Client Library Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2024-04-16 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:
@@ -295,14 +295,14 @@ 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.3.3
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails integrations for Elasticsearch.