chewy 7.0.1 → 7.1.0

data/spec/chewy/type/import/journal_builder_spec.rb

@@ -29,7 +29,6 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
         expect(subject.bulk_body).to eq([{
           index: {
             _index: 'chewy_journal',
-            _type: 'journal',
             data: {
               'index_name' => 'namespace/cities',
               'type_name' => 'city',
@@ -48,7 +47,6 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
         expect(subject.bulk_body).to eq([{
           index: {
             _index: 'chewy_journal',
-            _type: 'journal',
             data: {
               'index_name' => 'namespace/cities',
               'type_name' => 'city',
@@ -69,7 +67,6 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
         expect(subject.bulk_body).to eq([{
           index: {
             _index: 'chewy_journal',
-            _type: 'journal',
             data: {
               'index_name' => 'namespace/countries',
               'type_name' => 'country',
@@ -81,7 +78,6 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
         }, {
           index: {
             _index: 'chewy_journal',
-            _type: 'journal',
             data: {
               'index_name' => 'namespace/countries',
               'type_name' => 'country',

data/spec/chewy/type/import_spec.rb

@@ -366,8 +366,8 @@ describe Chewy::Type::Import do
 
           # Full match doesn't work here.
           expect(payload[:errors][:update].keys).to match([
-            hash_including('type' => 'document_missing_exception', 'reason' => '[city][1]: document missing'),
-            hash_including('type' => 'document_missing_exception', 'reason' => '[city][3]: document missing')
+            hash_including('type' => 'document_missing_exception', 'reason' => '[_doc][1]: document missing'),
+            hash_including('type' => 'document_missing_exception', 'reason' => '[_doc][3]: document missing')
           ])
           expect(payload[:errors][:update].values).to eq([['1'], ['3']])
           expect(imported_cities).to match_array([

data/spec/chewy/type/mapping_spec.rb

@@ -59,7 +59,7 @@ describe Chewy::Type::Mapping do
         Chewy.default_root_options = previous_options
       end
 
-      specify { expect(product.mappings_hash[:product]).to include(_all: {enabled: false}) }
+      specify { expect(product.mappings_hash).to include(_all: {enabled: false}) }
     end
   end
 
@@ -90,12 +90,11 @@ describe Chewy::Type::Mapping do
         before do
           stub_index(:products) do
             define_type :product do
-              root _parent: 'project', other_option: 'nothing' do
+              root other_option: 'nothing' do
                 field :name do
                   field :last_name # will be redefined in the following root flock
                 end
               end
-              root _parent: 'something_else'
               root other_option: 'option_value' do
                 field :identifier
                 field :name, type: 'integer'
@@ -105,47 +104,16 @@ describe Chewy::Type::Mapping do
         end
 
         specify do
-          expect(product.mappings_hash).to eq(product: {
+          expect(product.mappings_hash).to eq(
             properties: {
               name: {type: 'integer'},
               identifier: {type: Chewy.default_field_type}
             },
-            other_option: 'option_value',
-            _parent: {type: 'something_else'}
-          })
+            other_option: 'option_value'
+          )
         end
       end
     end
-
-    context 'parent-child relationship' do
-      context do
-        before do
-          stub_index(:products) do
-            define_type :product do
-              root _parent: 'project', parent_id: -> { project_id } do
-                field :name, 'surname'
-              end
-            end
-          end
-        end
-
-        specify { expect(product.mappings_hash[:product][:_parent]).to eq(type: 'project') }
-      end
-
-      context do
-        before do
-          stub_index(:products) do
-            define_type :product do
-              root parent: {'type' => 'project'}, parent_id: -> { project_id } do
-                field :name, 'surname'
-              end
-            end
-          end
-        end
-
-        specify { expect(product.mappings_hash[:product][:_parent]).to eq('type' => 'project') }
-      end
-    end
   end
 
   describe '.supports_outdated_sync?' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.0
 platform: ruby
 authors:
 - Toptal, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -248,7 +248,6 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -336,7 +335,6 @@ files:
 - lib/chewy/search/parameters/terminate_after.rb
 - lib/chewy/search/parameters/timeout.rb
 - lib/chewy/search/parameters/track_scores.rb
-- lib/chewy/search/parameters/types.rb
 - lib/chewy/search/parameters/version.rb
 - lib/chewy/search/query_proxy.rb
 - lib/chewy/search/request.rb
@@ -435,7 +433,6 @@ files:
 - spec/chewy/search/parameters/terminate_after_spec.rb
 - spec/chewy/search/parameters/timeout_spec.rb
 - spec/chewy/search/parameters/track_scores_spec.rb
-- spec/chewy/search/parameters/types_spec.rb
 - spec/chewy/search/parameters/version_spec.rb
 - spec/chewy/search/parameters_spec.rb
 - spec/chewy/search/query_proxy_spec.rb
@@ -554,7 +551,6 @@ test_files:
 - spec/chewy/search/parameters/terminate_after_spec.rb
 - spec/chewy/search/parameters/timeout_spec.rb
 - spec/chewy/search/parameters/track_scores_spec.rb
-- spec/chewy/search/parameters/types_spec.rb
 - spec/chewy/search/parameters/version_spec.rb
 - spec/chewy/search/parameters_spec.rb
 - spec/chewy/search/query_proxy_spec.rb

data/.github/workflows/ruby.yml

@@ -1,94 +0,0 @@
-name: CI
-
-on: [push]
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [2.6, 2.7]
-        gemfile: [rails.5.2.activerecord, rails.6.0.activerecord, rails.6.1.activerecord]
-    name: ${{ matrix.ruby }}-${{ matrix.gemfile }}
-
-    env:
-      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Run Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.10.1
-          port: 9250
-      - name: Tests
-        run: bundle exec rspec
-
-  ruby-3-0-activerecord-6-1:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-          bundler-cache: true
-      - name: Run Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 7.10.1
-          port: 9250
-      - name: Tests
-        run: bundle exec rspec
-
-  ruby-3-0-activerecord-6-1-es6:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-          bundler-cache: true
-      - name: Run Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 6.8.15
-          port: 9250
-      - name: Tests
-        run: bundle exec rspec
-
-  ruby-2-7-activerecord-6-1-es6:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-          bundler-cache: true
-      - name: Run Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
-        with:
-          stack-version: 6.8.15
-          port: 9250
-      - name: Tests
-        run: bundle exec rspec
-
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-          bundler-cache: true
-      - run: bundle exec rubocop --format simple

data/lib/chewy/search/parameters/types.rb

@@ -1,20 +0,0 @@
-require 'chewy/search/parameters/storage'
-
-module Chewy
-  module Search
-    class Parameters
-      # A standard string array storage with one exception: rendering is empty.
-      #
-      # @see Chewy::Search::Parameters::StringArrayStorage
-      class Types < Storage
-        include StringArrayStorage
-
-        # Doesn't render anything, has specialized rendering logic in
-        # {Chewy::Search::Request}
-        #
-        # @return [nil]
-        def render; end
-      end
-    end
-  end
-end

data/spec/chewy/search/parameters/types_spec.rb

@@ -1,5 +0,0 @@
-require 'chewy/search/parameters/string_array_storage_examples'
-
-describe Chewy::Search::Parameters::Types do
-  it_behaves_like :string_array_storage, nil
-end