chewy 0.10.1 → 7.0.0

data/spec/chewy/index/aliases_spec.rb

@@ -10,13 +10,13 @@ describe Chewy::Index::Aliases do
 
     context do
       before { DummiesIndex.create! }
-      specify { expect(DummiesIndex.indexes).to eq([]) }
+      specify { expect(DummiesIndex.indexes).to eq(['dummies']) }
     end
 
     context do
       before { DummiesIndex.create! }
       before { Chewy.client.indices.put_alias index: 'dummies', name: 'dummies_2013' }
-      specify { expect(DummiesIndex.indexes).to eq([]) }
+      specify { expect(DummiesIndex.indexes).to eq(['dummies']) }
     end
 
     context do
@@ -43,7 +43,7 @@ describe Chewy::Index::Aliases do
 
     context do
       before { DummiesIndex.create! '2013' }
-      specify { expect(DummiesIndex.aliases).to eq([]) }
+      specify { expect(DummiesIndex.aliases).to eq(['dummies']) }
     end
   end
 end

data/spec/chewy/index/specification_spec.rb

@@ -6,7 +6,7 @@ describe Chewy::Index::Specification do
   let(:index1) do
     stub_index(:places) do
       define_type(:city) do
-        field :name, type: 'string'
+        field :founded_on, type: 'date'
       end
     end
   end
@@ -15,7 +15,7 @@ describe Chewy::Index::Specification do
     stub_index(:places) do
       settings analyzer: {}
       define_type(:city) do
-        field :name, type: 'string'
+        field :founded_on, type: 'date'
       end
     end
   end
@@ -23,7 +23,7 @@ describe Chewy::Index::Specification do
   let(:index3) do
     stub_index(:places) do
       define_type(:city) do
-        field :name, type: 'string'
+        field :founded_on, type: 'date'
         field :population, type: 'integer'
       end
     end
@@ -33,7 +33,7 @@ describe Chewy::Index::Specification do
     stub_index(:places) do
       define_type(:city) do
         field :population, type: 'integer'
-        field :name, type: 'string'
+        field :founded_on, type: 'date'
       end
     end
   end
@@ -55,11 +55,14 @@ describe Chewy::Index::Specification do
   describe '#lock!' do
     specify do
       expect { specification1.lock! }.to change { Chewy::Stash::Specification.all.hits }.from([]).to([{
-        '_index' => 'chewy_stash',
+        '_index' => 'chewy_specifications',
         '_type' => 'specification',
         '_id' => 'places',
         '_score' => 1.0,
-        '_source' => {'value' => '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":0}},"mappings":{"city":{"properties":{"name":{"type":"string"}}}}}'}
+        '_source' => {'specification' => Base64.encode64({
+          'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+        }.to_json)}
       }])
     end
 
@@ -68,17 +71,23 @@ describe Chewy::Index::Specification do
 
       specify do
         expect { specification5.lock! }.to change { Chewy::Stash::Specification.all.hits }.to([{
-          '_index' => 'chewy_stash',
+          '_index' => 'chewy_specifications',
           '_type' => 'specification',
           '_id' => 'places',
           '_score' => 1.0,
-          '_source' => {'value' => '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":0}},"mappings":{"city":{"properties":{"name":{"type":"string"}}}}}'}
+          '_source' => {'specification' => Base64.encode64({
+            'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
+            'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+          }.to_json)}
         }, {
-          '_index' => 'chewy_stash',
+          '_index' => 'chewy_specifications',
           '_type' => 'specification',
           '_id' => 'namespace/cities',
           '_score' => 1.0,
-          '_source' => {'value' => '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":0}},"mappings":{"city":{"properties":{"population":{"type":"integer"}}}}}'}
+          '_source' => {'specification' => Base64.encode64({
+            'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
+            'mappings' => {'city' => {'properties' => {'population' => {'type' => 'integer'}}}}
+          }.to_json)}
         }])
       end
     end
@@ -88,7 +97,7 @@ describe Chewy::Index::Specification do
     specify do
       expect { specification1.lock! }.to change { specification1.locked }.from({}).to(
         'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-        'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+        'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
       )
     end
 
@@ -105,20 +114,20 @@ describe Chewy::Index::Specification do
       specify do
         expect { specification2.lock! }.to change { specification2.locked }.from(
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
         ).to(
           'settings' => {'analyzer' => {}, 'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
         )
       end
 
       specify do
         expect { specification3.lock! }.to change { specification3.locked }.from(
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
         ).to(
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}, 'population' => {'type' => 'integer'}}}}
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}, 'population' => {'type' => 'integer'}}}}
         )
       end
     end
@@ -127,7 +136,7 @@ describe Chewy::Index::Specification do
   describe '#current' do
     specify do
       expect(specification2.current).to eq(
-        'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}},
+        'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}},
         'settings' => {'analyzer' => {}, 'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}}
       )
     end

data/spec/chewy/index_spec.rb

@@ -12,8 +12,11 @@ describe Chewy::Index do
       stub_model(:city)
       stub_model(:country)
 
-      stub_index(:places) do
+      stub_index(:cities) do
         define_type City
+      end
+
+      stub_index(:countries) do
         define_type Country
       end
     end
@@ -22,23 +25,23 @@ describe Chewy::Index do
     let!(:countries) { Array.new(2) { |i| Country.create! id: i + 1 } }
 
     specify do
-      expect { PlacesIndex.import }.to update_index(PlacesIndex::City).and_reindex(cities)
-      expect { PlacesIndex.import }.to update_index(PlacesIndex::Country).and_reindex(countries)
+      expect { CitiesIndex.import }.to update_index(CitiesIndex).and_reindex(cities)
+      expect { CountriesIndex.import }.to update_index(CountriesIndex).and_reindex(countries)
     end
 
     specify do
-      expect { PlacesIndex.import city: cities.first }.to update_index(PlacesIndex::City).and_reindex(cities.first).only
-      expect { PlacesIndex.import city: cities.first }.to update_index(PlacesIndex::Country).and_reindex(countries)
+      expect { CitiesIndex.import city: cities.first }.to update_index(CitiesIndex).and_reindex(cities.first).only
+      expect { CountriesIndex.import city: cities.first }.to update_index(CountriesIndex).and_reindex(countries)
     end
 
     specify do
-      expect { PlacesIndex.import city: cities.first, country: countries.last }.to update_index(PlacesIndex::City).and_reindex(cities.first).only
-      expect { PlacesIndex.import city: cities.first, country: countries.last }.to update_index(PlacesIndex::Country).and_reindex(countries.last).only
+      expect { CitiesIndex.import city: cities.first, country: countries.last }.to update_index(CitiesIndex).and_reindex(cities.first).only
+      expect { CountriesIndex.import city: cities.first, country: countries.last }.to update_index(CountriesIndex).and_reindex(countries.last).only
     end
 
     specify do
-      expect(PlacesIndex.client).to receive(:bulk).with(hash_including(refresh: false)).twice
-      PlacesIndex.import city: cities.first, refresh: false
+      expect(CitiesIndex.client).to receive(:bulk).with(hash_including(refresh: false)).once
+      CitiesIndex.import city: cities.first, refresh: false
     end
   end
 
@@ -101,43 +104,27 @@ describe Chewy::Index do
 
     context do
       before { stub_class('City') }
-      before { stub_class('City::District', City) }
+      before { stub_class('Country') }
 
       specify do
         expect do
           Kernel.eval <<-DUMMY_CITY_INDEX
-            class DummyCityIndex < Chewy::Index
+            class DummyCityIndex2 < Chewy::Index
               define_type City
-              define_type City::District
+              define_type Country
             end
           DUMMY_CITY_INDEX
-        end.not_to raise_error
-      end
+        end.to raise_error(/Multiple types are deprecated/)
 
-      specify do
         expect do
           Kernel.eval <<-DUMMY_CITY_INDEX
             class DummyCityIndex2 < Chewy::Index
-              define_type City
               define_type City::Nothing
             end
           DUMMY_CITY_INDEX
         end.to raise_error(NameError)
       end
     end
-
-    context 'type methods should be deprecated and can\'t redefine existing ones' do
-      before do
-        stub_index(:places) do
-          def self.city; end
-          define_type :city
-          define_type :country
-        end
-      end
-
-      specify { expect(PlacesIndex.city).to be_nil }
-      specify { expect(PlacesIndex::Country).to be < Chewy::Type }
-    end
   end
 
   describe '.type_hash' do
@@ -191,16 +178,44 @@ describe Chewy::Index do
       stub_index(:places) do
         def self.by_rating; end
 
-        def self.by_name; end
+        def self.colors(*colors)
+          filter(terms: {colors: colors.flatten(1).map(&:to_s)})
+        end
 
         define_type :city do
           def self.by_id; end
+          field :colors
         end
       end
     end
 
     specify { expect(described_class.scopes).to eq([]) }
-    specify { expect(PlacesIndex.scopes).to match_array(%i[by_rating by_name]) }
+    specify { expect(PlacesIndex.scopes).to match_array(%i[by_rating colors]) }
+
+    context do
+      before do
+        Chewy.massacre
+        PlacesIndex::City.import!(
+          double(colors: ['red']),
+          double(colors: %w[red green]),
+          double(colors: %w[green yellow])
+        )
+      end
+
+      specify do
+        # This `blank?`` call is for the messed scopes bug reproduction. See #573
+        PlacesIndex::City.blank?
+        expect(PlacesIndex.colors(:green).map(&:colors))
+          .to contain_exactly(%w[red green], %w[green yellow])
+      end
+
+      specify do
+        # This `blank?` call is for the messed scopes bug reproduction. See #573
+        PlacesIndex::City.blank?
+        expect(PlacesIndex::City.colors(:green).map(&:colors))
+          .to contain_exactly(%w[red green], %w[green yellow])
+      end
+    end
   end
 
   describe '.settings_hash' do
@@ -216,19 +231,9 @@ describe Chewy::Index do
     specify do
       expect(stub_index(:documents) do
                define_type :document do
-                 field :name, type: 'string'
+                 field :date, type: 'date'
                end
-             end.mappings_hash).to eq(mappings: {document: {properties: {name: {type: 'string'}}}})
-    end
-    specify do
-      expect(stub_index(:documents) do
-               define_type :document do
-                 field :name, type: 'string'
-               end
-               define_type :document2 do
-                 field :name, type: 'string'
-               end
-             end.mappings_hash[:mappings].keys).to match_array(%i[document document2])
+             end.mappings_hash).to eq(mappings: {document: {properties: {date: {type: 'date'}}}})
     end
   end
 
@@ -240,7 +245,7 @@ describe Chewy::Index do
     specify do
       expect(stub_index(:documents) do
                define_type :document do
-                 field :name, type: 'string'
+                 field :name
                end
              end.specification_hash.keys).to eq([:mappings])
     end
@@ -248,7 +253,7 @@ describe Chewy::Index do
       expect(stub_index(:documents) do
                settings number_of_shards: 1
                define_type :document do
-                 field :name, type: 'string'
+                 field :name
                end
              end.specification_hash.keys).to match_array(%i[mappings settings])
     end
@@ -281,4 +286,29 @@ describe Chewy::Index do
       specify { expect(DummiesIndex.index_name).to eq('borogoves_dummies') }
     end
   end
+
+  context 'index call inside index', :orm do
+    before do
+      stub_index(:cities) do
+        define_type :city do
+          field :country_name, value: (lambda do |city|
+            CountriesIndex::Country.filter(term: {_id: city.country_id}).first.name
+          end)
+        end
+      end
+
+      stub_index(:countries) do
+        define_type :country do
+          field :name
+        end
+      end
+
+      CountriesIndex::Country.import!(double(id: 1, name: 'Country'))
+    end
+
+    specify do
+      expect { CitiesIndex::City.import!(double(country_id: 1)) }
+        .to update_index(CitiesIndex::City).and_reindex(country_name: 'Country')
+    end
+  end
 end

data/spec/chewy/journal_spec.rb

@@ -6,16 +6,18 @@ describe Chewy::Journal do
       context namespace.present? ? 'with namespace' : 'without namespace' do
         before do
           stub_model(:city) do
-            update_index "#{namespace}places#city", :self
+            update_index "#{namespace}cities", :self
           end
           stub_model(:country) do
-            update_index "#{namespace}places#country", :self
+            update_index "#{namespace}countries", :self
           end
 
-          stub_index("#{namespace}places") do
+          stub_index("#{namespace}cities") do
             define_type City do
               default_import_options journal: true
             end
+          end
+          stub_index("#{namespace}countries") do
             define_type Country do
               default_import_options journal: true
             end
@@ -41,7 +43,8 @@ describe Chewy::Journal do
         end
 
         specify do
-          places_index = namespace.present? ? Namespace::PlacesIndex : PlacesIndex
+          cities_index = namespace.present? ? Namespace::CitiesIndex : CitiesIndex
+          countries_index = namespace.present? ? Namespace::CountriesIndex : CountriesIndex
           Chewy.strategy(:urgent) do
             cities = Array.new(2) { |i| City.create!(id: i + 1) }
             countries = Array.new(2) { |i| Country.create!(id: i + 1) }
@@ -49,12 +52,13 @@ describe Chewy::Journal do
 
             Timecop.freeze(import_time)
 
-            places_index.import
+            cities_index.import
+            countries_index.import
 
-            expect(Chewy::Stash.exists?).to eq true
+            expect(Chewy::Stash::Journal.exists?).to eq true
 
             Timecop.freeze(update_time)
-            cities.first.update_attributes!(name: 'Supername')
+            cities.first.update!(name: 'Supername')
 
             Timecop.freeze(destroy_time)
             countries.last.destroy
@@ -62,66 +66,66 @@ describe Chewy::Journal do
             journal_entries = Chewy::Stash::Journal.order(:created_at).hits.map { |r| r['_source'] }
             expected_journal = [
               {
-                'index_name' => "#{namespace}places",
+                'index_name' => "#{namespace}cities",
                 'type_name' => 'city',
                 'action' => 'index',
-                'references' => ['1'],
+                'references' => ['1'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
-                'index_name' => "#{namespace}places",
+                'index_name' => "#{namespace}cities",
                 'type_name' => 'city',
                 'action' => 'index',
-                'references' => ['2'],
+                'references' => ['2'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
-                'index_name' => "#{namespace}places",
+                'index_name' => "#{namespace}countries",
                 'type_name' => 'country',
                 'action' => 'index',
-                'references' => ['1'],
+                'references' => ['1'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
-                'index_name' => "#{namespace}places",
+                'index_name' => "#{namespace}countries",
                 'type_name' => 'country',
                 'action' => 'index',
-                'references' => ['2'],
+                'references' => ['2'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
-                'index_name' => "#{namespace}places",
+                'index_name' => "#{namespace}countries",
                 'type_name' => 'country',
                 'action' => 'index',
-                'references' => ['3'],
+                'references' => ['3'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
-                'index_name' => "#{namespace}places",
+                'index_name' => "#{namespace}cities",
                 'type_name' => 'city',
                 'action' => 'index',
-                'references' => %w[1 2],
+                'references' => %w[1 2].map(&Base64.method(:encode64)),
                 'created_at' => import_time.utc.as_json
               },
               {
-                'index_name' => "#{namespace}places",
+                'index_name' => "#{namespace}countries",
                 'type_name' => 'country',
                 'action' => 'index',
-                'references' => %w[1 2 3],
+                'references' => %w[1 2 3].map(&Base64.method(:encode64)),
                 'created_at' => import_time.utc.as_json
               },
               {
-                'index_name' => "#{namespace}places",
+                'index_name' => "#{namespace}cities",
                 'type_name' => 'city',
                 'action' => 'index',
-                'references' => ['1'],
+                'references' => ['1'].map(&Base64.method(:encode64)),
                 'created_at' => update_time.utc.as_json
               },
               {
-                'index_name' => "#{namespace}places",
+                'index_name' => "#{namespace}countries",
                 'type_name' => 'country',
                 'action' => 'delete',
-                'references' => ['2'],
+                'references' => ['2'].map(&Base64.method(:encode64)),
                 'created_at' => destroy_time.utc.as_json
               }
             ]
@@ -133,11 +137,11 @@ describe Chewy::Journal do
             expect(journal_entries.size).to eq 4
 
             # simulate lost data
-            Chewy.client.delete(index: "#{Chewy.settings[:prefix]}_places", type: 'city', id: 1, refresh: true)
-            expect(places_index::City.count).to eq 1
+            Chewy.client.delete(index: "#{Chewy.settings[:prefix]}_cities", type: 'city', id: 1, refresh: true)
+            expect(cities_index.count).to eq 1
 
             described_class.new.apply(time)
-            expect(places_index::City.count).to eq 2
+            expect(cities_index.count).to eq 2
 
             clean_response = described_class.new.clean(import_time)
             expect(clean_response['deleted'] || clean_response['_indices']['_all']['deleted']).to eq 7
@@ -231,7 +235,7 @@ describe Chewy::Journal do
           let!(:journal_entries) do
             record = Chewy::Stash::Journal.entries(time).first
             Array.new(count_of_checks) do |i|
-              Chewy::Stash::Journal.new(
+              Chewy::Stash::Journal::Journal.new(
                 record.attributes.merge(
                   'created_at' => time.to_i + i,
                   'references' => [i.to_s]