chewy 7.1.0 → 7.2.0

data/spec/chewy_spec.rb

@@ -5,115 +5,29 @@ describe Chewy do
     expect(Chewy::VERSION).not_to be nil
   end
 
-  describe '.derive_type' do
+  describe '.derive_name' do
     before do
       stub_const('SomeIndex', Class.new)
 
-      stub_index(:developers) do
-        define_type :developer
-      end
+      stub_index(:developers)
 
-      stub_index('namespace/autocomplete') do
-        define_type :developer
-      end
+      stub_index('namespace/autocomplete')
     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(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) }
-  end
-
-  describe '.derive_types' do
-    before do
-      stub_const('SomeIndex', Class.new)
-
-      stub_index(:developers) do
-        define_type :developer
-      end
-
-      stub_index('namespace/autocomplete') do
-        define_type :developer
-      end
-    end
-
-    specify { expect { described_class.derive_types('some#developers') }.to raise_error(Chewy::UnderivableType, /SomeIndex/) }
-    specify { expect { described_class.derive_types('borogoves#developers') }.to raise_error(Chewy::UnderivableType, /Borogoves/) }
-    specify { expect { described_class.derive_types('developers#borogoves') }.to raise_error(Chewy::UnderivableType, /DevelopersIndex.*borogoves/) }
-
-    specify { expect(described_class.derive_types(Namespace::AutocompleteIndex)).to match_array(Namespace::AutocompleteIndex.types) }
-    specify { expect(described_class.derive_types(DevelopersIndex::Developer)).to eq([DevelopersIndex::Developer]) }
-
-    specify { expect(described_class.derive_types('developers_index')).to eq([DevelopersIndex::Developer]) }
-    specify { expect(described_class.derive_types('developers')).to eq([DevelopersIndex::Developer]) }
-    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]) }
-  end
-
-  describe '.create_type' do
-    before { stub_index(:cities) }
-
-    context 'Symbol' do
-      subject { described_class.create_type(CitiesIndex, :city) }
-
-      it { is_expected.to be_a Class }
-      it { is_expected.to be < Chewy::Type }
-      its(:name) { should == 'CitiesIndex::City' }
-      its(:index) { should == CitiesIndex }
-      its(:type_name) { should == 'city' }
-    end
-
-    context 'simple model' do
-      before { stub_class(:city) }
-      subject { described_class.create_type(CitiesIndex, City) }
-
-      it { is_expected.to be_a Class }
-      it { is_expected.to be < Chewy::Type }
-      its(:name) { should == 'CitiesIndex::City' }
-      its(:index) { should == CitiesIndex }
-      its(:type_name) { should == 'city' }
-    end
-
-    context 'model scope', :orm do
-      before { stub_model(:city) }
-      subject { described_class.create_type(CitiesIndex, City.where(rating: 1)) }
-
-      it { is_expected.to be_a Class }
-      it { is_expected.to be < Chewy::Type }
-      its(:name) { should == 'CitiesIndex::City' }
-      its(:index) { should == CitiesIndex }
-      its(:type_name) { should == 'city' }
+    specify do
+      expect { described_class.derive_name('some') }
+        .to raise_error(Chewy::UndefinedIndex, /SomeIndex/)
     end
-
-    context 'Namespaced index' do
-      before { stub_class(:city) }
-      before { stub_index('namespace/cities') }
-
-      subject { described_class.create_type(Namespace::CitiesIndex, City) }
-
-      it { is_expected.to be_a Class }
-      it { is_expected.to be < Chewy::Type }
-      its(:name) { should == 'Namespace::CitiesIndex::City' }
-      its(:index) { should == Namespace::CitiesIndex }
-      its(:type_name) { should == 'city' }
+    specify do
+      expect { described_class.derive_name('borogoves') }
+        .to raise_error(Chewy::UndefinedIndex, /Borogoves/)
     end
 
-    context 'Namespaced model' do
-      before { stub_class('namespace/city') }
-
-      subject { described_class.create_type(CitiesIndex, Namespace::City) }
-
-      it { is_expected.to be_a Class }
-      it { is_expected.to be < Chewy::Type }
-      its(:name) { should == 'CitiesIndex::City' }
-      its(:index) { should == CitiesIndex }
-      its(:type_name) { should == 'city' }
+    specify { expect(described_class.derive_name(DevelopersIndex)).to eq(DevelopersIndex) }
+    specify { expect(described_class.derive_name('developers_index')).to eq(DevelopersIndex) }
+    specify { expect(described_class.derive_name('developers')).to eq(DevelopersIndex) }
+    specify do
+      expect(described_class.derive_name('namespace/autocomplete')).to eq(Namespace::AutocompleteIndex)
     end
   end
 

data/spec/spec_helper.rb

@@ -2,12 +2,7 @@ require 'bundler'
 
 Bundler.require
 
-begin
-  require 'active_record'
-  require 'sequel'
-rescue LoadError
-  nil
-end
+require 'active_record'
 
 require 'rspec/its'
 require 'rspec/collection_matchers'
@@ -43,20 +38,6 @@ RSpec.configure do |config|
 
   config.include FailHelpers
   config.include ClassHelpers
-
-  Aws.config.update(stub_responses: true) if defined?(::Aws)
 end
 
-if defined?(::ActiveRecord)
-  require 'support/active_record'
-elsif defined?(::Mongoid)
-  require 'support/mongoid'
-elsif defined?(::Sequel)
-  require 'support/sequel'
-else
-  RSpec.configure do |config|
-    %i[orm mongoid active_record sequel].each do |group|
-      config.filter_run_excluding(group)
-    end
-  end
-end
+require 'support/active_record'

data/spec/support/active_record.rb

@@ -2,10 +2,13 @@ require 'database_cleaner'
 
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: 'file::memory:?cache=shared', pool: 10)
 ActiveRecord::Base.logger = Logger.new('/dev/null')
-ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks)
+if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks)
+  ActiveRecord::Base.raise_in_transactional_callbacks = true
+end
 
 ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'countries'")
 ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'cities'")
+ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'locations'")
 ActiveRecord::Schema.define do
   create_table :countries do |t|
     t.column :name, :string
@@ -17,9 +20,17 @@ ActiveRecord::Schema.define do
   create_table :cities do |t|
     t.column :country_id, :integer
     t.column :name, :string
+    t.column :historical_name, :string
+    t.column :description, :string
     t.column :rating, :integer
     t.column :updated_at, :datetime
   end
+
+  create_table :locations do |t|
+    t.column :city_id, :integer
+    t.column :lat, :string
+    t.column :lon, :string
+  end
 end
 
 module ActiveRecordClassHelpers
@@ -47,7 +58,9 @@ module ActiveRecordClassHelpers
       &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?
+    if ofending_queries.present?
+      raise "Expected no DB queries, but the following ones were made: #{ofending_queries.join(', ')}"
+    end
   end
 
   def stub_model(name, superclass = nil, &block)
@@ -58,9 +71,6 @@ end
 RSpec.configure do |config|
   config.include ActiveRecordClassHelpers
 
-  config.filter_run_excluding :mongoid
-  config.filter_run_excluding :sequel
-
   config.before(:suite) do
     DatabaseCleaner.clean_with :truncation
     DatabaseCleaner.strategy = :truncation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Toptal, LLC
@@ -9,22 +9,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: resque_spec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +101,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -244,16 +216,15 @@ 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"
 - ".yardopts"
-- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -265,10 +236,8 @@ files:
 - chewy.gemspec
 - filters
 - 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
 - lib/chewy/backports/duplicable.rb
@@ -278,9 +247,24 @@ files:
 - lib/chewy/fields/root.rb
 - lib/chewy/index.rb
 - lib/chewy/index/actions.rb
+- lib/chewy/index/adapter/active_record.rb
+- lib/chewy/index/adapter/base.rb
+- lib/chewy/index/adapter/object.rb
+- lib/chewy/index/adapter/orm.rb
 - lib/chewy/index/aliases.rb
+- lib/chewy/index/crutch.rb
+- lib/chewy/index/import.rb
+- lib/chewy/index/import/bulk_builder.rb
+- lib/chewy/index/import/bulk_request.rb
+- lib/chewy/index/import/journal_builder.rb
+- lib/chewy/index/import/routine.rb
+- lib/chewy/index/mapping.rb
+- lib/chewy/index/observe.rb
 - lib/chewy/index/settings.rb
 - lib/chewy/index/specification.rb
+- lib/chewy/index/syncer.rb
+- lib/chewy/index/witchcraft.rb
+- lib/chewy/index/wrapper.rb
 - lib/chewy/journal.rb
 - lib/chewy/log_subscriber.rb
 - lib/chewy/minitest.rb
@@ -297,7 +281,6 @@ files:
 - lib/chewy/search.rb
 - lib/chewy/search/loader.rb
 - lib/chewy/search/pagination/kaminari.rb
-- 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
@@ -347,33 +330,11 @@ files:
 - lib/chewy/strategy/atomic.rb
 - lib/chewy/strategy/base.rb
 - lib/chewy/strategy/bypass.rb
-- lib/chewy/strategy/resque.rb
-- lib/chewy/strategy/shoryuken.rb
 - lib/chewy/strategy/sidekiq.rb
 - lib/chewy/strategy/urgent.rb
-- lib/chewy/type.rb
-- lib/chewy/type/actions.rb
-- lib/chewy/type/adapter/active_record.rb
-- lib/chewy/type/adapter/base.rb
-- lib/chewy/type/adapter/mongoid.rb
-- lib/chewy/type/adapter/object.rb
-- lib/chewy/type/adapter/orm.rb
-- lib/chewy/type/adapter/sequel.rb
-- lib/chewy/type/crutch.rb
-- lib/chewy/type/import.rb
-- lib/chewy/type/import/bulk_builder.rb
-- lib/chewy/type/import/bulk_request.rb
-- lib/chewy/type/import/journal_builder.rb
-- lib/chewy/type/import/routine.rb
-- lib/chewy/type/mapping.rb
-- lib/chewy/type/observe.rb
-- lib/chewy/type/syncer.rb
-- lib/chewy/type/witchcraft.rb
-- lib/chewy/type/wrapper.rb
 - lib/chewy/version.rb
 - lib/generators/chewy/install_generator.rb
 - lib/generators/templates/chewy.yml
-- lib/sequel/plugins/chewy_observe.rb
 - lib/tasks/chewy.rake
 - migration_guide.md
 - spec/chewy/config_spec.rb
@@ -381,9 +342,21 @@ files:
 - spec/chewy/fields/root_spec.rb
 - spec/chewy/fields/time_fields_spec.rb
 - spec/chewy/index/actions_spec.rb
+- spec/chewy/index/adapter/active_record_spec.rb
+- spec/chewy/index/adapter/object_spec.rb
 - spec/chewy/index/aliases_spec.rb
+- spec/chewy/index/import/bulk_builder_spec.rb
+- spec/chewy/index/import/bulk_request_spec.rb
+- spec/chewy/index/import/journal_builder_spec.rb
+- spec/chewy/index/import/routine_spec.rb
+- spec/chewy/index/import_spec.rb
+- spec/chewy/index/mapping_spec.rb
+- spec/chewy/index/observe_spec.rb
 - spec/chewy/index/settings_spec.rb
 - spec/chewy/index/specification_spec.rb
+- spec/chewy/index/syncer_spec.rb
+- spec/chewy/index/witchcraft_spec.rb
+- spec/chewy/index/wrapper_spec.rb
 - spec/chewy/index_spec.rb
 - spec/chewy/journal_spec.rb
 - spec/chewy/minitest/helpers_spec.rb
@@ -397,8 +370,6 @@ files:
 - spec/chewy/search/loader_spec.rb
 - spec/chewy/search/pagination/kaminari_examples.rb
 - spec/chewy/search/pagination/kaminari_spec.rb
-- spec/chewy/search/pagination/will_paginate_examples.rb
-- spec/chewy/search/pagination/will_paginate_spec.rb
 - spec/chewy/search/parameters/aggs_spec.rb
 - spec/chewy/search/parameters/bool_storage_examples.rb
 - spec/chewy/search/parameters/docvalue_fields_spec.rb
@@ -443,33 +414,13 @@ files:
 - spec/chewy/stash_spec.rb
 - spec/chewy/strategy/active_job_spec.rb
 - spec/chewy/strategy/atomic_spec.rb
-- spec/chewy/strategy/resque_spec.rb
-- spec/chewy/strategy/shoryuken_spec.rb
 - spec/chewy/strategy/sidekiq_spec.rb
 - spec/chewy/strategy_spec.rb
-- spec/chewy/type/actions_spec.rb
-- spec/chewy/type/adapter/active_record_spec.rb
-- spec/chewy/type/adapter/mongoid_spec.rb
-- spec/chewy/type/adapter/object_spec.rb
-- spec/chewy/type/adapter/sequel_spec.rb
-- spec/chewy/type/import/bulk_builder_spec.rb
-- spec/chewy/type/import/bulk_request_spec.rb
-- spec/chewy/type/import/journal_builder_spec.rb
-- spec/chewy/type/import/routine_spec.rb
-- spec/chewy/type/import_spec.rb
-- spec/chewy/type/mapping_spec.rb
-- spec/chewy/type/observe_spec.rb
-- spec/chewy/type/syncer_spec.rb
-- spec/chewy/type/witchcraft_spec.rb
-- spec/chewy/type/wrapper_spec.rb
-- spec/chewy/type_spec.rb
 - spec/chewy_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/class_helpers.rb
 - spec/support/fail_helpers.rb
-- spec/support/mongoid.rb
-- spec/support/sequel.rb
 homepage: https://github.com/toptal/chewy
 licenses:
 - MIT
@@ -499,9 +450,21 @@ test_files:
 - spec/chewy/fields/root_spec.rb
 - spec/chewy/fields/time_fields_spec.rb
 - spec/chewy/index/actions_spec.rb
+- spec/chewy/index/adapter/active_record_spec.rb
+- spec/chewy/index/adapter/object_spec.rb
 - spec/chewy/index/aliases_spec.rb
+- spec/chewy/index/import/bulk_builder_spec.rb
+- spec/chewy/index/import/bulk_request_spec.rb
+- spec/chewy/index/import/journal_builder_spec.rb
+- spec/chewy/index/import/routine_spec.rb
+- spec/chewy/index/import_spec.rb
+- spec/chewy/index/mapping_spec.rb
+- spec/chewy/index/observe_spec.rb
 - spec/chewy/index/settings_spec.rb
 - spec/chewy/index/specification_spec.rb
+- spec/chewy/index/syncer_spec.rb
+- spec/chewy/index/witchcraft_spec.rb
+- spec/chewy/index/wrapper_spec.rb
 - spec/chewy/index_spec.rb
 - spec/chewy/journal_spec.rb
 - spec/chewy/minitest/helpers_spec.rb
@@ -515,8 +478,6 @@ test_files:
 - spec/chewy/search/loader_spec.rb
 - spec/chewy/search/pagination/kaminari_examples.rb
 - spec/chewy/search/pagination/kaminari_spec.rb
-- spec/chewy/search/pagination/will_paginate_examples.rb
-- spec/chewy/search/pagination/will_paginate_spec.rb
 - spec/chewy/search/parameters/aggs_spec.rb
 - spec/chewy/search/parameters/bool_storage_examples.rb
 - spec/chewy/search/parameters/docvalue_fields_spec.rb
@@ -561,30 +522,10 @@ test_files:
 - spec/chewy/stash_spec.rb
 - spec/chewy/strategy/active_job_spec.rb
 - spec/chewy/strategy/atomic_spec.rb
-- spec/chewy/strategy/resque_spec.rb
-- spec/chewy/strategy/shoryuken_spec.rb
 - spec/chewy/strategy/sidekiq_spec.rb
 - spec/chewy/strategy_spec.rb
-- spec/chewy/type/actions_spec.rb
-- spec/chewy/type/adapter/active_record_spec.rb
-- spec/chewy/type/adapter/mongoid_spec.rb
-- spec/chewy/type/adapter/object_spec.rb
-- spec/chewy/type/adapter/sequel_spec.rb
-- spec/chewy/type/import/bulk_builder_spec.rb
-- spec/chewy/type/import/bulk_request_spec.rb
-- spec/chewy/type/import/journal_builder_spec.rb
-- spec/chewy/type/import/routine_spec.rb
-- spec/chewy/type/import_spec.rb
-- spec/chewy/type/mapping_spec.rb
-- spec/chewy/type/observe_spec.rb
-- spec/chewy/type/syncer_spec.rb
-- spec/chewy/type/witchcraft_spec.rb
-- spec/chewy/type/wrapper_spec.rb
-- spec/chewy/type_spec.rb
 - spec/chewy_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/class_helpers.rb
 - spec/support/fail_helpers.rb
-- spec/support/mongoid.rb
-- spec/support/sequel.rb