chewy 5.0.0 → 7.0.1

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

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe Chewy::Type::Import::JournalBuilder, :orm do
   before do
     stub_model(:country)
-    stub_index 'namespace/places' do
+    stub_index 'namespace/cities' do
       define_type :city
+    end
+    stub_index 'namespace/countries' do
       define_type Country
     end
     Timecop.freeze(time)
@@ -13,7 +15,7 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
 
   let(:time) { Time.parse('2017-07-14 12:00Z') }
 
-  let(:type) { Namespace::PlacesIndex::City }
+  let(:type) { Namespace::CitiesIndex::City }
   let(:index) { [] }
   let(:delete) { [] }
   subject { described_class.new(type, index: index, delete: delete) }
@@ -29,7 +31,7 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
             _index: 'chewy_journal',
             _type: 'journal',
             data: {
-              'index_name' => 'namespace/places',
+              'index_name' => 'namespace/cities',
               'type_name' => 'city',
               'action' => 'index',
               'references' => [Base64.encode64('{"id":1,"name":"City"}')],
@@ -48,7 +50,7 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
             _index: 'chewy_journal',
             _type: 'journal',
             data: {
-              'index_name' => 'namespace/places',
+              'index_name' => 'namespace/cities',
               'type_name' => 'city',
               'action' => 'delete',
               'references' => [Base64.encode64('{"id":1,"name":"City"}')],
@@ -60,7 +62,7 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
     end
 
     context do
-      let(:type) { Namespace::PlacesIndex::Country }
+      let(:type) { Namespace::CountriesIndex::Country }
       let(:index) { [Country.new(id: 1, name: 'City')] }
       let(:delete) { [Country.new(id: 2, name: 'City')] }
       specify do
@@ -69,7 +71,7 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
             _index: 'chewy_journal',
             _type: 'journal',
             data: {
-              'index_name' => 'namespace/places',
+              'index_name' => 'namespace/countries',
               'type_name' => 'country',
               'action' => 'index',
               'references' => [Base64.encode64('1')],
@@ -81,7 +83,7 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
             _index: 'chewy_journal',
             _type: 'journal',
             data: {
-              'index_name' => 'namespace/places',
+              'index_name' => 'namespace/countries',
               'type_name' => 'country',
               'action' => 'delete',
               'references' => [Base64.encode64('2')],

data/spec/chewy/type/import_spec.rb

@@ -158,6 +158,15 @@ describe Chewy::Type::Import do
         specify do
           expect { import City.where(id: dummy_cities.first.id) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities.first).only
         end
+
+        specify do
+          allow(CitiesIndex::City).to receive(:import_linear).and_return(double(present?: false))
+          allow(CitiesIndex::City).to receive(:import_parallel).and_return(double(present?: false))
+
+          expects_no_query(except: /SELECT\s+1\s+AS\s+one\s+FROM/) do
+            import City.where(id: dummy_cities.first.id)
+          end
+        end
       end
     end
 

data/spec/chewy/type/mapping_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Chewy::Type::Mapping do
   let(:product) { ProductsIndex::Product }
-  let(:review)  { ProductsIndex::Review }
+  let(:review)  { ReviewsIndex::Review }
 
   before do
     stub_index(:products) do
@@ -20,6 +20,8 @@ describe Chewy::Type::Mapping do
           end
         end
       end
+    end
+    stub_index(:reviews) do
       define_type :review do
         field :title, :body
         field :comments do

data/spec/chewy/type/observe_spec.rb

@@ -75,11 +75,11 @@ describe Chewy::Type::Observe do
       specify { expect { city.save! }.to update_index('cities#city').and_reindex(city).only }
       specify { expect { city.save! }.to update_index('countries#country').and_reindex(country1).only }
 
-      specify { expect { city.update_attributes!(country: nil) }.to update_index('cities#city').and_reindex(city).only }
-      specify { expect { city.update_attributes!(country: nil) }.to update_index('countries#country').and_reindex(country1).only }
+      specify { expect { city.update!(country: nil) }.to update_index('cities#city').and_reindex(city).only }
+      specify { expect { city.update!(country: nil) }.to update_index('countries#country').and_reindex(country1).only }
 
-      specify { expect { city.update_attributes!(country: country2) }.to update_index('cities#city').and_reindex(city).only }
-      specify { expect { city.update_attributes!(country: country2) }.to update_index('countries#country').and_reindex(country1, country2).only }
+      specify { expect { city.update!(country: country2) }.to update_index('cities#city').and_reindex(city).only }
+      specify { expect { city.update!(country: country2) }.to update_index('countries#country').and_reindex(country1, country2).only }
     end
 
     context do

data/spec/chewy/type/witchcraft_spec.rb

@@ -181,6 +181,21 @@ describe Chewy::Type::Witchcraft do
           ]}.as_json)
         end
       end
+
+      context do
+        mapping do
+          field :not_present do
+            field :nothing
+          end
+        end
+
+        let(:object) do
+          double(not_present: nil)
+        end
+        specify do
+          expect(type.cauldron.brew(object)).to eq({not_present: nil}.as_json)
+        end
+      end
     end
 
     context 'dynamic fields' do

data/spec/chewy/type/wrapper_spec.rb

@@ -63,9 +63,11 @@ describe Chewy::Type::Wrapper do
 
       it do
         is_expected.to respond_to(:name_highlight)
+          .and respond_to(:name_highlights)
           .and have_attributes(
             name: 'Martin',
-            name_highlight: '<b>Mar</b>tin'
+            name_highlight: '<b>Mar</b>tin',
+            name_highlights: ['<b>Mar</b>tin']
           )
       end
     end

data/spec/chewy_spec.rb

@@ -15,21 +15,18 @@ describe Chewy do
 
       stub_index('namespace/autocomplete') do
         define_type :developer
-        define_type :company
       end
     end
 
     specify { expect { described_class.derive_type('some#developers') }.to raise_error(Chewy::UnderivableType, /SomeIndex/) }
     specify { expect { described_class.derive_type('borogoves#developers') }.to raise_error(Chewy::UnderivableType, /Borogoves/) }
     specify { expect { described_class.derive_type('developers#borogoves') }.to raise_error(Chewy::UnderivableType, /DevelopersIndex.*borogoves/) }
-    specify { expect { described_class.derive_type('namespace/autocomplete') }.to raise_error(Chewy::UnderivableType, %r{AutocompleteIndex.*namespace/autocomplete#type_name}) }
 
     specify { expect(described_class.derive_type(DevelopersIndex::Developer)).to eq(DevelopersIndex::Developer) }
     specify { expect(described_class.derive_type('developers_index')).to eq(DevelopersIndex::Developer) }
     specify { expect(described_class.derive_type('developers')).to eq(DevelopersIndex::Developer) }
     specify { expect(described_class.derive_type('developers#developer')).to eq(DevelopersIndex::Developer) }
     specify { expect(described_class.derive_type('namespace/autocomplete#developer')).to eq(Namespace::AutocompleteIndex::Developer) }
-    specify { expect(described_class.derive_type('namespace/autocomplete#company')).to eq(Namespace::AutocompleteIndex::Company) }
   end
 
   describe '.derive_types' do
@@ -42,7 +39,6 @@ describe Chewy do
 
       stub_index('namespace/autocomplete') do
         define_type :developer
-        define_type :company
       end
     end
 
@@ -58,7 +54,6 @@ describe Chewy do
     specify { expect(described_class.derive_types('developers#developer')).to eq([DevelopersIndex::Developer]) }
     specify { expect(described_class.derive_types('namespace/autocomplete')).to match_array(Namespace::AutocompleteIndex.types) }
     specify { expect(described_class.derive_types('namespace/autocomplete#developer')).to eq([Namespace::AutocompleteIndex::Developer]) }
-    specify { expect(described_class.derive_types('namespace/autocomplete#company')).to eq([Namespace::AutocompleteIndex::Company]) }
   end
 
   describe '.create_type' do
@@ -130,7 +125,6 @@ describe Chewy do
       stub_index(:admins).create!
       allow(Chewy).to receive_messages(configuration: Chewy.configuration.merge(prefix: 'prefix2'))
       stub_index(:developers).create!
-      stub_index(:companies).create!
 
       Chewy.massacre
 
@@ -139,7 +133,6 @@ describe Chewy do
 
     specify { expect(AdminsIndex.exists?).to eq(true) }
     specify { expect(DevelopersIndex.exists?).to eq(false) }
-    specify { expect(CompaniesIndex.exists?).to eq(false) }
   end
 
   describe '.client' do

data/spec/spec_helper.rb

@@ -21,8 +21,11 @@ require 'support/class_helpers'
 
 require 'chewy/rspec'
 
+host = ENV['ES_HOST'] || 'localhost'
+port = ENV['ES_PORT'] || 9250
+
 Chewy.settings = {
-  host: 'localhost:9250',
+  host: "#{host}:#{port}",
   wait_for_status: 'green',
   index: {
     number_of_shards: 1,
@@ -30,15 +33,8 @@ Chewy.settings = {
   }
 }
 
-Chewy.default_field_type = 'string' if Chewy::Runtime.version < '5.0'
 # Chewy.transport_logger = Logger.new(STDERR)
 
-KEYWORD_FIELD = if Chewy::Runtime.version < '5.0'
-  {type: 'string', index: 'not_analyzed'}
-else
-  {type: 'keyword'}
-end
-
 RSpec.configure do |config|
   config.mock_with :rspec
   config.order = :random

data/spec/support/active_record.rb

@@ -29,6 +29,27 @@ module ActiveRecordClassHelpers
     :active_record
   end
 
+  def expects_db_queries(&block)
+    have_queries = false
+    ActiveSupport::Notifications.subscribed(
+      ->(*_) { have_queries = true },
+      'sql.active_record',
+      &block
+    )
+    raise 'Expected some db queries, but none were made' unless have_queries
+  end
+
+  def expects_no_query(except: nil, &block)
+    queries = []
+    ActiveSupport::Notifications.subscribed(
+      ->(*args) { queries << args[4][:sql] },
+      'sql.active_record',
+      &block
+    )
+    ofending_queries = except ? queries.find_all { |query| !query.match(except) } : queries
+    raise "Expected no DB queries, but the following ones were made: #{ofending_queries.join(', ')}" if ofending_queries.present?
+  end
+
   def stub_model(name, superclass = nil, &block)
     stub_class(name, superclass || ActiveRecord::Base, &block)
   end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 7.0.1
 platform: ruby
 authors:
+- Toptal, LLC
 - pyromaniac
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -86,14 +87,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -198,28 +199,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 6.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch-dsl
   requirement: !ruby/object:Gem::Requirement
@@ -237,36 +238,37 @@ dependencies:
 description: Chewy provides functionality for Elasticsearch index handling, documents
   import mappings and chainable query DSL
 email:
+- open-source@toptal.com
 - kinwizard@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".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"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - ".yardopts"
 - Appraisals
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
-- LEGACY_DSL.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - chewy.gemspec
 - filters
-- gemfiles/rails.4.0.activerecord.gemfile
-- gemfiles/rails.4.1.activerecord.gemfile
-- gemfiles/rails.4.2.activerecord.gemfile
-- gemfiles/rails.4.2.mongoid.5.2.gemfile
-- gemfiles/rails.5.0.activerecord.gemfile
-- gemfiles/rails.5.0.mongoid.6.1.gemfile
-- gemfiles/rails.5.1.activerecord.gemfile
-- gemfiles/rails.5.1.mongoid.6.3.gemfile
 - gemfiles/rails.5.2.activerecord.gemfile
+- gemfiles/rails.5.2.mongoid.6.4.gemfile
+- gemfiles/rails.6.0.activerecord.gemfile
+- gemfiles/rails.6.1.activerecord.gemfile
 - gemfiles/sequel.4.45.gemfile
 - lib/chewy.rb
 - lib/chewy/backports/deep_dup.rb
@@ -285,32 +287,7 @@ files:
 - lib/chewy/minitest.rb
 - lib/chewy/minitest/helpers.rb
 - lib/chewy/minitest/search_index_receiver.rb
-- lib/chewy/query.rb
-- lib/chewy/query/compose.rb
-- lib/chewy/query/criteria.rb
-- lib/chewy/query/filters.rb
-- lib/chewy/query/loading.rb
-- lib/chewy/query/nodes/and.rb
-- lib/chewy/query/nodes/base.rb
-- lib/chewy/query/nodes/bool.rb
-- lib/chewy/query/nodes/equal.rb
-- lib/chewy/query/nodes/exists.rb
-- lib/chewy/query/nodes/expr.rb
-- lib/chewy/query/nodes/field.rb
-- lib/chewy/query/nodes/has_child.rb
-- lib/chewy/query/nodes/has_parent.rb
-- lib/chewy/query/nodes/has_relation.rb
-- lib/chewy/query/nodes/match_all.rb
-- lib/chewy/query/nodes/missing.rb
-- lib/chewy/query/nodes/not.rb
-- lib/chewy/query/nodes/or.rb
-- lib/chewy/query/nodes/prefix.rb
-- lib/chewy/query/nodes/query.rb
-- lib/chewy/query/nodes/range.rb
-- lib/chewy/query/nodes/raw.rb
-- lib/chewy/query/nodes/regexp.rb
-- lib/chewy/query/nodes/script.rb
-- lib/chewy/query/pagination.rb
+- lib/chewy/multi_search.rb
 - lib/chewy/railtie.rb
 - lib/chewy/rake_helper.rb
 - lib/chewy/repository.rb
@@ -324,6 +301,7 @@ files:
 - lib/chewy/search/pagination/will_paginate.rb
 - lib/chewy/search/parameters.rb
 - lib/chewy/search/parameters/aggs.rb
+- lib/chewy/search/parameters/allow_partial_search_results.rb
 - lib/chewy/search/parameters/concerns/bool_storage.rb
 - lib/chewy/search/parameters/concerns/hash_storage.rb
 - lib/chewy/search/parameters/concerns/integer_storage.rb
@@ -334,6 +312,7 @@ files:
 - lib/chewy/search/parameters/explain.rb
 - lib/chewy/search/parameters/filter.rb
 - lib/chewy/search/parameters/highlight.rb
+- lib/chewy/search/parameters/indices.rb
 - lib/chewy/search/parameters/indices_boost.rb
 - lib/chewy/search/parameters/limit.rb
 - lib/chewy/search/parameters/load.rb
@@ -398,6 +377,7 @@ files:
 - lib/generators/templates/chewy.yml
 - lib/sequel/plugins/chewy_observe.rb
 - lib/tasks/chewy.rake
+- migration_guide.md
 - spec/chewy/config_spec.rb
 - spec/chewy/fields/base_spec.rb
 - spec/chewy/fields/root_spec.rb
@@ -410,29 +390,7 @@ files:
 - spec/chewy/journal_spec.rb
 - spec/chewy/minitest/helpers_spec.rb
 - spec/chewy/minitest/search_index_receiver_spec.rb
-- spec/chewy/query/criteria_spec.rb
-- spec/chewy/query/filters_spec.rb
-- spec/chewy/query/loading_spec.rb
-- spec/chewy/query/nodes/and_spec.rb
-- spec/chewy/query/nodes/bool_spec.rb
-- spec/chewy/query/nodes/equal_spec.rb
-- spec/chewy/query/nodes/exists_spec.rb
-- spec/chewy/query/nodes/has_child_spec.rb
-- spec/chewy/query/nodes/has_parent_spec.rb
-- spec/chewy/query/nodes/match_all_spec.rb
-- spec/chewy/query/nodes/missing_spec.rb
-- spec/chewy/query/nodes/not_spec.rb
-- spec/chewy/query/nodes/or_spec.rb
-- spec/chewy/query/nodes/prefix_spec.rb
-- spec/chewy/query/nodes/query_spec.rb
-- spec/chewy/query/nodes/range_spec.rb
-- spec/chewy/query/nodes/raw_spec.rb
-- spec/chewy/query/nodes/regexp_spec.rb
-- spec/chewy/query/nodes/script_spec.rb
-- spec/chewy/query/pagination/kaminari_spec.rb
-- spec/chewy/query/pagination/will_paginate_spec.rb
-- spec/chewy/query/pagination_spec.rb
-- spec/chewy/query_spec.rb
+- spec/chewy/multi_search_spec.rb
 - spec/chewy/rake_helper_spec.rb
 - spec/chewy/repository_spec.rb
 - spec/chewy/rspec/update_index_spec.rb
@@ -450,7 +408,7 @@ files:
 - spec/chewy/search/parameters/filter_spec.rb
 - spec/chewy/search/parameters/hash_storage_examples.rb
 - spec/chewy/search/parameters/highlight_spec.rb
-- spec/chewy/search/parameters/indices_boost_spec.rb
+- spec/chewy/search/parameters/indices_spec.rb
 - spec/chewy/search/parameters/integer_storage_examples.rb
 - spec/chewy/search/parameters/limit_spec.rb
 - spec/chewy/search/parameters/load_spec.rb
@@ -519,7 +477,7 @@ homepage: https://github.com/toptal/chewy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -534,9 +492,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Elasticsearch ODM client wrapper
 test_files:
@@ -552,29 +509,7 @@ test_files:
 - spec/chewy/journal_spec.rb
 - spec/chewy/minitest/helpers_spec.rb
 - spec/chewy/minitest/search_index_receiver_spec.rb
-- spec/chewy/query/criteria_spec.rb
-- spec/chewy/query/filters_spec.rb
-- spec/chewy/query/loading_spec.rb
-- spec/chewy/query/nodes/and_spec.rb
-- spec/chewy/query/nodes/bool_spec.rb
-- spec/chewy/query/nodes/equal_spec.rb
-- spec/chewy/query/nodes/exists_spec.rb
-- spec/chewy/query/nodes/has_child_spec.rb
-- spec/chewy/query/nodes/has_parent_spec.rb
-- spec/chewy/query/nodes/match_all_spec.rb
-- spec/chewy/query/nodes/missing_spec.rb
-- spec/chewy/query/nodes/not_spec.rb
-- spec/chewy/query/nodes/or_spec.rb
-- spec/chewy/query/nodes/prefix_spec.rb
-- spec/chewy/query/nodes/query_spec.rb
-- spec/chewy/query/nodes/range_spec.rb
-- spec/chewy/query/nodes/raw_spec.rb
-- spec/chewy/query/nodes/regexp_spec.rb
-- spec/chewy/query/nodes/script_spec.rb
-- spec/chewy/query/pagination/kaminari_spec.rb
-- spec/chewy/query/pagination/will_paginate_spec.rb
-- spec/chewy/query/pagination_spec.rb
-- spec/chewy/query_spec.rb
+- spec/chewy/multi_search_spec.rb
 - spec/chewy/rake_helper_spec.rb
 - spec/chewy/repository_spec.rb
 - spec/chewy/rspec/update_index_spec.rb
@@ -592,7 +527,7 @@ test_files:
 - spec/chewy/search/parameters/filter_spec.rb
 - spec/chewy/search/parameters/hash_storage_examples.rb
 - spec/chewy/search/parameters/highlight_spec.rb
-- spec/chewy/search/parameters/indices_boost_spec.rb
+- spec/chewy/search/parameters/indices_spec.rb
 - spec/chewy/search/parameters/integer_storage_examples.rb
 - spec/chewy/search/parameters/limit_spec.rb
 - spec/chewy/search/parameters/load_spec.rb