es-elasticity 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a71a1d59a0baa8af334a40cc3b38c8210b3e962e9daa0a899820bad2d1a2598e
-  data.tar.gz: 2c7032d5508738f6588c252e126d5213453204359f2bf8cae242359c1a36e7ec
+  metadata.gz: 199962dd3d7976f5fcefe948bed04e6c568d332c3ac6a9ecd1e5c89893a5f01a
+  data.tar.gz: e8a326cfa07858cb01a82ff47e735787fa517e36bebb1606d9c2965ce5b0966d
 SHA512:
-  metadata.gz: 5892bd0e785358bf7d8bd9b3946d3c8561549aad4c95adde310412bddf340e06413db60aa2cd5ebcc725b7cef1bb946d677918de4d323d1b0ca2f4d6873a329e
-  data.tar.gz: 53478a2feb259f44b52ab87738abbb670a292efa3782e9a41302f0a015e2a1c1d08b9e3fe73c0e67075f9d78f0daab17aa7ad0e37b4e91b8bf4945b4b0b86e1a
+  metadata.gz: ad6cd3a7af2e3f74f9f7f66670071400ae03576125f525a7c54c70a85a56507b7a8b2dce5bd7140a19c21c82e301ed64ee5b6e10421c703701b549a3a64c6647
+  data.tar.gz: 8a88dbdf4c9c0809e31c3aab5c6b1f315d47e21edc286540b30c1891371a0176fee5a6943c2a7e95f60c14da350a50a1d8ba272eaf70fcb34a122fac3a588aba

data/.circleci/config.yml

@@ -19,7 +19,7 @@ executors:
       - image: cimg/ruby:2.7
         environment:
           BUNDLE_VERSION: '~> 2.3.4'
-      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.3
+      - image: docker.elastic.co/elasticsearch/elasticsearch:8.6.2
         environment:
           - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
           - discovery.type=single-node
@@ -30,7 +30,7 @@ executors:
       - image: cimg/ruby:3.0
         environment:
           BUNDLE_VERSION: '~> 2.3.4'
-      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.3
+      - image: docker.elastic.co/elasticsearch/elasticsearch:8.6.2
         environment:
           - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
           - discovery.type=single-node
@@ -42,7 +42,7 @@ executors:
       - image: cimg/ruby:3.1
         environment:
           BUNDLE_VERSION: '~> 2.3.4'
-      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.3
+      - image: docker.elastic.co/elasticsearch/elasticsearch:8.6.2
         environment:
           - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
           - discovery.type=single-node

data/CHANGELOG.md

@@ -4,7 +4,13 @@ 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).
 
-## [Unreleased]
+## [1.1.0] - 2023-05-02
+### Changed
+- Updated the max elasticsearch dependency version to < 8.7
+
+## [1.0.1] - 2022-08-16
+### Changed
+- Revert the additional `frozen_string_literal` updates in 1.0.0 due to some issues with some classes. We'll update these in a separate release to isolate the problem.
 
 ## [1.0.0] - 2022-08-09
 ### Changed

data/Gemfile.lock

@@ -1,21 +1,22 @@
 PATH
   remote: .
   specs:
-    es-elasticity (1.0.0)
+    es-elasticity (1.1.0)
       activemodel (>= 5.2.0, < 7.1)
       activerecord (>= 5.2.0, < 7.1)
       activesupport (>= 5.2.0, < 7.1)
-      elasticsearch (>= 7, < 8)
+      elastic-transport (>= 8.0, < 8.7)
+      elasticsearch (>= 7, < 8.7)
 
 GEM
   remote: https://artifacts.dox.support/repository/gems/
   specs:
-    activemodel (7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activerecord (7.0.3.1)
-      activemodel (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activesupport (7.0.3.1)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -24,45 +25,25 @@ GEM
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     coderay (1.1.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.3)
-    elasticsearch (7.17.1)
-      elasticsearch-api (= 7.17.1)
-      elasticsearch-transport (= 7.17.1)
-    elasticsearch-api (7.17.1)
+    elastic-transport (8.2.1)
+      faraday (< 3)
       multi_json
-    elasticsearch-transport (7.17.1)
-      faraday (~> 1)
+    elasticsearch (8.6.0)
+      elastic-transport (~> 8)
+      elasticsearch-api (= 8.6.0)
+    elasticsearch-api (8.6.0)
       multi_json
-    faraday (1.10.1)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    i18n (1.12.0)
+    faraday-net_http (3.0.2)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.16.2)
+    minitest (5.18.0)
     multi_json (1.15.0)
-    multipart-post (2.2.3)
     oj (3.10.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -89,7 +70,7 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     timecop (0.9.5)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS

data/README.md

@@ -1,4 +1,4 @@
-<img src="https://s3.amazonaws.com/doximity/logos/elasticity-logotype.svg" width="35%">
+<img src="https://dox-public-assets.s3.amazonaws.com/doximity/logos/elasticity-logotype.svg" width="35%">
 
 ---
 

data/es-elasticity.gemspec

@@ -36,5 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activemodel",   ">= 5.2.0", "< 7.1"
   spec.add_dependency "activerecord",   ">= 5.2.0", "< 7.1"
   spec.add_dependency "activesupport", ">= 5.2.0", "< 7.1"
-  spec.add_dependency "elasticsearch", ">= 7", "< 8"
+  spec.add_dependency "elasticsearch", ">= 7", "< 8.7"
+  spec.add_dependency "elastic-transport", ">= 8.0", "< 8.7"
 end

data/lib/elasticity/base_document.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class BaseDocument
     include ::ActiveModel::Model

data/lib/elasticity/bulk.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class Bulk
     def initialize(client)

data/lib/elasticity/config.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class Config
     def client=(client)

data/lib/elasticity/document.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class Document < BaseDocument
     IndexMapper.set_delegates(singleton_class, :mapper)

data/lib/elasticity/index_config.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class IndexConfig
     class SubclassError < StandardError; end

data/lib/elasticity/index_mapper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class IndexMapper
     def self.set_delegates(obj, to)

data/lib/elasticity/instrumented_client.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class InstrumentedClient
     INDICES_METHODS = %w(exists create delete get_settings get_mapping flush refresh get_alias get_aliases put_alias delete_alias exists_alias update_aliases)

data/lib/elasticity/log_subscriber.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "active_support/subscriber"
 require "active_support/log_subscriber"
 

data/lib/elasticity/multi_search.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class MultiSearch
     def initialize(msearch_args = {})

data/lib/elasticity/multi_search_response_parser.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class MultiSearchResponseParser
     class UnknownError < StandardError; end
@@ -18,7 +16,7 @@ module Elasticity
     private
 
     def self.error_for(status)
-      Elasticsearch::Transport::Transport::ERRORS[status] || UnknownError
+      Elastic::Transport::Transport::ERRORS[status] || UnknownError
     end
   end
 end

data/lib/elasticity/railtie.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "elasticity/log_subscriber"
 
 module Elasticity

data/lib/elasticity/search.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   module Search
     def self.build(client, index_name, document_types, body, search_args = {})

data/lib/elasticity/segmented_document.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   class SegmentedDocument < BaseDocument
     # Creates a new segment which behaves almost the same as a Document class dynamically

data/lib/elasticity/strategies/alias_index.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   module Strategies
     # This strategy keeps two aliases that might be mapped to the same index or different index, allowing
@@ -110,7 +108,7 @@ module Elasticity
           waiting_duration = 0
           begin
             @client.index_delete(index: original_index)
-          rescue Elasticsearch::Transport::Transport::ServerError => e
+          rescue Elastic::Transport::Transport::ServerError => e
             if retryable_error?(e)  && retry_delete_on_recoverable_errors && waiting_duration < max_delay
               waiting_duration += retry_delay
               sleep(retry_delay)
@@ -176,13 +174,13 @@ module Elasticity
 
       def main_indexes
         @client.index_get_alias(index: "#{@main_alias}-*", name: @main_alias).keys
-      rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      rescue Elastic::Transport::Transport::Errors::NotFound
         []
       end
 
       def update_indexes
         @client.index_get_alias(index: "#{@main_alias}-*", name: @update_alias).keys
-      rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      rescue Elastic::Transport::Transport::Errors::NotFound
         []
       end
 
@@ -266,7 +264,7 @@ module Elasticity
 
       def settings
         @client.index_get_settings(index: @main_alias).values.first
-      rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      rescue Elastic::Transport::Transport::Errors::NotFound
         nil
       end
 
@@ -280,7 +278,7 @@ module Elasticity
 
       def mapping
         @client.index_get_mapping(index: @main_alias).values.first
-      rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      rescue Elastic::Transport::Transport::Errors::NotFound
         nil
       end
 

data/lib/elasticity/strategies/single_index.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   module Strategies
     class SingleIndex
@@ -82,7 +80,7 @@ module Elasticity
 
       def settings
         @client.index_get_settings(index: @index_name).values.first
-      rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      rescue Elastic::Transport::Transport::Errors::NotFound
         nil
       end
 
@@ -96,7 +94,7 @@ module Elasticity
 
       def mapping
         @client.index_get_mapping(index: @index_name).values.first
-      rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      rescue Elastic::Transport::Transport::Errors::NotFound
         nil
       end
 

data/lib/elasticity/strategies.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
   module Strategies
     class IndexError < StandardError

data/lib/elasticity/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Elasticity
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/elasticity.rb

@@ -21,6 +21,7 @@ require "arel"
 require "active_support/core_ext"
 require "active_model"
 require "elasticsearch"
+require "elastic/transport"
 
 module Elasticity
   autoload :Bulk,                     "elasticity/bulk"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -233,7 +233,7 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -243,7 +243,27 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.7'
+- !ruby/object:Gem::Dependency
+  name: elastic-transport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.7'
 description: Elasticity provides a higher level abstraction on top of [elasticsearch-ruby](https://github.com/elasticsearch/elasticsearch-ruby)
   gem
 email:
@@ -304,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: ActiveModel-based library for working with Elasticsearch