chewy 7.1.0 → 7.2.0

data/spec/chewy/fields/root_spec.rb

@@ -46,18 +46,18 @@ describe Chewy::Fields::Root do
       before do
         stub_model(:city)
         stub_index(:places) do
-          define_type City
+          index_scope City
         end
       end
 
       let(:city) { City.new(name: 'London', rating: 100) }
 
       specify do
-        expect(PlacesIndex::City.root.compose(city))
+        expect(PlacesIndex.root.compose(city))
           .to match(hash_including('name' => 'London', 'rating' => 100))
       end
       specify do
-        expect(PlacesIndex::City.root.compose(city, fields: %i[name borogoves]))
+        expect(PlacesIndex.root.compose(city, fields: %i[name borogoves]))
           .to eq('name' => 'London')
       end
     end
@@ -65,20 +65,18 @@ describe Chewy::Fields::Root do
     context 'has children' do
       before do
         stub_index(:places) do
-          define_type :city do
-            field :name, :rating
-          end
+          field :name, :rating
         end
       end
 
       let(:city) { double(name: 'London', rating: 100) }
 
       specify do
-        expect(PlacesIndex::City.root.compose(city))
+        expect(PlacesIndex.root.compose(city))
           .to eq('name' => 'London', 'rating' => 100)
       end
       specify do
-        expect(PlacesIndex::City.root.compose(city, fields: %i[name borogoves]))
+        expect(PlacesIndex.root.compose(city, fields: %i[name borogoves]))
           .to eq('name' => 'London')
       end
     end
@@ -86,21 +84,19 @@ describe Chewy::Fields::Root do
     context 'root value provided' do
       before do
         stub_index(:places) do
-          define_type :city do
-            root value: ->(o) { {name: o.name + 'Modified', rating: o.rating.next} }
-          end
+          root value: ->(o) { {name: "#{o.name}Modified", rating: o.rating.next} }
         end
       end
 
       let(:city) { double(name: 'London', rating: 100) }
 
       specify do
-        expect(PlacesIndex::City.root.compose(city))
+        expect(PlacesIndex.root.compose(city))
           .to eq('name' => 'LondonModified', 'rating' => 101)
       end
 
       specify do
-        expect(PlacesIndex::City.root.compose(city, fields: %i[name borogoves]))
+        expect(PlacesIndex.root.compose(city, fields: %i[name borogoves]))
           .to eq('name' => 'LondonModified')
       end
     end
@@ -108,11 +104,9 @@ describe Chewy::Fields::Root do
     context 'complex evaluations' do
       before do
         stub_index(:places) do
-          define_type :city do
-            root value: ->(o) { {name: o.name + 'Modified', rating: o.rating.next} } do
-              field :name, value: ->(o) { o[:name] + 'Modified' }
-              field :rating
-            end
+          root value: ->(o) { {name: "#{o.name}Modified", rating: o.rating.next} } do
+            field :name, value: ->(o) { "#{o[:name]}Modified" }
+            field :rating
           end
         end
       end
@@ -120,12 +114,12 @@ describe Chewy::Fields::Root do
       let(:city) { double(name: 'London', rating: 100) }
 
       specify do
-        expect(PlacesIndex::City.root.compose(city))
+        expect(PlacesIndex.root.compose(city))
           .to eq('name' => 'LondonModifiedModified', 'rating' => 101)
       end
 
       specify do
-        expect(PlacesIndex::City.root.compose(city, fields: %i[name borogoves]))
+        expect(PlacesIndex.root.compose(city, fields: %i[name borogoves]))
           .to eq('name' => 'LondonModifiedModified')
       end
     end
@@ -134,14 +128,12 @@ describe Chewy::Fields::Root do
   describe '#child_hash' do
     before do
       stub_index(:places) do
-        define_type :city do
-          field :name, :rating
-        end
+        field :name, :rating
       end
     end
 
     specify do
-      expect(PlacesIndex::City.root.child_hash).to match(
+      expect(PlacesIndex.root.child_hash).to match(
         name: an_instance_of(Chewy::Fields::Base).and(have_attributes(name: :name)),
         rating: an_instance_of(Chewy::Fields::Base).and(have_attributes(name: :rating))
       )

data/spec/chewy/fields/time_fields_spec.rb

@@ -5,14 +5,12 @@ describe 'Time fields' do
 
   before do
     stub_index(:posts) do
-      define_type :post do
-        field :published_at, type: 'date'
-      end
+      field :published_at, type: 'date'
     end
   end
 
   before do
-    PostsIndex::Post.import(
+    PostsIndex.import(
       double(published_at: ActiveSupport::TimeZone[-28_800].parse('2014/12/18 19:00')),
       double(published_at: ActiveSupport::TimeZone[-21_600].parse('2014/12/18 20:00')),
       double(published_at: ActiveSupport::TimeZone[-21_600].parse('2014/12/17 20:00'))
@@ -24,5 +22,7 @@ describe 'Time fields' do
 
   specify { expect(PostsIndex.total).to eq(3) }
   specify { expect(PostsIndex.filter(range: {published_at: {gte: range.min, lte: range.max}}).size).to eq(1) }
-  specify { expect(PostsIndex.filter(range: {published_at: {gt: range.min.utc, lt: (range.max + 1.hour).utc}}).size).to eq(2) }
+  specify do
+    expect(PostsIndex.filter(range: {published_at: {gt: range.min.utc, lt: (range.max + 1.hour).utc}}).size).to eq(2)
+  end
 end

data/spec/chewy/index/actions_spec.rb

@@ -76,9 +76,15 @@ describe Chewy::Index::Actions do
       end
 
       specify do
-        expect { DummiesIndex.create! }.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest).with_message(/already exists.*dummies/)
+        expect do
+          DummiesIndex.create!
+        end.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest).with_message(/already exists.*dummies/)
+      end
+      specify do
+        expect do
+          DummiesIndex.create!('2013')
+        end.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest).with_message(/Invalid alias name \[dummies\]/)
       end
-      specify { expect { DummiesIndex.create!('2013') }.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest).with_message(/Invalid alias name \[dummies\]/) }
     end
 
     context do
@@ -92,7 +98,9 @@ describe Chewy::Index::Actions do
       specify { expect(DummiesIndex.aliases).to eq(['dummies']) }
       specify { expect(DummiesIndex.indexes).to eq(['dummies_2013']) }
       specify do
-        expect { DummiesIndex.create!('2013') }.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest).with_message(/already exists.*dummies_2013/)
+        expect do
+          DummiesIndex.create!('2013')
+        end.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest).with_message(/already exists.*dummies_2013/)
       end
       specify { expect(DummiesIndex.create!('2014')['acknowledged']).to eq(true) }
 
@@ -183,7 +191,11 @@ describe Chewy::Index::Actions do
 
   describe '.delete!' do
     specify { expect { DummiesIndex.delete! }.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound) }
-    specify { expect { DummiesIndex.delete!('2013') }.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound) }
+    specify do
+      expect do
+        DummiesIndex.delete!('2013')
+      end.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
+    end
 
     context do
       before do
@@ -337,7 +349,7 @@ describe Chewy::Index::Actions do
     before do
       stub_model(:city)
       stub_index(:cities) do
-        define_type City
+        index_scope City
       end
     end
     let!(:dummy_cities) { Array.new(3) { |i| City.create(id: i + 1, name: "name#{i}") } }
@@ -359,9 +371,8 @@ describe Chewy::Index::Actions 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
 
@@ -373,7 +384,7 @@ describe Chewy::Index::Actions do
     before do
       stub_model(:city)
       stub_index(:cities) do
-        define_type City
+        index_scope City
       end
     end
     let!(:dummy_cities) { Array.new(3) { |i| City.create(id: i + 1, name: "name#{i}") } }
@@ -395,9 +406,8 @@ describe Chewy::Index::Actions 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
 
@@ -409,7 +419,7 @@ describe Chewy::Index::Actions do
     before do
       stub_model(:city)
       stub_index(:cities) do
-        define_type City
+        index_scope City
       end
     end
 
@@ -500,7 +510,7 @@ describe Chewy::Index::Actions do
           before do
             stub_index(:cities) do
               settings index: {refresh_interval: '2s'}
-              define_type City
+              index_scope City
             end
           end
 
@@ -511,9 +521,11 @@ describe Chewy::Index::Actions do
           end
 
           specify do
-            expect(CitiesIndex.client.indices).to receive(:put_settings).with(index: name, body: before_import_body).once
+            expect(CitiesIndex.client.indices)
+              .to receive(:put_settings).with(index: name, body: before_import_body).once
             expect(CitiesIndex.client.indices).to receive(:put_settings).with(index: name, body: after_import_body).once
-            expect(CitiesIndex).to receive(:import).with(suffix: suffix, journal: false, refresh: false).and_call_original
+            expect(CitiesIndex)
+              .to receive(:import).with(suffix: suffix, journal: false, refresh: false).and_call_original
             expect(CitiesIndex.reset!(suffix)).to eq(true)
           end
 
@@ -574,12 +586,11 @@ describe Chewy::Index::Actions do
     xcontext 'applying journal' do
       before do
         stub_index(:cities) do
-          define_type City do
-            field :name, value: (lambda do
-              sleep(rating)
-              name
-            end)
-          end
+          index_scope City
+          field :name, value: (lambda do
+            sleep(rating)
+            name
+          end)
         end
       end
 
@@ -649,18 +660,253 @@ describe Chewy::Index::Actions do
 
     context 'other options' do
       specify do
-        expect(CitiesIndex::City).to receive(:import).with(parallel: true, journal: false).once.and_return(true)
+        expect(CitiesIndex).to receive(:import).with(parallel: true, journal: false).once.and_return(true)
         expect(CitiesIndex.reset!(parallel: true)).to eq(true)
       end
 
       specify do
-        expect(CitiesIndex::City).to receive(:import).with(suffix: 'suffix', parallel: true, journal: false, refresh: true).once.and_return(true)
+        expect(CitiesIndex)
+          .to receive(:import)
+          .with(suffix: 'suffix', parallel: true, journal: false, refresh: true)
+          .once.and_return(true)
         expect(CitiesIndex.reset!('suffix', parallel: true)).to eq(true)
       end
     end
   end
 
+  describe '.reset' do
+    before do
+      stub_model(:city)
+      stub_index(:cities) do
+        index_scope City
+      end
+    end
+
+    context do
+      before { City.create!(id: 1, name: 'Moscow') }
+
+      specify { expect(CitiesIndex.reset).to eq(true) }
+      specify { expect(CitiesIndex.reset('2013')).to eq(true) }
+
+      context do
+        before { CitiesIndex.reset }
+
+        specify { expect(CitiesIndex.all).to have(1).item }
+        specify { expect(CitiesIndex.aliases).to eq([]) }
+        specify { expect(CitiesIndex.indexes).to eq(['cities']) }
+      end
+    end
+  end
+
+  describe '.sync' do
+    before do
+      stub_model(:city)
+      stub_index(:cities) do
+        index_scope City
+        field :name
+        field :updated_at, type: 'date'
+      end
+    end
+
+    let!(:cities) { Array.new(3) { |i| City.create!(name: "Name#{i + 1}") } }
+
+    before do
+      CitiesIndex.import
+      cities.first.destroy
+      cities.last.update(name: 'Name5')
+    end
+
+    let!(:additional_city) { City.create!(name: 'Name4') }
+
+    specify do
+      expect(CitiesIndex.sync).to match(
+        count: 3,
+        missing: contain_exactly(cities.first.id.to_s, additional_city.id.to_s),
+        outdated: [cities.last.id.to_s]
+      )
+    end
+    specify do
+      expect { CitiesIndex.sync }.to update_index(CitiesIndex)
+        .and_reindex(additional_city, cities.last)
+        .and_delete(cities.first).only
+    end
+  end
+
   describe '.journal' do
     specify { expect(DummiesIndex.journal).to be_a(Chewy::Journal) }
   end
+
+  describe '.clear_cache' do
+    before do
+      stub_model(:city)
+      stub_index(:cities) do
+        index_scope City
+      end
+    end
+
+    let(:index_name) { 'test_index' }
+    let(:index_name_with_prefix) { 'cities_test_index' }
+    let(:unexisted_index_name) { 'wrong_index' }
+
+    context 'with existing index' do
+      before do
+        CitiesIndex.create(index_name)
+      end
+
+      specify do
+        expect(CitiesIndex)
+          .to receive(:clear_cache)
+          .and_call_original
+        expect { CitiesIndex.clear_cache({index: index_name_with_prefix}) }
+          .not_to raise_error
+      end
+    end
+
+    context 'with unexisting index' do
+      specify do
+        expect(CitiesIndex)
+          .to receive(:clear_cache)
+          .and_call_original
+        expect { CitiesIndex.clear_cache({index: unexisted_index_name}) }
+          .to raise_error Elasticsearch::Transport::Transport::Errors::NotFound
+      end
+    end
+
+    context 'without arguments' do
+      before do
+        CitiesIndex.create
+      end
+
+      specify do
+        expect(CitiesIndex)
+          .to receive(:clear_cache)
+          .and_call_original
+        expect { CitiesIndex.clear_cache }
+          .not_to raise_error
+      end
+    end
+  end
+
+  describe '.reindex' do
+    before do
+      stub_model(:city)
+      stub_index(:cities) do
+        index_scope City
+      end
+      CitiesIndex.create(source_index)
+      DummiesIndex.create(dest_index)
+    end
+
+    let(:source_index) { 'source_index' }
+    let(:source_index_with_prefix) { 'cities_source_index' }
+    let(:dest_index) { 'dest_index' }
+    let(:dest_index_with_prefix) { 'dummies_dest_index' }
+    let(:unexisting_index) { 'wrong_index' }
+
+    context 'with existing indexes' do
+      specify do
+        expect(CitiesIndex)
+          .to receive(:reindex)
+          .and_call_original
+        expect { CitiesIndex.reindex(source: source_index_with_prefix, dest: dest_index_with_prefix) }
+          .not_to raise_error
+      end
+    end
+
+    context 'with unexisting indexes' do
+      context 'source index' do
+        specify do
+          expect(CitiesIndex)
+            .to receive(:reindex)
+            .and_call_original
+          expect { CitiesIndex.reindex(source: unexisting_index, dest: dest_index_with_prefix) }
+            .to raise_error Elasticsearch::Transport::Transport::Errors::NotFound
+        end
+      end
+
+      context 'dest index' do
+        specify do
+          expect(CitiesIndex)
+            .to receive(:reindex)
+            .and_call_original
+          expect { CitiesIndex.reindex(source: source_index_with_prefix, dest: unexisting_index) }
+            .not_to raise_error
+        end
+      end
+    end
+
+    context 'with missing indexes' do
+      context 'without dest index' do
+        specify do
+          expect(DummiesIndex)
+            .to receive(:reindex)
+            .and_call_original
+          expect { DummiesIndex.reindex(source: source_index_with_prefix) }
+            .not_to raise_error
+        end
+      end
+
+      context 'without source index' do
+        specify do
+          expect(CitiesIndex)
+            .to receive(:reindex)
+            .and_call_original
+          expect { CitiesIndex.reindex(dest: dest_index_with_prefix) }
+            .not_to raise_error
+        end
+      end
+    end
+  end
+
+  describe 'update_mapping' do
+    before do
+      stub_model(:city)
+      stub_index(:cities) do
+        index_scope City
+      end
+      CitiesIndex.create
+    end
+
+    let(:index_name) { CitiesIndex.index_name }
+    let(:body_hash) { {properties: {new_field: {type: :text}}} }
+    let(:unexisting_index) { 'wrong_index' }
+    let(:empty_body_hash) { {} }
+
+    context 'with existing index' do
+      specify do
+        expect { CitiesIndex.update_mapping(index_name, body_hash) }
+          .not_to raise_error
+      end
+    end
+
+    context 'with unexisting arguments' do
+      context 'index name' do
+        specify do
+          expect { CitiesIndex.update_mapping(unexisting_index, body_hash) }
+            .to raise_error Elasticsearch::Transport::Transport::Errors::NotFound
+        end
+      end
+
+      context 'body hash' do
+        specify do
+          expect { CitiesIndex.update_mapping(index_name, empty_body_hash) }
+            .not_to raise_error
+        end
+      end
+    end
+
+    context 'with only argument' do
+      specify do
+        expect { CitiesIndex.update_mapping(index_name) }
+          .not_to raise_error
+      end
+    end
+
+    context 'without arguments' do
+      specify do
+        expect { CitiesIndex.update_mapping }
+          .not_to raise_error
+      end
+    end
+  end
 end