es-elasticity 1.0.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c13e2b279bf48ef4d133c348954b1b8b19c07a9e3f8af7e539d3bf0e359f485
-  data.tar.gz: d9ca4629b1c2c091fb77cac05213b944ef4d877a845f3d6c8e606a37cfbc6fec
+  metadata.gz: 95636a3b634ac2079a268f7475a52d62e64eb75e9544bad28f62dc025002c28a
+  data.tar.gz: 9dd0729ed5b52b9aee20ab68a7b782ca226bf2c51ab1672102a00a036bfe3308
 SHA512:
-  metadata.gz: 01d086f62d915982aeae1fa1135836f8442c6eb578ff8c6daa1bfcb8bd4d70b0e54647a38e3b8d22fac0a477afc6ff11cfcc832215acca5d93f8db4d70344065
-  data.tar.gz: 8df1713fd97df4ce332d48a72b6ae9e364a591cc17ca19f6e6a3c621157f595936c84122b8d515ccc18044e2f272da891e2ab22bce4445cc24c00cd112cb74c0
+  metadata.gz: 1c9ad50f4ff8aeda310ffa3f1c876298252f410cdbcae586b72877381050f85b2bdf49673f830cadffd1741800bf5b78d336def51b5f6fd1efe39aa1d77d26fa
+  data.tar.gz: 81733102f4159be0d4c065be7515f274913f97c04a478e2d71175828d77fd1dfddbc95ac04c3a50deb090de6a40e7ae388a84033923fc20a29169254ada3b8a0

data/.circleci/config.yml

@@ -1,225 +1,269 @@
-version: 2.1
+version: '2.1'
+
+meta:
+  ruby-version-matrix: &ruby-version-matrix
+    matrix:
+      parameters:
+        ruby-version:
+          - '3.1'
+          - '3.2'
+          - '3.3'
 
 orbs:
-  gem: doximity/gem-publisher@0
+  ci-utils: doximity/ci-utils@2
 
 executors:
-  # used for building the gem
-  ruby-latest:
+  ruby:
+    parameters:
+      ruby-version:
+        type: string
+        default: '3.1'
     resource_class: small
     docker:
-      - image: cimg/ruby:3.1
+      - image: cimg/ruby:<< parameters.ruby-version >>
         environment:
-          BUNDLE_VERSION: '~> 2.3.4'
-
-  # used for testing the gem:
-  ruby_2_7:
-    resource_class: small
-    docker:
-      - image: cimg/ruby:2.7
+          BUNDLE_VERSION: 2.5.23
+      - image: docker.elastic.co/elasticsearch/elasticsearch:8.6.2
         environment:
-          BUNDLE_VERSION: '~> 2.3.4'
-      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.3
-        environment:
-          - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
-          - discovery.type=single-node
-          - xpack.security.enabled=false
-  ruby_3_0:
-    resource_class: small
-    docker:
-      - image: cimg/ruby:3.0
-        environment:
-          BUNDLE_VERSION: '~> 2.3.4'
-      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.3
-        environment:
-          - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
-          - discovery.type=single-node
-          - xpack.security.enabled=false
+          discovery.type: single-node
+          ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+          http.port: 9200
+          xpack.security.enabled: false
 
-  ruby_3_1:
-    resource_class: small
-    docker:
-      - image: cimg/ruby:3.1
-        environment:
-          BUNDLE_VERSION: '~> 2.3.4'
-      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.3
-        environment:
-          - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
-          - discovery.type=single-node
-          - xpack.security.enabled=false
-
-# yaml anchor filters
-master_only: &master_only
-  filters:
-    branches:
-      only: master
-    tags:
-      ignore: /.*/
-pr_only: &pr_only
-  filters:
-    branches:
-      ignore: master
-    tags:
-      ignore: /.*/
-version_tags_only: &version_tags_only
-  filters:
-    branches:
-      ignore: /.*/
-    tags:
-      only: /^v.*/
-
-jobs:
-  build_2_7:
-    executor: ruby_2_7
+commands:
+  bundle_install:
     steps:
-      - checkout
       - run:
           name: Install Bundler specific version
-          command: |
-            gem install bundler --version "${BUNDLE_VERSION}" --force
-      - restore_cache:
-          keys:
-            - v3-bundle-ruby_2_7-{{ checksum "Gemfile.lock" }}
-      - run:
-          name: Install Ruby Dependencies
-          command: bundle check --path=vendor/bundle || bundle install --local --frozen --path=vendor/bundle --jobs=4 --retry=3
-      - save_cache:
-          key: v3-bundle-ruby_2_7-{{ checksum "Gemfile.lock" }}
-          paths:
-            - vendor/bundle
-      - run:
-          name: Wait for ElasticSearch
-          command: dockerize -wait http://127.0.0.1:9200 -timeout 1m
+          command: gem install bundler --version "$BUNDLE_VERSION" --force
       - run:
-          name: Run Tests
-          command: bundle exec rspec
-      - persist_to_workspace:
-          root: .
-          paths:
-            - vendor/bundle
-  build_3_0:
-    executor: ruby_3_0
-    steps:
-      - checkout
-      - run:
-          name: Install Bundler specific version
+          name: Configure Bundler
           command: |
-            gem install bundler --version "${BUNDLE_VERSION}" --force
-      - restore_cache:
-          keys:
-            - v3-bundle-ruby_3_0-{{ checksum "Gemfile.lock" }}
+            bundle config set --local cache_path 'vendor/cache'
+            bundle config set --local path 'vendor/bundle'
+            bundle config set --local jobs 4
+            bundle config set --local retry 3
+            bundle config set --local timeout 60
+            if [ -f "Gemfile.lock" ]; then
+              bundle config set --local frozen true
+            fi
       - run:
-          name: Install Ruby Dependencies
-          command: bundle check --path=vendor/bundle || bundle install --local --frozen --path=vendor/bundle --jobs=4 --retry=3
-      - save_cache:
-          key: v3-bundle-ruby_3_0-{{ checksum "Gemfile.lock" }}
-          paths:
-            - vendor/bundle
-      - run:
-          name: Wait for ElasticSearch
-          command: dockerize -wait http://127.0.0.1:9200 -timeout 1m
+          name: Log bundle config
+          command: bundle config
       - run:
-          name: Run Tests
-          command: bundle exec rspec
-      - persist_to_workspace:
-          root: .
-          paths:
-            - vendor/bundle
-
-  build_3_1:
-    executor: ruby_3_1
+          name: Install Ruby Dependencies
+          command: |
+            if [ -d "vendor/cache" ]; then
+              bundle install --local --verbose
+            else
+              bundle install --verbose
+            fi
+
+  run_rspec_tests:
+    parameters:
+      test_pattern:
+        default: "{$(ls -d spec/**/ | tr '\\n' ',' | sed -E 's/(spec\\/|factories|support|\\/|,$)//g' | sed 's/,\\{2,\\}/,/g')}"
+        type: string
+      test_files:
+        default: $(circleci tests glob "spec/$TEST_PATTERN/**/*_spec.rb" | circleci tests split --split-by=timings)
+        type: string
+      profile-specs:
+        type: integer
+        default: 0
     steps:
-      - checkout
       - run:
-          name: Install Bundler specific version
+          name: Run RSpec Tests
+          environment:
+            OUT_PATH: tmp/test-results
+            PROFILE_COUNT: "<< parameters.profile-specs >>"
           command: |
-            gem install bundler --version "${BUNDLE_VERSION}" --force
-      - restore_cache:
-          keys:
-            - v3-bundle-ruby_3_1-{{ checksum "Gemfile.lock" }}
+            shopt -s globstar
+            mkdir -p $OUT_PATH
+            TEST_PATTERN=<< parameters.test_pattern >>
+            TEST_FILES=<< parameters.test_files >>
+            RSPEC_COMMAND="bundle exec rspec --profile $PROFILE_COUNT --format RspecJunitFormatter --out $OUT_PATH/results.xml --format progress --order defined $TEST_FILES"
+            printf "Executing specs with the following command:\n\n"
+            echo ${RSPEC_COMMAND}
+            printf "\n"
+            ${RSPEC_COMMAND}
+            echo "RSpec exited with code $?"
       - run:
-          name: Install Ruby Dependencies
-          command: bundle check --path=vendor/bundle || bundle install --local --frozen --path=vendor/bundle --jobs=4 --retry=3
-      - save_cache:
-          key: v3-bundle-ruby_3_1-{{ checksum "Gemfile.lock" }}
-          paths:
-            - vendor/bundle
-      - run:
-          name: Wait for ElasticSearch
-          command: dockerize -wait http://127.0.0.1:9200 -timeout 1m
-      - run:
-          name: Run Tests
-          command: bundle exec rspec
-      - persist_to_workspace:
-          root: .
-          paths:
-            - vendor/bundle
+          name: Double check RSpec Failures
+          environment:
+            OUT_PATH: tmp/test-results
+          command: |
+            FILE=$OUT_PATH/results.xml
+            if [ -f $FILE ]; then
+              FAIL_COUNT=$(ruby -r rexml/document -e 'include REXML; puts XPath.first(Document.new($stdin), "string(//testsuite/@failures)")' < $FILE )
+              if [ $FAIL_COUNT -gt 0 ]; then
+                printf "IF YOU ARE READING THIS, TESTS FAILED BUT \"rspec\" RETURNED A 0 EXIT CODE AND LOOKS GREEN!\n\n"
+                printf "PLEASE LOOK AT THE PREVIOUS STEP TITLED \"Run RSpec Tests\" TO SEE SPEC FAILURE INFO!\n\n"
+                printf "You may also look at the \"TESTS\" tab, which will show failing spec info.\n\n"
+                printf "Additionally, $FILE is available for download and inspection in the \"ARTIFACTS\" tab.\n\n"
+                exit 1
+              fi
+            else
+              echo "$FILE not found..."
+              exit 0
+            fi
+            echo "No uncaught RSpec failures detected!"
+
+  install_gem_version:
+    parameters:
+      gem-version:
+        description: |
+          The name and version number (e.g. rails-7.0.3) you want installed, specified to the patch version.
+        type: string
+        default: ''
+    steps:
+      - when:
+          condition: "<< parameters.gem-version >>"
+          steps:
+            - run:
+                name: Unfreeze Bundle
+                command: bundle config set --local frozen 'false'
+            - run:
+                name: Show prior gem version
+                command: |
+                  read -r target_gemname target_version \<<< $( echo "<< parameters.gem-version >>" | sed 's/\(.*\)-\([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)*\)/\1 \2/g')
+                  version=$(bundle list | sed -n "s/[[:space:]]*\* $target_gemname (\(.*\))/\1/p")
+                  if [[ -z "$version" ]]; then
+                    echo "No prior version of ${target_gemname} found."
+                  else
+                    echo $version;
+                  fi
+            - run:
+                name: Set gem version to << parameters.gem-version >>
+                command: |
+                  cd
+                  read -r target_gemname target_version \<<< $( echo "<< parameters.gem-version >>" | sed 's/\(.*\)-\([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)*\)/\1 \2/g')
+                  gem install $target_gemname -i /tmp/repo --no-document -v $target_version
+
+                  echo 'Delete any gems matching the newly installed ones from the existing cache'
+                  for line in $(ls /tmp/repo/cache | grep gem); do
+                    read -r gemname version \<<< $( echo $line | sed 's/\(.*\)-\([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)*\)[^0-9\.]*.*.gem/\1 \2/g')
+                    if [ $gemname = 'bundler' ]; # skip bundler
+                      then continue
+                    fi
+                    rm -f ~/project/vendor/cache/$gemname*.gem
+                  done;
+
+                  echo 'The following gems will be copied into the project: '
+                  ls -l /tmp/repo/cache
+                  cp /tmp/repo/cache/*.gem ~/project/vendor/cache
+
+                  echo 'Showing gems in the project cache: ls -al ~/project/vendor/cache'
+                  ls -al ~/project/vendor/cache
+
+                  cd ~/project
+                  echo 'Removing Gemfile.lock'
+                  rm -f ./Gemfile.lock
+
+                  echo 'Fancy replacement. Set all gems in the gemspec to what we currently have in the vendor/cache.'
+                  for line in $(ls vendor/cache | grep gem); do
+                    # we don't care about the .gem, get rid of it
+                    trimmed_line=${line%%.gem}
+                    # version to include anything after the gem name so we can pick up prerelease versions
+                    read -r gemname version \<<< $( echo $trimmed_line | sed 's/\(.*\)-\([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)*[^0-9\.]*.*\)/\1 \2/g' )
+
+                    # leave bundler alone
+                    if [ $gemname = 'bundler' ];
+                      then continue
+                    fi
+
+                    # strip out platform info from version, we just want the number plus any prerelease identifiers
+                    version=$(echo $version | cut -d "-" -f 1)
+
+                    sed -i "s/\(.*_dependency \"$gemname\"\)".*"/\1, \"~> $version\"/g" *.gemspec
+
+                    if [[ "$gemname" = "$target_gemname" ]]; then
+                      if [[ -z "$(sed -n "s/\(.*_dependency \"$gemname\"\).*\"/\1/p" *.gemspec)" ]];
+                      then
+                        echo 'No pre-existing version, adding version';
+                        replacement="spec\\.add_development_dependency \"$gemname\", \"~> $version\""
+                        sed -e "0,/add.*dependency/{/add.*dependency/a\  $replacement" -e "}" -i -- *.gemspec
+                      else
+                        echo 'nothing to do';
+                      fi;
+                    fi;
+                  done;
+
+                  echo 'cat *.gemspec'
+                  cat *.gemspec
+
+                  echo 'bundle install --local --no-cache'
+                  bundle install --local --no-cache
+            - run:
+                name: Gem version after upgrade
+                command: |
+                  read -r target_gemname target_version \<<< $( echo "<< parameters.gem-version >>" | sed 's/\(.*\)-\([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)*\)/\1 \2/g')
+                  version=$(bundle list | sed -n "s/[[:space:]]*\* $target_gemname (\(.*\))/\1/p")
+                  if [[ -z "$version" ]]; then
+                    echo "${target_gemname} was somehow not installed."
+                    exit 1
+                  else
+                    echo $version;
+                  fi
+
+jobs:
+  run_tests_ruby:
+    parameters:
+      executor:
+        type: string
+        default: ruby
+      parallelism:
+        type: integer
+        default: 1
+      resource_class:
+        type: string
+        default: small
+      gem-version:
+        description: |
+          The name and version number (e.g. rails-7.0.3) you want installed, specified to the patch version.
+        type: string
+        default: ''
+      ruby-version:
+        type: string
+        default: '3.1'
+      pre-actions:
+        description: Steps to perform any necessary setup after dependencies are installed.
+        type: steps
+        default:
+          - run:
+              name: Wait for ElasticSearch
+              command: dockerize -wait http://127.0.0.1:9200 -timeout 1m
+      actions:
+        description: The actions that fulfill the primary purpose of the CI job (tests/checks/etc.)
+        type: steps
+        default:
+          - run_rspec_tests
+      post-actions:
+        description: Any artifacting/reporting/cleanup that must occur after the main
+          actions.
+        type: steps
+        default:
+          - store_test_results:
+              path: tmp/test-results
+    executor:
+      name: "<< parameters.executor >>"
+      ruby-version: "<< parameters.ruby-version >>"
+    resource_class: "<< parameters.resource_class >>"
+    parallelism: "<< parameters.parallelism >>"
+    steps:
+      - ci-utils/ci_checkout
+      - bundle_install
+      - install_gem_version:
+          gem-version: "<< parameters.gem-version >>"
+      - steps: "<< parameters.pre-actions >>"
+      - steps: "<< parameters.actions >>"
+      - steps: "<< parameters.post-actions >>"
+      - ci-utils/quietly_store_artifacts
 
 workflows:
-  version: 2
-  trunk:
-    jobs:
-      - build_2_7:
-          <<: *master_only
-      - build_3_0:
-          <<: *master_only
-      - build_3_1:
-          <<: *master_only
-      - gem/build:
-          <<: *master_only
-          executor: ruby-latest
-          name: gem-build
-          requires:
-            - build_3_1
-
-  pull-requests:
-    jobs:
-      - build_2_7:
-          <<: *pr_only
-      - build_3_0:
-          <<: *pr_only
-      - build_3_1:
-          <<: *pr_only
-      - gem/build:
-          <<: *pr_only
-          executor: ruby-latest
-          name: gem-build
-          requires:
-            - build_3_1
-      - pre-release-approval:
-          <<: *pr_only
-          type: approval
-          requires:
-            - gem-build
-      - gem/publish:
-          <<: *pr_only
-          name: gem-publish
-          to_rubygems: false
-          to_nexus: true
-          pre_release: true
-          requires:
-            - pre-release-approval
-          context: artifact_publishing
-
-  final-release:
+  main:
     jobs:
-      - build_2_7:
-          <<: *version_tags_only
-      - build_3_0:
-          <<: *version_tags_only
-      - build_3_1:
-          <<: *version_tags_only
-      - gem/build:
-          <<: *version_tags_only
-          executor: ruby-latest
-          name: gem-build
-          requires:
-            - build_3_1
-      - gem/publish:
-          <<: *version_tags_only
-          name: gem-publish
-          to_rubygems: true
-          pre_release: false
-          requires:
-            - gem-build
-          context: artifact_publishing
+      - run_tests_ruby:
+          executor: ruby
+          context: nexus_readonly
+          <<: *ruby-version-matrix
+          name: run_tests_ruby-ruby-<< matrix.ruby-version >>

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.2.1] - 2024-12-03
+### Changed
+- Compatibility with Rails 7.2 and beyond
+
+## [1.1.0] - 2023-05-02
+### Changed
+- Updated the max elasticsearch dependency version to < 8.7
 
 ## [1.0.1] - 2022-08-16
 ### Changed

data/Gemfile.lock

@@ -1,102 +1,106 @@
 PATH
   remote: .
   specs:
-    es-elasticity (1.0.1)
-      activemodel (>= 5.2.0, < 7.1)
-      activerecord (>= 5.2.0, < 7.1)
-      activesupport (>= 5.2.0, < 7.1)
-      elasticsearch (>= 7, < 8)
+    es-elasticity (1.2.1)
+      activemodel (>= 5.2.0, < 8)
+      activerecord (>= 5.2.0, < 8)
+      activesupport (>= 5.2.0, < 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)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (7.2.2)
+      activesupport (= 7.2.2)
+    activerecord (7.2.2)
+      activemodel (= 7.2.2)
+      activesupport (= 7.2.2)
+      timeout (>= 0.4.0)
+    activesupport (7.2.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    byebug (11.0.1)
-    codeclimate-test-reporter (1.0.9)
-      simplecov (<= 0.13)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.10)
-    diff-lcs (1.3)
-    elasticsearch (7.17.1)
-      elasticsearch-api (= 7.17.1)
-      elasticsearch-transport (= 7.17.1)
-    elasticsearch-api (7.17.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.8)
+    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)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    drb (2.2.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.14.6)
       concurrent-ruby (~> 1.0)
-    method_source (0.9.2)
-    minitest (5.16.2)
+    logger (1.6.1)
+    method_source (1.1.0)
+    minitest (5.25.1)
     multi_json (1.15.0)
-    multipart-post (2.2.3)
-    oj (3.10.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    oj (3.16.7)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
+    ostruct (0.6.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (10.5.0)
     redis (4.1.3)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby2_keywords (0.0.5)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    securerandom (0.3.1)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
     timecop (0.9.5)
-    tzinfo (2.0.5)
+    timeout (0.4.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.3.4)
+  bundler (~> 2.5)
   byebug
   codeclimate-test-reporter
   es-elasticity!
@@ -104,10 +108,10 @@ DEPENDENCIES
   pry
   rake (~> 10.0)
   redis
-  rspec (~> 3.1.0)
+  rspec (~> 3.13.0)
   rspec_junit_formatter
-  simplecov (~> 0.7.1)
+  simplecov (~> 0.22.0)
   timecop
 
 BUNDLED WITH
-   2.3.4
+   2.5.23

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

@@ -21,20 +21,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.3.4"
+  spec.add_development_dependency "bundler", "~> 2.5"
   spec.add_development_dependency "byebug"
   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 "redis"
-  spec.add_development_dependency "rspec", "~> 3.1.0"
+  spec.add_development_dependency "rspec", "~> 3.13.0"
   spec.add_development_dependency "rspec_junit_formatter"
-  spec.add_development_dependency "simplecov", "~> 0.7.1"
+  spec.add_development_dependency "simplecov", "~> 0.22.0"
   spec.add_development_dependency "timecop"
 
-  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 "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.7"
+  spec.add_dependency "elastic-transport", ">= 8.0", "< 8.7"
 end

data/lib/elasticity/index_config.rb

@@ -84,8 +84,9 @@ module Elasticity
     end
 
     def warn_deprecated_config
+      deprecation = ActiveSupport::Deprecation.new("next major release", "es-elasticity")
       DEPRECATED_ATTRS.each do |attr|
-        ActiveSupport::Deprecation.warn(
+        deprecation.warn(
           "#{attr} is deprecated and will be "\
           "removed in the next major release."
         ) if public_send(attr).present?

data/lib/elasticity/multi_search_response_parser.rb

@@ -16,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/strategies/alias_index.rb

@@ -108,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)
@@ -174,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
 
@@ -264,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
 
@@ -278,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

@@ -80,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
 
@@ -94,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/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "1.0.1"
+  VERSION = "1.2.1"
 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.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -223,7 +223,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -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:
@@ -255,7 +275,6 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".simplecov"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -304,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: ActiveModel-based library for working with Elasticsearch

data/.rubocop.yml

@@ -1,23 +0,0 @@
----
-inherit_gem:
-  dox-style:
-    - ".rubocop.yml"
-
-Env/UseFetch:
-  Exclude:
-    - "./bin/*"
-
-Metrics/BlockLength:
-  Exclude:
-    - "./**/*_spec*.rb"
-    - "./*.gemspec"
-    - "./spec/*_helper*.rb"
-    - "Gemfile"
-
-Metrics/ModuleLength:
-  Exclude:
-    - "./**/*_spec*.rb"
-
-Metrics/MethodLength:
-  Exclude:
-    - "./**/*_spec*.rb"