es-elasticity 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6b8a272cc95fb1faf14ed55842877056193c5e1abed37505adc38925ef530d2
-  data.tar.gz: '0985fc6b75c10f235a9160a16367b6007128a6fbdc28f9a69991e99bde7b72b4'
+  metadata.gz: b8d8df30be52adb429cf46bc1478cbc02dd0ceb6aea341e1245bd07c05fc6a5a
+  data.tar.gz: 99554749d9eeaecd44c562a0a486ee0ff8b0fdb68ba2c41f6c09cc7f745256df
 SHA512:
-  metadata.gz: 8fb4b8cd440bea1dfecd2920eec52b5ae309b5a308c6172840ecfef64e40aa4eb5d6a2b95372a7eba7b8637de973588cc8313451ce9f05ab065e3868a7f72525
-  data.tar.gz: c005171a6fb78dbdbc16c4795cc82eb68ad0b614864bd41e11004cf4acfbe010313f89864612f5fde13044075621ad089a43a69cd83f8f6eaa33e0eec2b650b3
+  metadata.gz: 8dd0cc60e22b44999e3799e10b363820ffe2b474f8008c45f006e525dca14cf3a7d0a8a6e15619e37588bca2e57520900f6d69c9a0aa3a8f36020425752c4d83
+  data.tar.gz: '09aa1c18dd829b23b541f3d457e47b826f234385b256b4c2cbd94d61c5f94c08a5739368402587721170a7dc09b3f6a42f12fdabc9a7c8c197e82bb9aedcd9fc'

data/.circleci/config.yml

@@ -1,13 +1,15 @@
 version: '2.1'
 
 meta:
-  ruby-version-matrix: &ruby-version-matrix
+  test-version-matrix: &test-version-matrix
     matrix:
       parameters:
         ruby-version:
-          - '3.1'
           - '3.2'
           - '3.3'
+        elasticsearch-version:
+          - '8.19.20'
+          - '9.5.2'
 
 orbs:
   ci-utils: doximity/ci-utils@2
@@ -17,13 +19,16 @@ executors:
     parameters:
       ruby-version:
         type: string
-        default: '3.1'
+        default: '3.2'
+      elasticsearch-version:
+        type: string
+        default: '8.19.20'
     resource_class: small
     docker:
       - image: cimg/ruby:<< parameters.ruby-version >>
         environment:
           BUNDLE_VERSION: 2.5.23
-      - image: docker.elastic.co/elasticsearch/elasticsearch:8.6.2
+      - image: docker.elastic.co/elasticsearch/elasticsearch:<< parameters.elasticsearch-version >>
         environment:
           discovery.type: single-node
           ES_JAVA_OPTS: "-Xms512m -Xmx512m"
@@ -224,7 +229,10 @@ jobs:
         default: ''
       ruby-version:
         type: string
-        default: '3.1'
+        default: '3.2'
+      elasticsearch-version:
+        type: string
+        default: '8.19.20'
       pre-actions:
         description: Steps to perform any necessary setup after dependencies are installed.
         type: steps
@@ -247,6 +255,7 @@ jobs:
     executor:
       name: "<< parameters.executor >>"
       ruby-version: "<< parameters.ruby-version >>"
+      elasticsearch-version: "<< parameters.elasticsearch-version >>"
     resource_class: "<< parameters.resource_class >>"
     parallelism: "<< parameters.parallelism >>"
     steps:
@@ -265,5 +274,5 @@ workflows:
       - run_tests_ruby:
           executor: ruby
           context: nexus_readonly
-          <<: *ruby-version-matrix
-          name: run_tests_ruby-ruby-<< matrix.ruby-version >>
+          <<: *test-version-matrix
+          name: run_tests_ruby-<< matrix.ruby-version >>-elasticsearch-<< matrix.elasticsearch-version >>

data/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0] - 2026-09-03
+### Changed
+- Require Ruby 3.2 or newer
+- Require Elasticsearch Ruby client 8.19
+- Send scroll IDs in request bodies for Elasticsearch 9 compatibility
+
+## [1.4.0]
+## Changed
+- Update dependencies for Rails 8 compatibility
+- Replace `ActiveSupport::ProxyObject` with `BasicObject` for Rails 8 compatibility
+
 ## [1.3.0] - 2025-02-13
 ### Changed
 - Compatibility elasticsearch-ruby gem v8.16 and beyond

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    es-elasticity (1.3.0)
-      activemodel (>= 5.2.0, < 8)
-      activerecord (>= 5.2.0, < 8)
-      activesupport (>= 5.2.0, < 8)
-      elastic-transport (>= 8.3, < 8.7)
-      elasticsearch (>= 7, <= 8.16)
+    es-elasticity (2.0.0)
+      activemodel (>= 5.2.0, < 9)
+      activerecord (>= 5.2.0, < 9)
+      activesupport (>= 5.2.0, < 9)
+      elastic-transport (~> 8.4)
+      elasticsearch (~> 8.19.0)
 
 GEM
   remote: https://artifacts.dox.support/repository/gems/
   specs:
-    activemodel (7.2.2)
-      activesupport (= 7.2.2)
-    activerecord (7.2.2)
-      activemodel (= 7.2.2)
-      activesupport (= 7.2.2)
+    activemodel (8.0.2.1)
+      activesupport (= 8.0.2.1)
+    activerecord (8.0.2.1)
+      activemodel (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       timeout (>= 0.4.0)
-    activesupport (7.2.2)
+    activesupport (8.0.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -29,36 +29,43 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.8)
+      uri (>= 0.13.1)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     byebug (11.1.3)
     codeclimate-test-reporter (1.0.7)
       simplecov
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     diff-lcs (1.5.1)
     docile (1.4.1)
-    drb (2.2.1)
-    elastic-transport (8.3.5)
+    drb (2.2.3)
+    elastic-transport (8.5.3)
       faraday (< 3)
       multi_json
-    elasticsearch (8.16.0)
+    elasticsearch (8.19.3)
       elastic-transport (~> 8.3)
-      elasticsearch-api (= 8.16.0)
-    elasticsearch-api (8.16.0)
+      elasticsearch-api (= 8.19.3)
+      ostruct
+    elasticsearch-api (8.19.3)
       multi_json
-    faraday (2.7.4)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    i18n (1.14.6)
+    faraday (2.14.3)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    logger (1.6.1)
+    json (2.21.2)
+    logger (1.7.0)
     method_source (1.1.0)
-    minitest (5.25.1)
-    multi_json (1.15.0)
+    minitest (5.25.5)
+    multi_json (1.21.1)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
     oj (3.16.7)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
@@ -66,7 +73,7 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (10.5.0)
+    rake (13.3.0)
     redis (4.1.3)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -83,8 +90,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby2_keywords (0.0.5)
-    securerandom (0.3.1)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -92,9 +98,10 @@ GEM
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     timecop (0.9.5)
-    timeout (0.4.2)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.0.3)
 
 PLATFORMS
   ruby
@@ -106,7 +113,7 @@ DEPENDENCIES
   es-elasticity!
   oj
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   redis
   rspec (~> 3.13.0)
   rspec_junit_formatter

data/README.md

@@ -30,9 +30,7 @@ Or install it yourself as:
 
 ### Version Support
 
-This gem has [elasticsearch-ruby](https://github.com/elastic/elasticsearch-ruby) as a dependency. In order to use different versions of elasticsearch you will need to match your version of elasticsearch-ruby to the version of elasticsearch you want to use ([see here](https://github.com/elastic/elasticsearch-ruby#compatibility). Elasticity should work across all versions of elastisearch-ruby, although they have not all been tested so there are likely edge cases.
-
-Currently tests are run on CirlceCI against elasticsearch 7.17.3 with elasticsearch-ruby 7.17.1.
+Elasticity 2.x requires Ruby 3.2 or newer and [elasticsearch-ruby](https://github.com/elastic/elasticsearch-ruby) 8.19. Tests run against Elasticsearch 8.19.20 and 9.5.2.
 
 ### Configuration
 

data/es-elasticity.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Elasticity provides a higher level abstraction on top of [elasticsearch-ruby](https://github.com/elasticsearch/elasticsearch-ruby) gem}
   spec.homepage      = "https://github.com/doximity/es-elasticity"
   spec.license       = "MIT"
+  spec.required_ruby_version = ">= 3.2"
 
   spec.files         = `git ls-files -z`.split("\x0")
     spec.files = `git ls-files -z`.split("\x0").reject do |f|
@@ -26,16 +27,16 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "oj"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "redis"
   spec.add_development_dependency "rspec", "~> 3.13.0"
   spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "simplecov", "~> 0.22.0"
   spec.add_development_dependency "timecop"
 
-  spec.add_dependency "activemodel",   ">= 5.2.0", "< 8"
-  spec.add_dependency "activerecord",   ">= 5.2.0", "< 8"
-  spec.add_dependency "activesupport", ">= 5.2.0", "< 8"
-  spec.add_dependency "elasticsearch", ">= 7", "<= 8.16"
-  spec.add_dependency "elastic-transport", ">= 8.3", "< 8.7"
+  spec.add_dependency "activemodel",   ">= 5.2.0", "< 9"
+  spec.add_dependency "activerecord",   ">= 5.2.0", "< 9"
+  spec.add_dependency "activesupport", ">= 5.2.0", "< 9"
+  spec.add_dependency "elasticsearch", "~> 8.19.0"
+  spec.add_dependency "elastic-transport", "~> 8.4"
 end

data/lib/elasticity/search.rb

@@ -175,7 +175,7 @@ module Elasticity
           # Push the first set of results before requesting the second set
           y << Search::Results.new(response, @search_definition.body, @mapper)
           loop do
-            response = @client.scroll(scroll_id: response["_scroll_id"], scroll: @scroll, body: { scroll_id: response["_scroll_id"] })
+            response = @client.scroll(scroll: @scroll, body: { scroll_id: response["_scroll_id"] })
             break if response["hits"]["hits"].empty?
 
             y << Search::Results.new(response, @search_definition.body, @mapper)
@@ -204,7 +204,7 @@ module Elasticity
         end
       end
 
-      class Relation < ActiveSupport::ProxyObject
+      class Relation < ::BasicObject
 
         delegate :total, :per_page, :total_pages, :current_page, :next_page,
           :previous_page, :aggregations, to: :@results
@@ -291,7 +291,7 @@ module Elasticity
       end
     end
 
-    class Results < ActiveSupport::ProxyObject
+    class Results < ::BasicObject
       include ::Enumerable
 
       delegate :each, :size, :length, :[], :+, :-, :&, :|, to: :@documents

data/lib/elasticity/strategies/alias_index.rb

@@ -95,7 +95,7 @@ module Elasticity
             end
 
             @client.bulk(body: ops) unless ops.empty?
-            cursor = @client.scroll(scroll_id: cursor["_scroll_id"], scroll: "1m", body: { scroll_id: cursor["_scroll_id"] })
+            cursor = @client.scroll(scroll: "1m", body: { scroll_id: cursor["_scroll_id"] })
           end
 
           # Update aliases to only point to the new index.
@@ -139,7 +139,7 @@ module Elasticity
             end
 
             @client.bulk(body: ops)
-            cursor = @client.scroll(scroll_id: cursor["_scroll_id"], scroll: "1m")
+            cursor = @client.scroll(scroll: "1m", body: { scroll_id: cursor["_scroll_id"] })
           end
 
           @client.index_refresh(index: original_index)

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "1.3.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Rodrigo Kochenburger
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +172,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -183,7 +182,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +192,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,7 +202,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +212,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -223,47 +222,35 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7'
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.16'
+        version: 8.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7'
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.16'
+        version: 8.19.0
 - !ruby/object:Gem::Dependency
   name: elastic-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.3'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.7'
+        version: '8.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.3'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.7'
+        version: '8.4'
 description: Elasticity provides a higher level abstraction on top of [elasticsearch-ruby](https://github.com/elasticsearch/elasticsearch-ruby)
   gem
 email:
@@ -308,7 +295,6 @@ homepage: https://github.com/doximity/es-elasticity
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -316,15 +302,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: ActiveModel-based library for working with Elasticsearch
 test_files: []