chewy 0.10.1 → 5.0.0

data/spec/chewy/fields/base_spec.rb

@@ -63,7 +63,7 @@ describe Chewy::Fields::Base do
     end
 
     context 'implicit values' do
-      let(:field) { described_class.new(:name, type: 'string') }
+      let(:field) { described_class.new(:name, type: 'integer') }
       before do
         field.children.push(described_class.new(:name))
         field.children.push(described_class.new(:untouched))
@@ -87,8 +87,8 @@ describe Chewy::Fields::Base do
 
   describe '#mappings_hash' do
     let(:field) { described_class.new(:name, type: :object) }
-    let(:fields1) { Array.new(2) { |i| described_class.new("name#{i + 1}", type: "string#{i + 1}") } }
-    let(:fields2) { Array.new(2) { |i| described_class.new("name#{i + 3}", type: "string#{i + 3}") } }
+    let(:fields1) { Array.new(2) { |i| described_class.new("name#{i + 1}", type: "integer#{i + 1}") } }
+    let(:fields2) { Array.new(2) { |i| described_class.new("name#{i + 3}", type: "integer#{i + 3}") } }
     before do
       fields1.each { |m| field.children.push(m) }
       fields2.each { |m| fields1[0].children.push(m) }
@@ -96,28 +96,30 @@ describe Chewy::Fields::Base do
 
     specify do
       expect(field.mappings_hash).to eq(name: {type: :object, properties: {
-        name1: {type: 'string1', fields: {
-          name3: {type: 'string3'}, name4: {type: 'string4'}
-        }}, name2: {type: 'string2'}
+        name1: {type: 'integer1', fields: {
+          name3: {type: 'integer3'}, name4: {type: 'integer4'}
+        }}, name2: {type: 'integer2'}
       }})
     end
 
     context do
-      let(:field) { described_class.new(:name, type: :string) }
-      let(:fields1) { Array.new(2) { |i| described_class.new("name#{i + 1}") } }
+      let(:field) { described_class.new(:name, type: :integer) }
+      let(:fields1) do
+        [described_class.new(:name1), described_class.new(:name2, type: 'integer')]
+      end
 
       specify do
-        expect(field.mappings_hash).to eq(name: {type: :string, fields: {
+        expect(field.mappings_hash).to eq(name: {type: :integer, fields: {
           name1: {type: 'object', properties: {
-            name3: {type: 'string3'}, name4: {type: 'string4'}
-          }}, name2: {type: 'string'}
+            name3: {type: 'integer3'}, name4: {type: 'integer4'}
+          }}, name2: {type: 'integer'}
         }})
       end
     end
   end
 
   context 'integration' do
-    context 'objects, hashes and arrays' do
+    context 'default field type' do
       before do
         stub_index(:events) do
           define_type :event do
@@ -126,26 +128,33 @@ describe Chewy::Fields::Base do
               field :id
               field :licenses do
                 field :id
-                field :name
+                field :created_at, type: 'time'
               end
             end
           end
         end
       end
 
+      around do |example|
+        previous_type = Chewy.default_field_type
+        Chewy.default_field_type = 'integer'
+        example.run
+        Chewy.default_field_type = previous_type
+      end
+
       specify do
         expect(EventsIndex::Event.mappings_hash).to eq(event: {
           properties: {
-            id: {type: 'string'},
+            id: {type: 'integer'},
             category: {
               type: 'object',
               properties: {
-                id: {type: 'string'},
+                id: {type: 'integer'},
                 licenses: {
                   type: 'object',
                   properties: {
-                    id: {type: 'string'},
-                    name: {type: 'string'}
+                    id: {type: 'integer'},
+                    created_at: {type: 'time'}
                   }
                 }
               }
@@ -153,45 +162,32 @@ describe Chewy::Fields::Base do
           }
         })
       end
+    end
 
-      context 'default field type' do
-        around do |example|
-          previous_type = Chewy.default_field_type
-          Chewy.default_field_type = 'text'
-          example.run
-          Chewy.default_field_type = previous_type
-        end
-
-        specify do
-          expect(EventsIndex::Event.mappings_hash).to eq(event: {
-            properties: {
-              id: {type: 'text'},
-              category: {
-                type: 'object',
-                properties: {
-                  id: {type: 'text'},
-                  licenses: {
-                    type: 'object',
-                    properties: {
-                      id: {type: 'text'},
-                      name: {type: 'text'}
-                    }
-                  }
-                }
-              }
-            }
-          })
+    context 'objects, hashes and arrays' do
+      before do
+        stub_index(:events) do
+          define_type :event do
+            field :id
+            field :category do
+              field :id
+              field :licenses do
+                field :id
+                field :name
+              end
+            end
+          end
         end
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(
+        expect(EventsIndex::Event.root.compose(
                  id: 1, category: {id: 2, licenses: {id: 3, name: 'Name'}}
         )).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(id: 1, category: [
+        expect(EventsIndex::Event.root.compose(id: 1, category: [
           {id: 2, 'licenses' => {id: 3, name: 'Name1'}},
           {id: 4, licenses: nil}
         ])).to eq('id' => 1, 'category' => [
@@ -201,7 +197,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose('id' => 1, category: {id: 2, licenses: [
+        expect(EventsIndex::Event.root.compose('id' => 1, category: {id: 2, licenses: [
           {id: 3, name: 'Name1'}, {id: 4, name: 'Name2'}
         ]})).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => [
           {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
@@ -209,7 +205,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(id: 1, category: [
+        expect(EventsIndex::Event.root.compose(id: 1, category: [
           {id: 2, licenses: [
             {id: 3, 'name' => 'Name1'}, {id: 4, name: 'Name2'}
           ]},
@@ -223,13 +219,13 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(
+        expect(EventsIndex::Event.root.compose(
                  double(id: 1, category: double(id: 2, licenses: double(id: 3, name: 'Name')))
         )).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(double(id: 1, category: [
+        expect(EventsIndex::Event.root.compose(double(id: 1, category: [
           double(id: 2, licenses: double(id: 3, name: 'Name1')),
           double(id: 4, licenses: nil)
         ]))).to eq('id' => 1, 'category' => [
@@ -239,7 +235,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(double(id: 1, category: double(id: 2, licenses: [
+        expect(EventsIndex::Event.root.compose(double(id: 1, category: double(id: 2, licenses: [
           double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
         ])))).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => [
           {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
@@ -247,7 +243,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(double(id: 1, category: [
+        expect(EventsIndex::Event.root.compose(double(id: 1, category: [
           double(id: 2, licenses: [
             double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
           ]),
@@ -265,11 +261,11 @@ describe Chewy::Fields::Base do
       before do
         stub_index(:events) do
           define_type :event do
-            field :id
+            field :id, type: 'integer'
             field :category, value: -> { categories } do
-              field :id
+              field :id, type: 'integer'
               field :licenses, value: -> { license } do
-                field :id
+                field :id, type: 'integer'
                 field :name
               end
             end
@@ -278,7 +274,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(
+        expect(EventsIndex::Event.root.compose(
                  double(id: 1, categories: double(id: 2, license: double(id: 3, name: 'Name')))
         )).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
       end
@@ -288,8 +284,8 @@ describe Chewy::Fields::Base do
       before do
         stub_index(:events) do
           define_type :event do
-            field :id
-            field :name, type: 'string' do
+            field :id, type: 'integer'
+            field :name, type: 'integer' do
               field :raw, analyzer: 'my_own'
             end
             field :category, type: 'object'
@@ -300,11 +296,11 @@ describe Chewy::Fields::Base do
       specify do
         expect(EventsIndex::Event.mappings_hash).to eq(event: {
           properties: {
-            id: {type: 'string'},
+            id: {type: 'integer'},
             name: {
-              type: 'string',
+              type: 'integer',
               fields: {
-                raw: {analyzer: 'my_own', type: 'string'}
+                raw: {analyzer: 'my_own', type: Chewy.default_field_type}
               }
             },
             category: {type: 'object'}
@@ -313,7 +309,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(
+        expect(EventsIndex::Event.root.compose(
                  double(id: 1, name: 'Jonny', category: double(id: 2, as_json: {'name' => 'Borogoves'}))
         )).to eq(
           'id' => 1,
@@ -323,7 +319,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.root_object.compose(
+        expect(EventsIndex::Event.root.compose(
                  double(id: 1, name: 'Jonny', category: [
                    double(id: 2, as_json: {'name' => 'Borogoves1'}),
                    double(id: 3, as_json: {'name' => 'Borogoves2'})
@@ -388,7 +384,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(CountriesIndex::Country.root_object.compose(country_with_cities)).to eq('id' => 1, 'cities' => [
+        expect(CountriesIndex::Country.root.compose(country_with_cities)).to eq('id' => 1, 'cities' => [
           {'id' => 1, 'name' => 'City1'}, {'id' => 2, 'name' => 'City2'}
         ])
       end
@@ -407,7 +403,7 @@ describe Chewy::Fields::Base do
         end
 
         specify do
-          expect(CitiesIndex::City.root_object.compose(
+          expect(CitiesIndex::City.root.compose(
                    City.create!(id: 1, country: Country.create!(id: 1, name: 'Country'))
           )).to eq('id' => 1, 'country' => {'id' => 1, 'name' => 'Country'})
         end

data/spec/chewy/fields/root_spec.rb

@@ -5,7 +5,7 @@ describe Chewy::Fields::Root do
 
   describe '#dynamic_template' do
     specify do
-      field.dynamic_template 'hello', type: 'string'
+      field.dynamic_template 'hello', type: 'keyword'
       field.dynamic_template 'hello*', :integer
       field.dynamic_template 'hello.*'
       field.dynamic_template(/hello/)
@@ -14,7 +14,7 @@ describe Chewy::Fields::Root do
       field.dynamic_template(/hello\..*/)
 
       expect(field.mappings_hash).to eq(product: {dynamic_templates: [
-        {template_1: {mapping: {type: 'string'}, match: 'hello'}},
+        {template_1: {mapping: {type: 'keyword'}, match: 'hello'}},
         {template_2: {mapping: {}, match_mapping_type: 'integer', match: 'hello*'}},
         {template_3: {mapping: {}, path_match: 'hello.*'}},
         {template_4: {mapping: {}, match: 'hello', match_pattern: 'regexp'}},
@@ -32,10 +32,10 @@ describe Chewy::Fields::Root do
       end
 
       specify do
-        field.dynamic_template 'hello', type: 'string'
+        field.dynamic_template 'hello', type: 'keyword'
         expect(field.mappings_hash).to eq(product: {dynamic_templates: [
           {template_42: {mapping: {}, match: ''}},
-          {template_1: {mapping: {type: 'string'}, match: 'hello'}}
+          {template_1: {mapping: {type: 'keyword'}, match: 'hello'}}
         ]})
       end
     end
@@ -53,11 +53,11 @@ describe Chewy::Fields::Root do
       let(:city) { City.new(name: 'London', rating: 100) }
 
       specify do
-        expect(PlacesIndex::City.send(:build_root).compose(city))
+        expect(PlacesIndex::City.root.compose(city))
           .to match(hash_including('name' => 'London', 'rating' => 100))
       end
       specify do
-        expect(PlacesIndex::City.send(:build_root).compose(city, fields: %i[name borogoves]))
+        expect(PlacesIndex::City.root.compose(city, fields: %i[name borogoves]))
           .to eq('name' => 'London')
       end
     end
@@ -74,11 +74,11 @@ describe Chewy::Fields::Root do
       let(:city) { double(name: 'London', rating: 100) }
 
       specify do
-        expect(PlacesIndex::City.send(:build_root).compose(city))
+        expect(PlacesIndex::City.root.compose(city))
           .to eq('name' => 'London', 'rating' => 100)
       end
       specify do
-        expect(PlacesIndex::City.send(:build_root).compose(city, fields: %i[name borogoves]))
+        expect(PlacesIndex::City.root.compose(city, fields: %i[name borogoves]))
           .to eq('name' => 'London')
       end
     end
@@ -95,12 +95,12 @@ describe Chewy::Fields::Root do
       let(:city) { double(name: 'London', rating: 100) }
 
       specify do
-        expect(PlacesIndex::City.send(:build_root).compose(city))
+        expect(PlacesIndex::City.root.compose(city))
           .to eq('name' => 'LondonModified', 'rating' => 101)
       end
 
       specify do
-        expect(PlacesIndex::City.send(:build_root).compose(city, fields: %i[name borogoves]))
+        expect(PlacesIndex::City.root.compose(city, fields: %i[name borogoves]))
           .to eq('name' => 'LondonModified')
       end
     end
@@ -120,12 +120,12 @@ describe Chewy::Fields::Root do
       let(:city) { double(name: 'London', rating: 100) }
 
       specify do
-        expect(PlacesIndex::City.send(:build_root).compose(city))
+        expect(PlacesIndex::City.root.compose(city))
           .to eq('name' => 'LondonModifiedModified', 'rating' => 101)
       end
 
       specify do
-        expect(PlacesIndex::City.send(:build_root).compose(city, fields: %i[name borogoves]))
+        expect(PlacesIndex::City.root.compose(city, fields: %i[name borogoves]))
           .to eq('name' => 'LondonModifiedModified')
       end
     end
@@ -141,7 +141,7 @@ describe Chewy::Fields::Root do
     end
 
     specify do
-      expect(PlacesIndex::City.send(:build_root).child_hash).to match(
+      expect(PlacesIndex::City.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/index/actions_spec.rb

@@ -429,6 +429,12 @@ describe Chewy::Index::Actions do
             expect(CitiesIndex).to receive(:import).with(suffix: suffix, journal: false, refresh: false).and_call_original
             expect(CitiesIndex.reset!(suffix)).to eq(true)
           end
+
+          specify 'uses empty index settings if not defined' do
+            allow(Chewy).to receive(:wait_for_status).and_return(nil)
+            allow(CitiesIndex).to receive(:settings_hash).and_return({})
+            expect(CitiesIndex.reset!(suffix)).to eq(true)
+          end
         end
       end
 
@@ -478,7 +484,7 @@ describe Chewy::Index::Actions do
       end
     end
 
-    context 'applying journal' do
+    xcontext 'applying journal' do
       before do
         stub_index(:cities) do
           define_type City do
@@ -494,23 +500,49 @@ describe Chewy::Index::Actions do
 
       let(:parallel_update) do
         Thread.new do
+          p 'start parallel'
           sleep(1.5)
           cities.first.update(name: 'NewName1', rating: 0)
           cities.last.update(name: 'NewName3', rating: 0)
           CitiesIndex::City.import!([cities.first, cities.last], journal: true)
+          p 'end parallel'
         end
       end
 
       specify 'with journal application' do
-        parallel_update
-        CitiesIndex.reset!('suffix')
+        cities
+        p 'cities created1'
+        ::ActiveRecord::Base.connection.close if defined?(::ActiveRecord::Base)
+        [
+          parallel_update,
+          Thread.new do
+            p 'start reset1'
+            CitiesIndex.reset!('suffix')
+            p 'end reset1'
+          end
+        ].map(&:join)
+        ::ActiveRecord::Base.connection.reconnect! if defined?(::ActiveRecord::Base)
+        p 'expect1'
         expect(CitiesIndex::City.pluck(:_id, :name)).to contain_exactly(%w[1 NewName1], %w[2 Name2], %w[3 NewName3])
+        p 'end expect1'
       end
 
       specify 'without journal application' do
-        parallel_update
-        CitiesIndex.reset!('suffix', apply_journal: false)
+        cities
+        p 'cities created2'
+        ::ActiveRecord::Base.connection.close if defined?(::ActiveRecord::Base)
+        [
+          parallel_update,
+          Thread.new do
+            p 'start reset2'
+            CitiesIndex.reset!('suffix', apply_journal: false)
+            p 'end reset2'
+          end
+        ].map(&:join)
+        ::ActiveRecord::Base.connection.reconnect! if defined?(::ActiveRecord::Base)
+        p 'expect2'
         expect(CitiesIndex::City.pluck(:_id, :name)).to contain_exactly(%w[1 Name1], %w[2 Name2], %w[3 Name3])
+        p 'end expect2'
       end
     end