chewy 0.10.1 → 7.3.2

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/)
@@ -13,15 +13,15 @@ describe Chewy::Fields::Root do
       field.dynamic_template template_42: {mapping: {}, match: ''}
       field.dynamic_template(/hello\..*/)
 
-      expect(field.mappings_hash).to eq(product: {dynamic_templates: [
-        {template_1: {mapping: {type: 'string'}, match: 'hello'}},
+      expect(field.mappings_hash).to eq(dynamic_templates: [
+        {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'}},
         {template_5: {mapping: {}, match: 'hello.*', match_pattern: 'regexp'}},
         {template_42: {mapping: {}, match: ''}},
         {template_7: {mapping: {}, path_match: 'hello\..*', match_pattern: 'regexp'}}
-      ]})
+      ])
     end
 
     context do
@@ -32,11 +32,11 @@ describe Chewy::Fields::Root do
       end
 
       specify do
-        field.dynamic_template 'hello', type: 'string'
-        expect(field.mappings_hash).to eq(product: {dynamic_templates: [
+        field.dynamic_template 'hello', type: 'keyword'
+        expect(field.mappings_hash).to eq(dynamic_templates: [
           {template_42: {mapping: {}, match: ''}},
-          {template_1: {mapping: {type: 'string'}, match: 'hello'}}
-        ]})
+          {template_1: {mapping: {type: 'keyword'}, match: 'hello'}}
+        ])
       end
     end
   end
@@ -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.send(:build_root).compose(city))
+        expect(PlacesIndex.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.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.send(:build_root).compose(city))
+        expect(PlacesIndex.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.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.send(:build_root).compose(city))
+        expect(PlacesIndex.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.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.send(:build_root).compose(city))
+        expect(PlacesIndex.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.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.send(:build_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