chewy 7.1.0 → 7.2.0

data/spec/chewy/{type → index}/import/routine_spec.rb

@@ -1,14 +1,12 @@
 require 'spec_helper'
 
 # TODO: add more specs here later
-describe Chewy::Type::Import::Routine do
+describe Chewy::Index::Import::Routine do
   before { Chewy.massacre }
   before do
     stub_index(:cities) do
-      define_type :city do
-        field :name
-        field :object, type: 'object'
-      end
+      field :name
+      field :object, type: 'object'
     end
     CitiesIndex.create!
   end
@@ -18,7 +16,7 @@ describe Chewy::Type::Import::Routine do
 
   describe '#options' do
     specify do
-      expect(described_class.new(CitiesIndex::City).options).to eq(
+      expect(described_class.new(CitiesIndex).options).to eq(
         journal: nil,
         refresh: true,
         update_failover: true,
@@ -29,7 +27,7 @@ describe Chewy::Type::Import::Routine do
 
     specify do
       expect(described_class.new(
-        CitiesIndex::City, batch_size: 100, bulk_size: 1.megabyte, refresh: false
+        CitiesIndex, batch_size: 100, bulk_size: 1.megabyte, refresh: false
       ).options).to eq(
         journal: nil,
         refresh: false,
@@ -43,7 +41,7 @@ describe Chewy::Type::Import::Routine do
     context do
       before { allow(Chewy).to receive_messages(configuration: Chewy.configuration.merge(journal: true)) }
       specify do
-        expect(described_class.new(CitiesIndex::City).options).to eq(
+        expect(described_class.new(CitiesIndex).options).to eq(
           journal: true,
           refresh: true,
           update_failover: true,
@@ -55,24 +53,26 @@ describe Chewy::Type::Import::Routine do
 
     specify do
       expect(CitiesIndex.client).to receive(:bulk).with(hash_including(refresh: true))
-      described_class.new(CitiesIndex::City).process(index: index)
+      described_class.new(CitiesIndex).process(index: index)
     end
 
     specify do
       expect(CitiesIndex.client).to receive(:bulk).with(hash_including(refresh: false))
-      described_class.new(CitiesIndex::City, refresh: false).process(index: index)
+      described_class.new(CitiesIndex, refresh: false).process(index: index)
     end
   end
 
   describe '#parallel_options' do
-    specify { expect(described_class.new(CitiesIndex::City).parallel_options).to be_nil }
-    specify { expect(described_class.new(CitiesIndex::City, parallel: true).parallel_options).to eq({}) }
-    specify { expect(described_class.new(CitiesIndex::City, parallel: 3).parallel_options).to eq(in_processes: 3) }
-    specify { expect(described_class.new(CitiesIndex::City, parallel: {in_threads: 2}).parallel_options).to eq(in_threads: 2) }
+    specify { expect(described_class.new(CitiesIndex).parallel_options).to be_nil }
+    specify { expect(described_class.new(CitiesIndex, parallel: true).parallel_options).to eq({}) }
+    specify { expect(described_class.new(CitiesIndex, parallel: 3).parallel_options).to eq(in_processes: 3) }
+    specify do
+      expect(described_class.new(CitiesIndex, parallel: {in_threads: 2}).parallel_options).to eq(in_threads: 2)
+    end
   end
 
   describe '#stats' do
-    subject { described_class.new(CitiesIndex::City) }
+    subject { described_class.new(CitiesIndex) }
 
     specify { expect(subject.stats).to eq({}) }
     specify do
@@ -92,7 +92,7 @@ describe Chewy::Type::Import::Routine do
   end
 
   describe '#errors' do
-    subject { described_class.new(CitiesIndex::City) }
+    subject { described_class.new(CitiesIndex) }
     let(:index) { [double(id: 1, name: 'Name', object: ''), double(id: 2, name: 'Name', object: {})] }
 
     specify { expect(subject.errors).to eq([]) }

data/spec/chewy/{type → index}/import_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Chewy::Type::Import do
+describe Chewy::Index::Import do
   before { Chewy.massacre }
 
   before do
@@ -9,14 +9,13 @@ describe Chewy::Type::Import do
 
   before do
     stub_index(:cities) do
-      define_type City do
-        field :name
-      end
+      index_scope City
+      field :name
     end
   end
 
   def imported_cities
-    CitiesIndex::City.all.map do |city|
+    CitiesIndex.all.map do |city|
       city.attributes.except('_score', '_explanation')
     end
   end
@@ -37,13 +36,13 @@ describe Chewy::Type::Import do
     specify 'lazy (default)' do
       expect(CitiesIndex).to receive(:exists?).and_call_original
       expect(CitiesIndex).to receive(:create!).and_call_original
-      CitiesIndex::City.import(dummy_city)
+      CitiesIndex.import(dummy_city)
     end
 
     specify 'lazy without objects' do
       expect(CitiesIndex).not_to receive(:exists?)
       expect(CitiesIndex).not_to receive(:create!)
-      CitiesIndex::City.import([])
+      CitiesIndex.import([])
     end
 
     context 'skip' do
@@ -58,7 +57,7 @@ describe Chewy::Type::Import do
       specify do
         expect(CitiesIndex).not_to receive(:exists?)
         expect(CitiesIndex).not_to receive(:create!)
-        CitiesIndex::City.import(dummy_city)
+        CitiesIndex.import(dummy_city)
       end
     end
   end
@@ -69,35 +68,36 @@ describe Chewy::Type::Import do
     specify { expect(import(dummy_cities)).to eq(true) }
     specify { expect(import(dummy_cities.map(&:id))).to eq(true) }
 
-    specify { expect { import([]) }.not_to update_index(CitiesIndex::City) }
-    specify { expect { import }.to update_index(CitiesIndex::City).and_reindex(dummy_cities) }
-    specify { expect { import dummy_cities }.to update_index(CitiesIndex::City).and_reindex(dummy_cities) }
-    specify { expect { import dummy_cities.map(&:id) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities) }
+    specify { expect { import([]) }.not_to update_index(CitiesIndex) }
+    specify { expect { import }.to update_index(CitiesIndex).and_reindex(dummy_cities) }
+    specify { expect { import dummy_cities }.to update_index(CitiesIndex).and_reindex(dummy_cities) }
+    specify { expect { import dummy_cities.map(&:id) }.to update_index(CitiesIndex).and_reindex(dummy_cities) }
 
     describe 'criteria-driven importing' do
       let(:names) { %w[name0 name1] }
 
-      context 'mongoid', :mongoid do
-        specify { expect { import(City.where(:name.in => names)) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities.first(2)) }
-        specify { expect { import(City.where(:name.in => names).map(&:id)) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities.first(2)) }
-      end
-
       context 'active record', :active_record do
-        specify { expect { import(City.where(name: names)) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities.first(2)) }
-        specify { expect { import(City.where(name: names).map(&:id)) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities.first(2)) }
+        specify do
+          expect { import(City.where(name: names)) }
+            .to update_index(CitiesIndex).and_reindex(dummy_cities.first(2))
+        end
+        specify do
+          expect { import(City.where(name: names).map(&:id)) }
+            .to update_index(CitiesIndex).and_reindex(dummy_cities.first(2))
+        end
       end
     end
 
     specify do
       dummy_cities.first.destroy
       expect { import dummy_cities }
-        .to update_index(CitiesIndex::City).and_reindex(dummy_cities.from(1)).and_delete(dummy_cities.first)
+        .to update_index(CitiesIndex).and_reindex(dummy_cities.from(1)).and_delete(dummy_cities.first)
     end
 
     specify do
       dummy_cities.first.destroy
       expect { import dummy_cities.map(&:id) }
-        .to update_index(CitiesIndex::City).and_reindex(dummy_cities.from(1)).and_delete(dummy_cities.first)
+        .to update_index(CitiesIndex).and_reindex(dummy_cities.from(1)).and_delete(dummy_cities.first)
     end
 
     specify do
@@ -120,7 +120,10 @@ describe Chewy::Type::Import do
     context ':bulk_size' do
       let!(:dummy_cities) { Array.new(3) { |i| City.create(id: i + 1, name: "name#{i}" * 20) } }
 
-      specify { expect { import(dummy_cities, bulk_size: 1.2.kilobyte) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities) }
+      specify do
+        expect { import(dummy_cities, bulk_size: 1.2.kilobyte) }
+          .to update_index(CitiesIndex).and_reindex(dummy_cities)
+      end
 
       context do
         before { expect(Chewy.client).to receive(:bulk).exactly(3).times.and_call_original }
@@ -132,36 +135,25 @@ describe Chewy::Type::Import do
       before do
         names = %w[name0 name1]
 
-        criteria = case adapter
-        when :mongoid
-          {:name.in => names}
-        else
-          {name: names}
-        end
+        criteria = {name: names}
 
         stub_index(:cities) do
-          define_type City.where(criteria) do
-            field :name
-          end
+          index_scope City.where(criteria)
+          field :name
         end
       end
 
-      specify { expect { import }.to update_index(CitiesIndex::City).and_reindex(dummy_cities.first(2)) }
-
-      context 'mongoid', :mongoid do
-        specify do
-          expect { import City.where(_id: dummy_cities.first.id) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities.first).only
-        end
-      end
+      specify { expect { import }.to update_index(CitiesIndex).and_reindex(dummy_cities.first(2)) }
 
       context 'active record', :active_record do
         specify do
-          expect { import City.where(id: dummy_cities.first.id) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities.first).only
+          expect { import City.where(id: dummy_cities.first.id) }
+            .to update_index(CitiesIndex).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))
+          allow(CitiesIndex).to receive(:import_linear).and_return(double(present?: false))
+          allow(CitiesIndex).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)
@@ -175,28 +167,27 @@ describe Chewy::Type::Import do
         payload = subscribe_notification
         dummy_cities.first.destroy
         import dummy_cities
-        expect(payload).to eq(type: CitiesIndex::City, import: {delete: 1, index: 2})
+        expect(payload).to eq(index: CitiesIndex, import: {delete: 1, index: 2})
       end
 
       specify do
         payload = subscribe_notification
         dummy_cities.first.destroy
         import dummy_cities, batch_size: 2
-        expect(payload).to eq(type: CitiesIndex::City, import: {delete: 1, index: 2})
+        expect(payload).to eq(index: CitiesIndex, import: {delete: 1, index: 2})
       end
 
       specify do
         payload = subscribe_notification
         import dummy_cities, batch_size: 2
-        expect(payload).to eq(type: CitiesIndex::City, import: {index: 3})
+        expect(payload).to eq(index: CitiesIndex, import: {index: 3})
       end
 
       context do
         before do
           stub_index(:cities) do
-            define_type City do
-              field :name, type: 'object'
-            end
+            index_scope City
+            field :name, type: 'object'
           end
         end
 
@@ -210,7 +201,7 @@ describe Chewy::Type::Import do
         specify do
           payload = subscribe_notification
           import dummy_cities, batch_size: 2
-          expect(payload).to eq(type: CitiesIndex::City,
+          expect(payload).to eq(index: CitiesIndex,
             errors: {index: {mapper_parsing_exception => %w[1 2 3]}},
             import: {index: 3})
         end
@@ -218,7 +209,7 @@ describe Chewy::Type::Import do
     end
 
     context 'fields' do
-      before { CitiesIndex::City.import!(dummy_cities.first(2)) }
+      before { CitiesIndex.import!(dummy_cities.first(2)) }
 
       context do
         before { expect(Chewy.client).to receive(:bulk).twice.and_call_original }
@@ -226,7 +217,7 @@ describe Chewy::Type::Import do
       end
 
       context do
-        before { CitiesIndex::City.import!(dummy_cities.last) }
+        before { CitiesIndex.import!(dummy_cities.last) }
         before { expect(Chewy.client).to receive(:bulk).once.and_call_original }
         specify { expect(import(dummy_cities, update_fields: [:name])).to eq(true) }
       end
@@ -235,10 +226,8 @@ describe Chewy::Type::Import do
     context 'fields integrational' do
       before do
         stub_index(:cities) do
-          define_type :city do
-            field :name
-            field :object, type: 'object'
-          end
+          field :name
+          field :object, type: 'object'
         end
       end
 
@@ -266,9 +255,14 @@ describe Chewy::Type::Import do
         import(objects, update_fields: %i[name])
 
         expect(payload).to eq(
-          errors: {index: {{'type' => 'mapper_parsing_exception', 'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'} => %w[2 4]}},
+          errors: {
+            index: {{
+              'type' => 'mapper_parsing_exception',
+              'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'
+            } => %w[2 4]}
+          },
           import: {index: 6},
-          type: CitiesIndex::City
+          index: CitiesIndex
         )
         expect(imported_cities).to match_array([
           {'id' => '1', 'name' => 'Name11', 'object' => {'foo' => 11}},
@@ -284,9 +278,14 @@ describe Chewy::Type::Import do
         import(objects, batch_size: 2, update_fields: %i[name])
 
         expect(payload).to eq(
-          errors: {index: {{'type' => 'mapper_parsing_exception', 'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'} => %w[2 4]}},
+          errors: {
+            index: {{
+              'type' => 'mapper_parsing_exception',
+              'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'
+            } => %w[2 4]}
+          },
           import: {index: 6},
-          type: CitiesIndex::City
+          index: CitiesIndex
         )
         expect(imported_cities).to match_array([
           {'id' => '1', 'name' => 'Name11', 'object' => {'foo' => 11}},
@@ -296,7 +295,7 @@ describe Chewy::Type::Import do
       end
 
       context do
-        before { CitiesIndex::City.import!(objects[4]) }
+        before { CitiesIndex.import!(objects[4]) }
 
         specify do
           payload = subscribe_notification
@@ -305,9 +304,14 @@ describe Chewy::Type::Import do
           import(objects, batch_size: 2, update_fields: %i[name])
 
           expect(payload).to eq(
-            errors: {index: {{'type' => 'mapper_parsing_exception', 'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'} => %w[2 4]}},
+            errors: {
+              index: {{
+                'type' => 'mapper_parsing_exception',
+                'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'
+              } => %w[2 4]}
+            },
             import: {index: 6},
-            type: CitiesIndex::City
+            index: CitiesIndex
           )
           expect(imported_cities).to match_array([
             {'id' => '1', 'name' => 'Name11', 'object' => {'foo' => 11}},
@@ -318,7 +322,7 @@ describe Chewy::Type::Import do
       end
 
       context do
-        before { CitiesIndex::City.import!(old_objects[1], old_objects[3], objects[4]) }
+        before { CitiesIndex.import!(old_objects[1], old_objects[3], objects[4]) }
 
         specify do
           payload = subscribe_notification
@@ -328,7 +332,7 @@ describe Chewy::Type::Import do
 
           expect(payload).to eq(
             import: {index: 6},
-            type: CitiesIndex::City
+            index: CitiesIndex
           )
           expect(imported_cities).to match_array([
             {'id' => '1', 'name' => 'Name11', 'object' => {'foo' => 11}},
@@ -347,7 +351,7 @@ describe Chewy::Type::Import do
 
           expect(payload).to eq(
             import: {index: 6},
-            type: CitiesIndex::City
+            index: CitiesIndex
           )
           expect(imported_cities).to match_array([
             {'id' => '1', 'name' => 'Name11', 'object' => {'foo' => 11}},
@@ -379,7 +383,7 @@ describe Chewy::Type::Import do
       end
 
       context do
-        before { CitiesIndex::City.import!(old_objects) }
+        before { CitiesIndex.import!(old_objects) }
 
         specify do
           payload = subscribe_notification
@@ -389,7 +393,7 @@ describe Chewy::Type::Import do
 
           expect(payload).to eq(
             import: {index: 6},
-            type: CitiesIndex::City
+            index: CitiesIndex
           )
           expect(imported_cities).to match_array([
             {'id' => '1', 'name' => 'Name11', 'object' => {'foo' => 1}},
@@ -403,7 +407,7 @@ describe Chewy::Type::Import do
       end
 
       context do
-        before { CitiesIndex::City.import!(old_objects) }
+        before { CitiesIndex.import!(old_objects) }
 
         specify do
           payload = subscribe_notification
@@ -412,9 +416,14 @@ describe Chewy::Type::Import do
           import(objects, update_fields: %i[object])
 
           expect(payload).to eq(
-            errors: {update: {{'type' => 'mapper_parsing_exception', 'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'} => %w[2 4]}},
+            errors: {
+              update: {{
+                'type' => 'mapper_parsing_exception',
+                'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'
+              } => %w[2 4]}
+            },
             import: {index: 6},
-            type: CitiesIndex::City
+            index: CitiesIndex
           )
           expect(imported_cities).to match_array([
             {'id' => '1', 'name' => 'Name1', 'object' => {'foo' => 11}},
@@ -432,9 +441,8 @@ describe Chewy::Type::Import do
       context do
         before do
           stub_index(:cities) do
-            define_type City do
-              field :name, type: 'object'
-            end
+            index_scope City
+            field :name, type: 'object'
           end
         end
 
@@ -446,9 +454,8 @@ describe Chewy::Type::Import do
       context do
         before do
           stub_index(:cities) do
-            define_type City do
-              field :name, type: 'object', value: -> { name == 'name1' ? name : {name: name} }
-            end
+            index_scope City
+            field :name, type: 'object', value: -> { name == 'name1' ? name : {name: name} }
           end
         end
 
@@ -460,19 +467,19 @@ describe Chewy::Type::Import do
 
     context 'default_import_options are set' do
       before do
-        CitiesIndex::City.default_import_options(batch_size: 500)
+        CitiesIndex.default_import_options(batch_size: 500)
       end
 
       specify do
-        expect(CitiesIndex::City.adapter).to receive(:import).with(any_args, hash_including(batch_size: 500))
-        CitiesIndex::City.import
+        expect(CitiesIndex.adapter).to receive(:import).with(any_args, hash_including(batch_size: 500))
+        CitiesIndex.import
       end
     end
   end
 
   describe '.import', :orm do
     def import(*args)
-      CitiesIndex::City.import(*args)
+      CitiesIndex.import(*args)
     end
 
     it_behaves_like 'importing'
@@ -481,7 +488,7 @@ describe Chewy::Type::Import do
       def import(*args)
         options = args.extract_options!
         options[:parallel] = 0
-        CitiesIndex::City.import(*args, options)
+        CitiesIndex.import(*args, options)
       end
 
       it_behaves_like 'importing'
@@ -489,54 +496,51 @@ describe Chewy::Type::Import do
   end
 
   describe '.import!', :orm do
-    specify { expect { CitiesIndex::City.import! }.not_to raise_error }
+    specify { expect { CitiesIndex.import! }.not_to raise_error }
 
     context do
       before do
         stub_index(:cities) do
-          define_type City do
-            field :name, type: 'object'
-          end
+          index_scope City
+          field :name, type: 'object'
         end
       end
 
-      specify { expect { CitiesIndex::City.import!(dummy_cities) }.to raise_error Chewy::ImportFailed }
+      specify { expect { CitiesIndex.import!(dummy_cities) }.to raise_error Chewy::ImportFailed }
     end
   end
 
   describe '.compose' do
     before do
       stub_index(:cities) do
-        define_type :city do
-          crutch :names do |collection|
-            collection.map { |o| [o.name, o.name + '42'] }.to_h
-          end
-          field :name, value: ->(o, c) { c.names[o.name] }
-          field :rating
+        crutch :names do |collection|
+          collection.map { |o| [o.name, "#{o.name}42"] }.to_h
         end
+        field :name, value: ->(o, c) { c.names[o.name] }
+        field :rating
       end
     end
 
     specify do
-      expect(CitiesIndex::City.compose(double(name: 'Name', rating: 42)))
+      expect(CitiesIndex.compose(double(name: 'Name', rating: 42)))
         .to eq('name' => 'Name42', 'rating' => 42)
     end
 
     specify do
-      expect(CitiesIndex::City.compose(double(name: 'Name', rating: 42), fields: %i[name]))
+      expect(CitiesIndex.compose(double(name: 'Name', rating: 42), fields: %i[name]))
         .to eq('name' => 'Name42')
     end
 
     context 'witchcraft' do
-      before { CitiesIndex::City.witchcraft! }
+      before { CitiesIndex.witchcraft! }
 
       specify do
-        expect(CitiesIndex::City.compose(double(name: 'Name', rating: 42)))
+        expect(CitiesIndex.compose(double(name: 'Name', rating: 42)))
           .to eq('name' => 'Name42', 'rating' => 42)
       end
 
       specify do
-        expect(CitiesIndex::City.compose(double(name: 'Name', rating: 42), fields: %i[name]))
+        expect(CitiesIndex.compose(double(name: 'Name', rating: 42), fields: %i[name]))
           .to eq('name' => 'Name42')
       end
     end
@@ -545,12 +549,12 @@ describe Chewy::Type::Import do
       let(:crutches) { double(names: {'Name' => 'Name43'}) }
 
       specify do
-        expect(CitiesIndex::City.compose(double(name: 'Name', rating: 42), crutches))
+        expect(CitiesIndex.compose(double(name: 'Name', rating: 42), crutches))
           .to eq('name' => 'Name43', 'rating' => 42)
       end
 
       specify do
-        expect(CitiesIndex::City.compose(double(name: 'Name', rating: 42), crutches, fields: %i[name]))
+        expect(CitiesIndex.compose(double(name: 'Name', rating: 42), crutches, fields: %i[name]))
           .to eq('name' => 'Name43')
       end
     end