es-elasticity 0.13.5 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c4316c6610d7f5addf5d417e544134b753555bc6108477a883d75adff3fdc0b
-  data.tar.gz: b7ee0ed0e2aa9c1788b97019d33663ecdcfe30a7e093c6bff535d72380ce60b8
+  metadata.gz: 77be59b21060843a1cfd378874a25d43c99b7cda2c264c4aa998ff8bcd70a112
+  data.tar.gz: 5dbaf77099a4ce92ca3b241bd07259b34a5e958afa8389f41ed988a995fd5fb5
 SHA512:
-  metadata.gz: 8caeb93cf0826a4425a2d3dc7d315f22773e97a533846a9fb620cea3f6aba152c737f647ef933db92348930d9a7ee47899d28aa161b7555f2f5e39b68d2e40fd
-  data.tar.gz: 69aab0b5620f1767f4c6c08a2624dafdf18f8337afe95203ece5869932adfd484c8c9dfa3c249daf3af8e4296bb3a3f69f7f7de19d7b9c5650d9cfec583df7ad
+  metadata.gz: 8a0194b307ca27ac3b1359edc2181c0541edd7ed36ce3de02d8be8d0be4b93bdce4ab00780bf6fd4305a852542348cbc9047493f68a3afb98456d9f4995a3046
+  data.tar.gz: b26720d7fa9987c315caa4f7bb08e2eb3d23fb893d8e0b388647a3555d0cfb654348d204249e8afacb2812799877c9225da413bbc1d114294e09b6a8c46a35c4

data/.circleci/config.yml

@@ -4,47 +4,47 @@ orbs:
   gem: doximity/gem-publisher@0
 
 executors:
-
   # used for building the gem
   ruby-latest:
     resource_class: small
     docker:
-      - image: circleci/ruby:latest
+      - image: cimg/ruby:3.1
         environment:
-          BUNDLE_VERSION: "~> 1.17"
+          BUNDLE_VERSION: '~> 2.3.4'
 
   # used for testing the gem:
-  ruby_2_5:
+  ruby_2_7:
     resource_class: small
     docker:
-      - image: circleci/ruby:2.5
+      - image: cimg/ruby:2.7
         environment:
-          BUNDLE_VERSION: "~> 1.17"
-      - image: elastic/elasticsearch:6.8.2
+          BUNDLE_VERSION: '~> 2.3.4'
+      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.3
         environment:
-          - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+          - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
           - discovery.type=single-node
           - xpack.security.enabled=false
-  ruby_2_6:
+  ruby_3_0:
     resource_class: small
     docker:
-      - image: circleci/ruby:2.6
+      - image: cimg/ruby:3.0
         environment:
-          BUNDLE_VERSION: "~> 1.17"
-      - image: elastic/elasticsearch:6.8.2
+          BUNDLE_VERSION: '~> 2.3.4'
+      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.3
         environment:
-          - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+          - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
           - discovery.type=single-node
           - xpack.security.enabled=false
-  ruby_2_7:
+
+  ruby_3_1:
     resource_class: small
     docker:
-      - image: circleci/ruby:2.7
+      - image: cimg/ruby:3.1
         environment:
-          BUNDLE_VERSION: "~> 1.17"
-      - image: elastic/elasticsearch:6.8.2
+          BUNDLE_VERSION: '~> 2.3.4'
+      - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.3
         environment:
-          - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+          - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
           - discovery.type=single-node
           - xpack.security.enabled=false
 
@@ -69,8 +69,8 @@ version_tags_only: &version_tags_only
       only: /^v.*/
 
 jobs:
-  build_2_5:
-    executor: ruby_2_5
+  build_2_7:
+    executor: ruby_2_7
     steps:
       - checkout
       - run:
@@ -79,12 +79,12 @@ jobs:
             gem install bundler --version "${BUNDLE_VERSION}" --force
       - restore_cache:
           keys:
-            - v1-bundle-ruby_2_5-{{ checksum "Gemfile.lock" }}
+            - 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: v1-bundle-ruby_2_5-{{ checksum "Gemfile.lock" }}
+          key: v3-bundle-ruby_2_7-{{ checksum "Gemfile.lock" }}
           paths:
             - vendor/bundle
       - run:
@@ -97,8 +97,8 @@ jobs:
           root: .
           paths:
             - vendor/bundle
-  build_2_6:
-    executor: ruby_2_6
+  build_3_0:
+    executor: ruby_3_0
     steps:
       - checkout
       - run:
@@ -107,12 +107,12 @@ jobs:
             gem install bundler --version "${BUNDLE_VERSION}" --force
       - restore_cache:
           keys:
-            - v1-bundle-ruby_2_6-{{ checksum "Gemfile.lock" }}
+            - v3-bundle-ruby_3_0-{{ 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: v1-bundle-ruby_2_6-{{ checksum "Gemfile.lock" }}
+          key: v3-bundle-ruby_3_0-{{ checksum "Gemfile.lock" }}
           paths:
             - vendor/bundle
       - run:
@@ -125,8 +125,9 @@ jobs:
           root: .
           paths:
             - vendor/bundle
-  build_2_7:
-    executor: ruby_2_7
+
+  build_3_1:
+    executor: ruby_3_1
     steps:
       - checkout
       - run:
@@ -135,12 +136,12 @@ jobs:
             gem install bundler --version "${BUNDLE_VERSION}" --force
       - restore_cache:
           keys:
-            - v1-bundle-ruby_2_7-{{ checksum "Gemfile.lock" }}
+            - v3-bundle-ruby_3_1-{{ 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: v1-bundle-ruby_2_7-{{ checksum "Gemfile.lock" }}
+          key: v3-bundle-ruby_3_1-{{ checksum "Gemfile.lock" }}
           paths:
             - vendor/bundle
       - run:
@@ -158,33 +159,33 @@ workflows:
   version: 2
   trunk:
     jobs:
-      - build_2_5:
+      - build_2_7:
           <<: *master_only
-      - build_2_6:
+      - build_3_0:
           <<: *master_only
-      - build_2_7:
+      - build_3_1:
           <<: *master_only
       - gem/build:
           <<: *master_only
           executor: ruby-latest
           name: gem-build
           requires:
-            - build_2_5
+            - build_3_1
 
   pull-requests:
     jobs:
-      - build_2_5:
+      - build_2_7:
           <<: *pr_only
-      - build_2_6:
+      - build_3_0:
           <<: *pr_only
-      - build_2_7:
+      - build_3_1:
           <<: *pr_only
       - gem/build:
           <<: *pr_only
           executor: ruby-latest
           name: gem-build
           requires:
-            - build_2_5
+            - build_3_1
       - pre-release-approval:
           <<: *pr_only
           type: approval
@@ -193,7 +194,8 @@ workflows:
       - gem/publish:
           <<: *pr_only
           name: gem-publish
-          to_rubygems: true
+          to_rubygems: false
+          to_nexus: true
           pre_release: true
           requires:
             - pre-release-approval
@@ -201,18 +203,18 @@ workflows:
 
   final-release:
     jobs:
-      - build_2_5:
+      - build_2_7:
           <<: *version_tags_only
-      - build_2_6:
+      - build_3_0:
           <<: *version_tags_only
-      - build_2_7:
+      - build_3_1:
           <<: *version_tags_only
       - gem/build:
           <<: *version_tags_only
           executor: ruby-latest
           name: gem-build
           requires:
-            - build_2_5
+            - build_3_1
       - gem/publish:
           <<: *version_tags_only
           name: gem-publish

data/CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [0.14.1] - 2022-08-09
+### Changed
+- Don't publish pre-release builds to RubyGems
+
+## [0.14.0] - 2022-08-04
+### Changed
+- Use `refresh` instead of `flush` where search is expected to be updated
+- Drop support for Ruby 2.5 and 2.6
+- Add support for Ruby 2.7 and 3.0, build against Ruby 3.1
+- Set `search_type` to `query_then_fetch` as we no longer support Elasticsearch version < 7.0
+- Set `include_type_name` when fetching the mapping. Will be removed in the next version to support ES version 8.
+- Index names automatically use the new timestamp format when creating an index.
 
 ## [0.13.5] - 2020-05-21
 ### Changed

data/CONTRIBUTING.md

@@ -1,31 +1,30 @@
-# Contributing
+# Contributing to Doximity
 
 We welcome contributions to this repository. Feel free to submit issues for bugs you encounter and pull requests for code and documentation contributions.
+In order to prevent licensing issues, Doximity Inc. (“Doximity”, “we”, “us”) requires all contributors to agree to an Individual Contributor License Agreement (“CLA”), which is reproduced below.  By submitting your contributions to us, you agree that you have read and are bound by the CLA.  If you do not agree with the CLA, you may not submit contributions.
 
-In order to prevent licensing issues, we require all contributors to sign an individual contributor license agreement, which is reproduced below:
+## Doximity Individual Contributor License Agreement
 
-## Individual Contributor License Agreement
+This license is for your protection as a Contributor as well as the protection of Doximity; it does not change your rights to use your own Contributions for any other purpose.
 
-In order to clarify the intellectual property license granted with Contributions from any person or entity, Doximity, Inc. ("Doximity") must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of Doximity; it does not change your rights to use your own Contributions for any other purpose.
-
-You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Doximity. Except for the license granted herein to Doximity and recipients of software distributed by Doximity, You reserve all right, title, and interest in and to Your Contributions.
+You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Doximity. Except for the license granted herein to Doximity and recipients of software distributed by Doximity, You reserve all right, titles, and interests in and to Your Contributions.
 
 ### Definitions
 
-"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Doximity. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+"You" (or "Your" or the “Contributor”) shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Doximity. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-1. "Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Doximity for inclusion in, or documentation of, any of the products owned or managed by Doximity (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Doximity or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Doximity for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+1. "Contribution" shall mean the code, documentation, or any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Doximity for inclusion in, or documentation of, any of the products owned or managed by Doximity (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Doximity or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Doximity for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
 
 2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to Doximity and to recipients of software distributed by Doximity a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
 
-3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to Doximity and to recipients of software distributed by Doximity a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
+3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to Doximity and to recipients of software distributed by Doximity a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by a combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes a direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
 
-4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to Doximity, or that your employer has executed a separate Corporate CLA with Doximity.
+4. You represent that You are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to Doximity, or that your employer has executed a separate Corporate CLA with Doximity.
 
 5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.
 
-6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
 
-7. Should You wish to submit work that is not Your original creation, You may submit it to Doximity separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [[]named here]".
+7. Should You wish to submit work that is not Your original creation, You may submit it to Doximity separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
 
 8. You agree to notify Doximity of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.

data/Gemfile.lock

@@ -1,48 +1,68 @@
 PATH
   remote: .
   specs:
-    es-elasticity (0.13.5)
-      activemodel (>= 4.0.0, < 7)
-      activerecord (>= 4.0.0, < 7)
-      activesupport (>= 4.0.0, < 7)
-      elasticsearch (>= 1.0)
+    es-elasticity (0.14.1)
+      activemodel (>= 5.2.0, < 7.1)
+      activerecord (>= 5.2.0, < 7.1)
+      activesupport (>= 5.2.0, < 7.1)
+      elasticsearch (>= 7, < 8)
 
 GEM
   remote: https://artifacts.dox.support/repository/gems/
   specs:
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    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)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 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.6)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.3)
-    elasticsearch (7.7.0)
-      elasticsearch-api (= 7.7.0)
-      elasticsearch-transport (= 7.7.0)
-    elasticsearch-api (7.7.0)
+    elasticsearch (7.17.1)
+      elasticsearch-api (= 7.17.1)
+      elasticsearch-transport (= 7.17.1)
+    elasticsearch-api (7.17.1)
       multi_json
-    elasticsearch-transport (7.7.0)
+    elasticsearch-transport (7.17.1)
       faraday (~> 1)
       multi_json
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    i18n (1.8.2)
+    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)
+      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)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.14.1)
-    multi_json (1.14.1)
-    multipart-post (2.1.1)
+    minitest (5.16.2)
+    multi_json (1.15.0)
+    multipart-post (2.2.3)
     oj (3.10.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -63,21 +83,20 @@ GEM
     rspec-support (3.1.2)
     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)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    timecop (0.9.5)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.7)
+  bundler (~> 2.3.4)
   byebug
   codeclimate-test-reporter
   es-elasticity!
@@ -91,4 +110,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.17.3
+   2.3.4

data/README.md

@@ -436,12 +436,12 @@ The default persistence strategy changed from SingleIndex to AliasIndex in versi
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/elasticity/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
-6. Sign the CLA if you haven't yet. See CONTRIBUTING.md
+1. See [CONTRIBUTING.md](./CONTRIBUTING.md)
+2. Fork it ( https://github.com/[my-github-username]/elasticity/fork )
+3. Create your feature branch (`git checkout -b my-new-feature`)
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create a new Pull Request
 
 ## Gem documentation
 

data/es-elasticity.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 2.3.4"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "oj"
@@ -33,8 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.7.1"
   spec.add_development_dependency "timecop"
 
-  spec.add_dependency "activemodel",   ">= 4.0.0", "< 7"
-  spec.add_dependency "activerecord",   ">= 4.0.0", "< 7"
-  spec.add_dependency "activesupport", ">= 4.0.0", "< 7"
-  spec.add_dependency "elasticsearch", ">= 1.0"
+  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"
 end

data/lib/elasticity/search.rb

@@ -186,7 +186,7 @@ module Elasticity
       def search
         return @search if defined?(@search)
         args    = @search_definition.to_search_args
-        args    = args.merge(search_type: ScrollableSearch.search_type, size: @size, scroll: @scroll)
+        args    = args.merge(search_type: :query_then_fetch, size: @size, scroll: @scroll)
         @search = @client.search(args)
       end
     end

data/lib/elasticity/strategies/alias_index.rb

@@ -11,14 +11,16 @@ module Elasticity
 
       STATUSES = [:missing, :ok]
 
-      def initialize(client, index_base_name, document_type, use_new_timestamp_format = false, include_type_name_on_create = true)
+      def initialize(client, index_base_name, document_type, use_new_timestamp_format = true, include_type_name_on_create = true)
         @client       = client
         @main_alias   = index_base_name
         @update_alias = "#{index_base_name}_update"
         @document_type = document_type
 
-        # included for compatibility with v7
+        # Deprecated: The use_new_timestamp_format option is no longer used and will be removed in the next version.
         @use_new_timestamp_format = use_new_timestamp_format
+
+        # included for compatibility with v7
         @include_type_name_on_create = include_type_name_on_create
       end
 
@@ -60,8 +62,8 @@ module Elasticity
             ]
           })
 
-          @client.index_flush(index: original_index)
-          cursor = @client.search index: original_index, search_type: ScrollableSearch.search_type, scroll: '10m', size: 100
+          @client.index_refresh(index: original_index)
+          cursor = @client.search index: original_index, search_type: :query_then_fetch, scroll: '10m', size: 100
           loop do
             hits   = cursor['hits']['hits']
             break if hits.empty?
@@ -130,8 +132,8 @@ module Elasticity
             ]
           })
 
-          @client.index_flush(index: new_index)
-          cursor = @client.search index: new_index, search_type: ScrollableSearch.search_type, scroll: '1m', size: 100
+          @client.index_refresh(index: new_index)
+          cursor = @client.search index: new_index, search_type: :query_then_fetch, scroll: '1m', size: 100
           loop do
             hits   = cursor['hits']['hits']
             break if hits.empty?
@@ -146,7 +148,7 @@ module Elasticity
             cursor = @client.scroll(scroll_id: cursor['_scroll_id'], scroll: '1m')
           end
 
-          @client.index_flush(index: original_index)
+          @client.index_refresh(index: original_index)
           @client.index_update_aliases(body: {
             actions: [
               { remove: { index: new_index, alias: @main_alias } },
@@ -281,7 +283,7 @@ module Elasticity
       end
 
       def mapping
-        @client.index_get_mapping(index: @main_alias, type: @document_type).values.first
+        @client.index_get_mapping(index: @main_alias, type: @document_type, include_type_name: @include_type_name_on_create).values.first
       rescue Elasticsearch::Transport::Transport::Errors::NotFound
         nil
       end
@@ -289,12 +291,7 @@ module Elasticity
       private
 
       def build_index_name
-        ts = String.new
-        if @use_new_timestamp_format == true
-          ts = Time.now.utc.strftime("%Y%m%d%H%M%S%6N")
-        else
-          ts = Time.now.utc.strftime("%Y-%m-%d_%H:%M:%S.%6N")
-        end
+        ts = Time.now.utc.strftime("%Y%m%d%H%M%S%6N")
         "#{@main_alias}-#{ts}"
       end
 

data/lib/elasticity/strategies/single_index.rb

@@ -3,7 +3,7 @@ module Elasticity
     class SingleIndex
       STATUSES = [:missing, :ok]
 
-      def initialize(client, index_name, document_type, use_new_timestamp_format = false, include_type_name_on_create = true)
+      def initialize(client, index_name, document_type, use_new_timestamp_format = true, include_type_name_on_create = true)
         @client        = client
         @index_name    = index_name
         @document_type = document_type
@@ -11,7 +11,7 @@ module Elasticity
         # included for compatibility with v7
         @include_type_name_on_create = include_type_name_on_create
 
-        # not currently used. included for argument compatiblity with AliasStrategy
+        # Deprecated: The use_new_timestamp_format option is no longer used and will be removed in the next version.
         @use_new_timestamp_format = use_new_timestamp_format
       end
 
@@ -99,7 +99,7 @@ module Elasticity
       end
 
       def mapping
-        @client.index_get_mapping(index: @index_name, type: @document_type).values.first
+        @client.index_get_mapping(index: @index_name, type: @document_type, include_type_name: @include_type_name_on_create).values.first
       rescue Elasticsearch::Transport::Transport::Errors::NotFound
         nil
       end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.13.5"
+  VERSION = "0.14.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.14.1
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -170,74 +170,80 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 description: Elasticity provides a higher level abstraction on top of [elasticsearch-ruby](https://github.com/elasticsearch/elasticsearch-ruby)
   gem
 email:
@@ -271,7 +277,6 @@ files:
 - lib/elasticity/multi_search.rb
 - lib/elasticity/multi_search_response_parser.rb
 - lib/elasticity/railtie.rb
-- lib/elasticity/scrollable_search.rb
 - lib/elasticity/search.rb
 - lib/elasticity/segmented_document.rb
 - lib/elasticity/strategies.rb
@@ -299,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: ActiveModel-based library for working with Elasticsearch

data/lib/elasticity/scrollable_search.rb

@@ -1,15 +0,0 @@
-module Elasticity
-  class ScrollableSearch
-    def self.search_type
-      if elasticsearch_gem_version < Gem::Version.create("2.0")
-        :scan
-      else
-        :query_then_fetch
-      end
-    end
-
-    def self.elasticsearch_gem_version
-      Gem.loaded_specs["elasticsearch"].version
-    end
-  end
-end