chewy 0.8.4 → 7.3.4

data/spec/chewy/fields/root_spec.rb

@@ -1,44 +1,142 @@
 require 'spec_helper'
 
 describe Chewy::Fields::Root do
-  specify { expect(described_class.new('name').value).to be_a(Proc) }
-  # TODO: add 'should_behave_like base_field'
-
   subject(:field) { described_class.new('product') }
 
   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/
-      field.dynamic_template /hello.*/
+      field.dynamic_template(/hello/)
+      field.dynamic_template(/hello.*/)
       field.dynamic_template template_42: {mapping: {}, match: ''}
-      field.dynamic_template /hello\..*/
+      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
-      subject(:field) { described_class.new('product', dynamic_templates: [
-        {template_42: {mapping: {}, match: ''}}
-      ]) }
+      subject(:field) do
+        described_class.new('product', dynamic_templates: [
+          {template_42: {mapping: {}, match: ''}}
+        ])
+      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
+
+  describe '#compose' do
+    context 'empty children', :orm do
+      before do
+        stub_model(:city)
+        stub_index(:places) do
+          index_scope City
+        end
+      end
+
+      let(:city) { City.new(name: 'London', rating: 100) }
+
+      specify do
+        expect(PlacesIndex.root.compose(city))
+          .to match(hash_including('name' => 'London', 'rating' => 100))
+      end
+      specify do
+        expect(PlacesIndex.root.compose(city, fields: %i[name borogoves]))
+          .to eq('name' => 'London')
+      end
+    end
+
+    context 'has children' do
+      before do
+        stub_index(:places) do
+          field :name, :rating
+        end
+      end
+
+      let(:city) { double(name: 'London', rating: 100) }
+
+      specify do
+        expect(PlacesIndex.root.compose(city))
+          .to eq('name' => 'London', 'rating' => 100)
+      end
+      specify do
+        expect(PlacesIndex.root.compose(city, fields: %i[name borogoves]))
+          .to eq('name' => 'London')
+      end
+    end
+
+    context 'root value provided' do
+      before do
+        stub_index(:places) do
+          root value: ->(o) { {name: "#{o.name}Modified", rating: o.rating.next} }
+        end
       end
+
+      let(:city) { double(name: 'London', rating: 100) }
+
+      specify do
+        expect(PlacesIndex.root.compose(city))
+          .to eq('name' => 'LondonModified', 'rating' => 101)
+      end
+
+      specify do
+        expect(PlacesIndex.root.compose(city, fields: %i[name borogoves]))
+          .to eq('name' => 'LondonModified')
+      end
+    end
+
+    context 'complex evaluations' do
+      before do
+        stub_index(:places) do
+          root value: ->(o) { {name: "#{o.name}Modified", rating: o.rating.next} } do
+            field :name, value: ->(o) { "#{o[:name]}Modified" }
+            field :rating
+          end
+        end
+      end
+
+      let(:city) { double(name: 'London', rating: 100) }
+
+      specify do
+        expect(PlacesIndex.root.compose(city))
+          .to eq('name' => 'LondonModifiedModified', 'rating' => 101)
+      end
+
+      specify do
+        expect(PlacesIndex.root.compose(city, fields: %i[name borogoves]))
+          .to eq('name' => 'LondonModifiedModified')
+      end
+    end
+  end
+
+  describe '#child_hash' do
+    before do
+      stub_index(:places) do
+        field :name, :rating
+      end
+    end
+
+    specify do
+      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))
+      )
     end
   end
 end

data/spec/chewy/fields/time_fields_spec.rb

@@ -5,23 +5,24 @@ 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 { PostsIndex::Post.import(
-    double(published_at: ActiveSupport::TimeZone[-28800].parse('2014/12/18 19:00')),
-    double(published_at: ActiveSupport::TimeZone[-21600].parse('2014/12/18 20:00')),
-    double(published_at: ActiveSupport::TimeZone[-21600].parse('2014/12/17 20:00')),
-  ) }
+  before do
+    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'))
+    )
+  end
 
-  let(:time) { ActiveSupport::TimeZone[-14400].parse('2014/12/18 22:00') }
+  let(:time) { ActiveSupport::TimeZone[-14_400].parse('2014/12/18 22:00') }
   let(:range) { (time - 1.minute)..(time + 1.minute) }
 
   specify { expect(PostsIndex.total).to eq(3) }
-  specify { expect(PostsIndex.filter { published_at == o{range} }.count).to eq(1) }
-  specify { expect(PostsIndex.filter { published_at == o{range.min.utc..(range.max + 1.hour).utc} }.count).to eq(2) }
-  specify { expect(PostsIndex.filter { published_at == o{[range.min..range.max]} }.count).to eq(1) }
+  specify { expect(PostsIndex.filter(range: {published_at: {gte: range.min, lte: range.max}}).size).to eq(1) }
+  specify do
+    expect(PostsIndex.filter(range: {published_at: {gt: range.min.utc, lt: (range.max + 1.hour).utc}}).size).to eq(2)
+  end
 end