chewy 7.1.0 → 7.2.0

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

@@ -1,47 +1,41 @@
 require 'spec_helper'
 
-describe Chewy::Type::Mapping do
-  let(:product) { ProductsIndex::Product }
-  let(:review)  { ReviewsIndex::Review }
+describe Chewy::Index::Mapping do
+  let(:product) { ProductsIndex }
+  let(:review)  { ReviewsIndex }
 
   before do
     stub_index(:products) do
-      define_type :product do
-        root do
-          field :name, 'surname'
-          field :title, type: 'text' do
-            field :subfield1
-          end
-          field 'price', type: 'float' do
-            field :subfield2
-          end
-          agg :named_agg do
-            {avg: {field: 'title.subfield1'}}
-          end
+      root do
+        field :name, 'surname'
+        field :title, type: 'text' do
+          field :subfield1
         end
-      end
-    end
-    stub_index(:reviews) do
-      define_type :review do
-        field :title, :body
-        field :comments do
-          field :message
-          field :rating, type: 'long'
+        field 'price', type: 'float' do
+          field :subfield2
         end
         agg :named_agg do
-          {avg: {field: 'comments.rating'}}
+          {avg: {field: 'title.subfield1'}}
         end
       end
     end
+    stub_index(:reviews) do
+      field :title, :body
+      field :comments do
+        field :message
+        field :rating, type: 'long'
+      end
+      agg :named_agg do
+        {avg: {field: 'comments.rating'}}
+      end
+    end
   end
 
   context 'no root element call' do
     before do
       stub_index(:products) do
-        define_type :product do
-          field :title, type: 'text' do
-            field :subfield1
-          end
+        field :title, type: 'text' do
+          field :subfield1
         end
       end
     end
@@ -59,7 +53,7 @@ describe Chewy::Type::Mapping do
         Chewy.default_root_options = previous_options
       end
 
-      specify { expect(product.mappings_hash).to include(_all: {enabled: false}) }
+      specify { expect(product.mappings_hash[:mappings]).to include(_all: {enabled: false}) }
     end
   end
 
@@ -83,33 +77,33 @@ describe Chewy::Type::Mapping do
   end
 
   describe '.mappings_hash' do
-    specify { expect(product.mappings_hash).to eq(product.root.mappings_hash) }
+    specify { expect(product.mappings_hash[:mappings]).to eq(product.root.mappings_hash) }
 
     context 'root merging' do
       context do
         before do
           stub_index(:products) do
-            define_type :product do
-              root other_option: 'nothing' do
-                field :name do
-                  field :last_name # will be redefined in the following root flock
-                end
-              end
-              root other_option: 'option_value' do
-                field :identifier
-                field :name, type: 'integer'
+            root other_option: 'nothing' do
+              field :name do
+                field :last_name # will be redefined in the following root flock
               end
             end
+            root other_option: 'option_value' do
+              field :identifier
+              field :name, type: 'integer'
+            end
           end
         end
 
         specify do
           expect(product.mappings_hash).to eq(
-            properties: {
-              name: {type: 'integer'},
-              identifier: {type: Chewy.default_field_type}
-            },
-            other_option: 'option_value'
+            mappings: {
+              properties: {
+                name: {type: 'integer'},
+                identifier: {type: Chewy.default_field_type}
+              },
+              other_option: 'option_value'
+            }
           )
         end
       end
@@ -117,24 +111,22 @@ describe Chewy::Type::Mapping do
   end
 
   describe '.supports_outdated_sync?' do
-    def type(&block)
-      stub_index(:cities) do
-        define_type :city, &block
-      end
-      CitiesIndex::City
+    def index(&block)
+      stub_index(:cities, &block)
+      CitiesIndex
     end
 
-    specify { expect(type.supports_outdated_sync?).to eq(false) }
-    specify { expect(type { field :updated_at }.supports_outdated_sync?).to eq(true) }
-    specify { expect(type { field :updated_at, value: -> {} }.supports_outdated_sync?).to eq(false) }
+    specify { expect(index.supports_outdated_sync?).to eq(false) }
+    specify { expect(index { field :updated_at }.supports_outdated_sync?).to eq(true) }
+    specify { expect(index { field :updated_at, value: -> {} }.supports_outdated_sync?).to eq(false) }
     specify do
-      expect(type do
+      expect(index do
         self.outdated_sync_field = :version
         field :updated_at
       end.supports_outdated_sync?).to eq(false)
     end
     specify do
-      expect(type do
+      expect(index do
         self.outdated_sync_field = :version
         field :version
       end.supports_outdated_sync?).to eq(true)

data/spec/chewy/index/observe_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe Chewy::Index::Observe do
+  describe '.update_index' do
+    before do
+      stub_index(:dummies)
+    end
+
+    let(:backreferenced) { Array.new(3) { |i| double(id: i) } }
+
+    specify do
+      expect { DummiesIndex.update_index(backreferenced) }
+        .to raise_error Chewy::UndefinedUpdateStrategy
+    end
+    specify do
+      expect { DummiesIndex.update_index([]) }
+        .not_to update_index('dummies')
+    end
+    specify do
+      expect { DummiesIndex.update_index(nil) }
+        .not_to update_index('dummies')
+    end
+  end
+
+  context 'integration', :orm do
+    let(:update_condition) { true }
+
+    before do
+      stub_model(:city) do
+        update_index(-> { 'cities' }, :self)
+        update_index('countries') { changes['country_id'] || previous_changes['country_id'] || country }
+      end
+
+      stub_model(:country) do
+        update_index('cities', if: -> { update_condition }) { cities }
+        update_index(-> { 'countries' }, :self)
+        attr_accessor :update_condition
+      end
+
+      City.belongs_to :country
+      Country.has_many :cities
+
+      stub_index(:cities) do
+        index_scope City
+      end
+
+      stub_index(:countries) do
+        index_scope Country
+      end
+    end
+
+    context do
+      let!(:country1) { Chewy.strategy(:atomic) { Country.create!(id: 1, update_condition: update_condition) } }
+      let!(:country2) { Chewy.strategy(:atomic) { Country.create!(id: 2, update_condition: update_condition) } }
+      let!(:city) { Chewy.strategy(:atomic) { City.create!(id: 1, country: country1) } }
+
+      specify { expect { city.save! }.to update_index('cities').and_reindex(city).only }
+      specify { expect { city.save! }.to update_index('countries').and_reindex(country1).only }
+
+      specify { expect { city.update!(country: nil) }.to update_index('cities').and_reindex(city).only }
+      specify { expect { city.update!(country: nil) }.to update_index('countries').and_reindex(country1).only }
+
+      specify { expect { city.update!(country: country2) }.to update_index('cities').and_reindex(city).only }
+      specify do
+        expect { city.update!(country: country2) }
+          .to update_index('countries').and_reindex(country1, country2).only
+      end
+    end
+
+    context do
+      let!(:country) do
+        Chewy.strategy(:atomic) do
+          cities = Array.new(2) { |i| City.create!(id: i) }
+          Country.create!(id: 1, cities: cities, update_condition: update_condition)
+        end
+      end
+
+      specify { expect { country.save! }.to update_index('cities').and_reindex(country.cities).only }
+      specify { expect { country.save! }.to update_index('countries').and_reindex(country).only }
+
+      context 'conditional update' do
+        let(:update_condition) { false }
+        specify { expect { country.save! }.not_to update_index('cities') }
+      end
+    end
+  end
+
+  context 'transactions', :active_record do
+    context do
+      before { stub_model(:city) { update_index 'cities', :self } }
+      before { stub_index(:cities) { index_scope City } }
+
+      specify do
+        Chewy.strategy(:urgent) do
+          ActiveRecord::Base.transaction do
+            expect { City.create! }.not_to update_index('cities')
+          end
+        end
+      end
+    end
+
+    context do
+      before { allow(Chewy).to receive_messages(use_after_commit_callbacks: false) }
+      before { stub_model(:city) { update_index 'cities', :self } }
+      before { stub_index(:cities) { index_scope City } }
+
+      specify do
+        Chewy.strategy(:urgent) do
+          ActiveRecord::Base.transaction do
+            expect { City.create! }.to update_index('cities')
+          end
+        end
+      end
+    end
+  end
+end

data/spec/chewy/index/settings_spec.rb

@@ -118,7 +118,9 @@ describe Chewy::Index::Settings do
       end
 
       context do
-        before { allow(Chewy).to receive_messages(configuration: {index: {number_of_shards: 7, number_of_replicas: 2}}) }
+        before do
+          allow(Chewy).to receive_messages(configuration: {index: {number_of_shards: 7, number_of_replicas: 2}})
+        end
 
         specify do
           expect(described_class.new.to_hash)

data/spec/chewy/index/specification_spec.rb

@@ -5,44 +5,34 @@ describe Chewy::Index::Specification do
 
   let(:index1) do
     stub_index(:places) do
-      define_type(:city) do
-        field :founded_on, type: 'date'
-      end
+      field :founded_on, type: 'date'
     end
   end
 
   let(:index2) do
     stub_index(:places) do
       settings analyzer: {}
-      define_type(:city) do
-        field :founded_on, type: 'date'
-      end
+      field :founded_on, type: 'date'
     end
   end
 
   let(:index3) do
     stub_index(:places) do
-      define_type(:city) do
-        field :founded_on, type: 'date'
-        field :population, type: 'integer'
-      end
+      field :founded_on, type: 'date'
+      field :population, type: 'integer'
     end
   end
 
   let(:index4) do
     stub_index(:places) do
-      define_type(:city) do
-        field :population, type: 'integer'
-        field :founded_on, type: 'date'
-      end
+      field :population, type: 'integer'
+      field :founded_on, type: 'date'
     end
   end
 
   let(:index5) do
     stub_index('namespace/cities') do
-      define_type(:city) do
-        field :population, type: 'integer'
-      end
+      field :population, type: 'integer'
     end
   end
 

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

@@ -1,36 +1,34 @@
 require 'spec_helper'
 
-describe Chewy::Type::Syncer, :orm do
+describe Chewy::Index::Syncer, :orm do
   before { Chewy.massacre }
   before do
     stub_model(:city)
     stub_index(:cities) do
-      define_type City do
-        field :name
-        field :updated_at, type: 'date'
-      end
+      index_scope City
+      field :name
+      field :updated_at, type: 'date'
     end
   end
 
   shared_examples 'sync' do |options = {}|
     let!(:cities) { Array.new(3) { |i| City.create!(name: "Name#{i + 1}") } }
-    subject { described_class.new(CitiesIndex::City, **options) }
+    subject { described_class.new(CitiesIndex, **options) }
 
     describe '#perform' do
-      before { CitiesIndex::City.import!(cities) }
+      before { CitiesIndex.import!(cities) }
       specify { expect(subject.perform).to eq(0) }
 
       context do
         before do
           cities.first.destroy
-          sleep(1) if ActiveSupport::VERSION::STRING < '4.1.0'
           cities.last.update(name: 'Name5')
         end
         let!(:additional_city) { City.create!(name: 'Name4') }
 
         specify { expect(subject.perform).to eq(3) }
         specify do
-          expect { subject.perform }.to update_index(CitiesIndex::City)
+          expect { subject.perform }.to update_index(CitiesIndex)
             .and_reindex(additional_city, cities.last)
             .and_delete(cities.first).only
         end
@@ -39,9 +37,8 @@ describe Chewy::Type::Syncer, :orm do
       context 'does not support outdated sync' do
         before do
           stub_index(:cities) do
-            define_type City do
-              field :name
-            end
+            index_scope City
+            field :name
           end
         end
 
@@ -56,7 +53,7 @@ describe Chewy::Type::Syncer, :orm do
 
           specify { expect(subject.perform).to eq(2) }
           specify do
-            expect { subject.perform }.to update_index(CitiesIndex::City)
+            expect { subject.perform }.to update_index(CitiesIndex)
               .and_reindex(additional_city)
               .and_delete(cities.first).only
           end
@@ -68,7 +65,7 @@ describe Chewy::Type::Syncer, :orm do
       specify { expect(subject.missing_ids).to match_array(cities.map(&:id).map(&:to_s)) }
 
       context do
-        before { CitiesIndex::City.import!(cities) }
+        before { CitiesIndex.import!(cities) }
         specify { expect(subject.missing_ids).to eq([]) }
 
         context do
@@ -83,12 +80,11 @@ describe Chewy::Type::Syncer, :orm do
       specify { expect(subject.outdated_ids).to eq([]) }
 
       context do
-        before { CitiesIndex::City.import!(cities) }
+        before { CitiesIndex.import!(cities) }
         specify { expect(subject.outdated_ids).to eq([]) }
 
         context do
           before do
-            sleep(1) if ActiveSupport::VERSION::STRING < '4.1.0'
             cities.first.update(name: 'Name4')
             cities.last.update(name: 'Name5')
           end
@@ -99,9 +95,8 @@ describe Chewy::Type::Syncer, :orm do
       context 'does not support outdated sync' do
         before do
           stub_index(:cities) do
-            define_type City do
-              field :name
-            end
+            index_scope City
+            field :name
           end
         end
 

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

@@ -1,25 +1,23 @@
 require 'spec_helper'
 
-describe Chewy::Type::Witchcraft do
+describe Chewy::Index::Witchcraft do
   def self.mapping(&block)
     before do
       stub_index(:products) do
-        define_type :product do
-          witchcraft!
+        witchcraft!
 
-          instance_exec(&block)
-        end
+        instance_exec(&block)
       end
     end
   end
 
   describe '#cauldron' do
-    let(:type) { ProductsIndex::Product }
+    let(:index) { ProductsIndex }
     let(:object) {}
 
     context 'empty mapping' do
       mapping {}
-      specify { expect(type.cauldron.brew(object)).to eq({}) }
+      specify { expect(index.cauldron.brew(object)).to eq({}) }
     end
 
     context do
@@ -32,18 +30,18 @@ describe Chewy::Type::Witchcraft do
 
       context do
         let(:object) { double(attributes) }
-        specify { expect(type.cauldron.brew(object)).to eq(attributes.as_json) }
+        specify { expect(index.cauldron.brew(object)).to eq(attributes.as_json) }
       end
 
       context do
         let(:object) { attributes }
-        specify { expect(type.cauldron.brew(object)).to eq(attributes.as_json) }
+        specify { expect(index.cauldron.brew(object)).to eq(attributes.as_json) }
       end
 
       context do
         let(:object) { double(attributes) }
         specify do
-          expect(type.cauldron(fields: %i[name tags]).brew(object))
+          expect(index.cauldron(fields: %i[name tags]).brew(object))
             .to eq('name' => 'Name', 'tags' => %w[Ruby RoR])
         end
       end
@@ -51,7 +49,7 @@ describe Chewy::Type::Witchcraft do
       context do
         let(:object) { attributes }
         specify do
-          expect(type.cauldron(fields: %i[name tags]).brew(object))
+          expect(index.cauldron(fields: %i[name tags]).brew(object))
             .to eq('name' => 'Name', 'tags' => %w[Ruby RoR])
         end
       end
@@ -69,7 +67,7 @@ describe Chewy::Type::Witchcraft do
 
       context do
         let(:object) { double(attributes) }
-        specify { expect(type.cauldron.brew(object)).to eq(attributes.merge(tags: %i[Ruby RoR]).as_json) }
+        specify { expect(index.cauldron.brew(object)).to eq(attributes.merge(tags: %i[Ruby RoR]).as_json) }
       end
     end
 
@@ -82,7 +80,7 @@ describe Chewy::Type::Witchcraft do
       context do
         let(:object) { double(attributes) }
         let(:crutches) { double(names: ['Other']) }
-        specify { expect(type.cauldron.brew(object, crutches)).to eq({name: 'Other'}.as_json) }
+        specify { expect(index.cauldron.brew(object, crutches)).to eq({name: 'Other'}.as_json) }
       end
     end
 
@@ -102,7 +100,7 @@ describe Chewy::Type::Witchcraft do
           ])
         end
         specify do
-          expect(type.cauldron.brew(object)).to eq({queries: [
+          expect(index.cauldron.brew(object)).to eq({queries: [
             {title: 'Title1', body: 'This Body1'},
             {title: 'Title2', body: 'This Body2'}
           ]}.as_json)
@@ -124,7 +122,7 @@ describe Chewy::Type::Witchcraft do
           ])
         end
         specify do
-          expect(type.cauldron.brew(object)).to eq({queries: [
+          expect(index.cauldron.brew(object)).to eq({queries: [
             {title: 'Title1', body: 'This Body1'},
             {title: 'Title2', body: 'This Body2'}
           ]}.as_json)
@@ -146,7 +144,7 @@ describe Chewy::Type::Witchcraft do
           ])
         end
         specify do
-          expect(type.cauldron.brew(object)).to eq({queries: [
+          expect(index.cauldron.brew(object)).to eq({queries: [
             {title: 'Title1', body: 'This Body1'},
             {title: 'Title2', body: 'This Body2'}
           ]}.as_json)
@@ -172,7 +170,7 @@ describe Chewy::Type::Witchcraft do
           ])
         end
         specify do
-          expect(type.cauldron.brew(object, double(second: 'Crutch'))).to eq({queries: [
+          expect(index.cauldron.brew(object, double(second: 'Crutch'))).to eq({queries: [
             {fields: [
               {first: 'First1', second: 'Value1Second1'},
               {first: 'First2', second: 'Value1Crutch'}
@@ -193,7 +191,7 @@ describe Chewy::Type::Witchcraft do
           double(not_present: nil)
         end
         specify do
-          expect(type.cauldron.brew(object)).to eq({not_present: nil}.as_json)
+          expect(index.cauldron.brew(object)).to eq({not_present: nil}.as_json)
         end
       end
     end
@@ -208,7 +206,7 @@ describe Chewy::Type::Witchcraft do
 
       context do
         let(:object) { double(attributes) }
-        specify { expect(type.cauldron.brew(object)).to eq(attributes.as_json) }
+        specify { expect(index.cauldron.brew(object)).to eq(attributes.as_json) }
       end
     end
 
@@ -224,7 +222,7 @@ describe Chewy::Type::Witchcraft do
 
       context do
         let(:object) { double(attributes) }
-        specify { expect(type.cauldron.brew(object)).to eq(attributes.as_json) }
+        specify { expect(index.cauldron.brew(object)).to eq(attributes.as_json) }
       end
     end
 
@@ -235,12 +233,12 @@ describe Chewy::Type::Witchcraft do
 
       context do
         let(:object) { double(last_name: 'Name') }
-        specify { expect(type.cauldron.brew(object)).to eq({name: 'Name'}.as_json) }
+        specify { expect(index.cauldron.brew(object)).to eq({name: 'Name'}.as_json) }
       end
 
       context do
         let(:object) { {'last_name' => 'Name'} }
-        specify { expect(type.cauldron.brew(object)).to eq({name: 'Name'}.as_json) }
+        specify { expect(index.cauldron.brew(object)).to eq({name: 'Name'}.as_json) }
       end
     end
   end