chewy 0.10.1 → 5.0.0

data/spec/chewy/search_spec.rb

@@ -67,40 +67,50 @@ describe Chewy::Search do
             filter { match rating: yield }
           end
 
-          field :name, index: 'not_analyzed'
+          def self.by_index(index)
+            filter { match name: "Name#{index}" }
+          end
+
+          field :name, KEYWORD_FIELD
           field :rating, type: :integer
         end
 
         define_type Country do
-          field :name, index: 'not_analyzed'
+          field :name, KEYWORD_FIELD
           field :rating, type: :integer
         end
       end
     end
 
-    let!(:cities) { Array.new(3) { |i| City.create! rating: i + 1, name: "Name#{i + 1}" } }
-    let!(:countries) { Array.new(3) { |i| Country.create! rating: i + 1, name: "Name#{i + 4}" } }
+    let!(:cities) { Array.new(3) { |i| City.create! rating: i + 1, name: "Name#{i + 2}" } }
+    let!(:countries) { Array.new(3) { |i| Country.create! rating: i + 1, name: "Name#{i + 3}" } }
 
     before { PlacesIndex.import! city: cities, country: countries }
 
     specify { expect(PlacesIndex.by_rating(1).map(&:rating)).to eq([1, 1]) }
     specify { expect(PlacesIndex.by_rating(1).map(&:class)).to match_array([PlacesIndex::City, PlacesIndex::Country]) }
-    specify { expect(PlacesIndex.by_rating(1).by_name(1).map(&:rating)).to eq([1]) }
-    specify { expect(PlacesIndex.by_rating(1).by_name(1).map(&:class)).to eq([PlacesIndex::City]) }
+    specify { expect(PlacesIndex.by_rating(1).by_name(2).map(&:rating)).to eq([1]) }
+    specify { expect(PlacesIndex.by_rating(1).by_name(2).map(&:class)).to eq([PlacesIndex::City]) }
+    specify { expect(PlacesIndex.by_name(3).map(&:rating)).to eq([2, 1]) }
+    specify { expect(PlacesIndex.by_name(3).map(&:class)).to eq([PlacesIndex::City, PlacesIndex::Country]) }
     specify { expect(PlacesIndex.order(:name).by_rating(1).map(&:rating)).to eq([1, 1]) }
     specify { expect(PlacesIndex.order(:name).by_rating(1).map(&:class)).to match_array([PlacesIndex::City, PlacesIndex::Country]) }
 
     specify { expect(PlacesIndex::City.by_rating { 2 }.map(&:rating)).to eq([2]) }
     specify { expect(PlacesIndex::City.by_rating { 2 }.map(&:class)).to eq([PlacesIndex::City]) }
-    specify { expect(PlacesIndex::City.by_rating { 2 }.by_name(2).map(&:rating)).to eq([2]) }
-    specify { expect(PlacesIndex::City.by_rating { 2 }.by_name(2).map(&:class)).to eq([PlacesIndex::City]) }
+    specify { expect(PlacesIndex::City.by_rating { 2 }.by_name(3).map(&:rating)).to eq([2]) }
+    specify { expect(PlacesIndex::City.by_rating { 2 }.by_name(3).map(&:class)).to eq([PlacesIndex::City]) }
+    specify { expect(PlacesIndex::City.by_name(3).map(&:rating)).to eq([2]) }
+    specify { expect(PlacesIndex::City.by_index(3).map(&:rating)).to eq([2]) }
+    specify { expect(PlacesIndex::City.order(:name).by_name(3).map(&:rating)).to eq([2]) }
+    specify { expect(PlacesIndex::City.order(:name).by_index(3).map(&:rating)).to eq([2]) }
     specify { expect(PlacesIndex::City.order(:name).by_rating { 2 }.map(&:rating)).to eq([2]) }
     specify { expect(PlacesIndex::City.order(:name).by_rating { 2 }.map(&:class)).to eq([PlacesIndex::City]) }
 
     specify { expect(PlacesIndex::Country.by_rating(3).map(&:rating)).to eq([3]) }
     specify { expect(PlacesIndex::Country.by_rating(3).map(&:class)).to eq([PlacesIndex::Country]) }
-    specify { expect(PlacesIndex::Country.by_rating(3).by_name(6).map(&:rating)).to eq([3]) }
-    specify { expect(PlacesIndex::Country.by_rating(3).by_name(6).map(&:class)).to eq([PlacesIndex::Country]) }
+    specify { expect(PlacesIndex::Country.by_rating(3).by_name(5).map(&:rating)).to eq([3]) }
+    specify { expect(PlacesIndex::Country.by_rating(3).by_name(5).map(&:class)).to eq([PlacesIndex::Country]) }
     specify { expect(PlacesIndex::Country.order(:name).by_rating(3).map(&:rating)).to eq([3]) }
     specify { expect(PlacesIndex::Country.order(:name).by_rating(3).map(&:class)).to eq([PlacesIndex::Country]) }
   end

data/spec/chewy/stash_spec.rb

@@ -83,7 +83,7 @@ describe Chewy::Stash::Journal, :orm do
   describe '#type' do
     let(:index_name) { 'users' }
     let(:type_name) { 'city' }
-    subject { described_class.new('index_name' => index_name, 'type_name' => type_name).type }
+    subject { described_class::Journal.new('index_name' => index_name, 'type_name' => type_name).type }
 
     specify { expect { subject }.to raise_error(Chewy::UnderivableType) }
 

data/spec/chewy/strategy/shoryuken_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 if defined?(::Shoryuken)
+  require 'aws-sdk-sqs'
+
   describe Chewy::Strategy::Shoryuken do
     around { |example| Chewy.strategy(:bypass) { example.run } }
     before { ::Shoryuken.groups.clear }

data/spec/chewy/type/import/journal_builder_spec.rb

@@ -26,13 +26,13 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
       specify do
         expect(subject.bulk_body).to eq([{
           index: {
-            _index: 'chewy_stash',
+            _index: 'chewy_journal',
             _type: 'journal',
             data: {
               'index_name' => 'namespace/places',
               'type_name' => 'city',
               'action' => 'index',
-              'references' => ['{"id":1,"name":"City"}'],
+              'references' => [Base64.encode64('{"id":1,"name":"City"}')],
               'created_at' => time.as_json
             }
           }
@@ -45,13 +45,13 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
       specify do
         expect(subject.bulk_body).to eq([{
           index: {
-            _index: 'chewy_stash',
+            _index: 'chewy_journal',
             _type: 'journal',
             data: {
               'index_name' => 'namespace/places',
               'type_name' => 'city',
               'action' => 'delete',
-              'references' => ['{"id":1,"name":"City"}'],
+              'references' => [Base64.encode64('{"id":1,"name":"City"}')],
               'created_at' => time.as_json
             }
           }
@@ -66,25 +66,25 @@ describe Chewy::Type::Import::JournalBuilder, :orm do
       specify do
         expect(subject.bulk_body).to eq([{
           index: {
-            _index: 'chewy_stash',
+            _index: 'chewy_journal',
             _type: 'journal',
             data: {
               'index_name' => 'namespace/places',
               'type_name' => 'country',
               'action' => 'index',
-              'references' => ['1'],
+              'references' => [Base64.encode64('1')],
               'created_at' => time.as_json
             }
           }
         }, {
           index: {
-            _index: 'chewy_stash',
+            _index: 'chewy_journal',
             _type: 'journal',
             data: {
               'index_name' => 'namespace/places',
               'type_name' => 'country',
               'action' => 'delete',
-              'references' => ['2'],
+              'references' => [Base64.encode64('2')],
               'created_at' => time.as_json
             }
           }

data/spec/chewy/type/import_spec.rb

@@ -40,6 +40,12 @@ describe Chewy::Type::Import do
       CitiesIndex::City.import(dummy_city)
     end
 
+    specify 'lazy without objects' do
+      expect(CitiesIndex).not_to receive(:exists?)
+      expect(CitiesIndex).not_to receive(:create!)
+      CitiesIndex::City.import([])
+    end
+
     context 'skip' do
       before do
         # To avoid flaky issues when previous specs were run

data/spec/chewy/type/mapping_spec.rb

@@ -9,7 +9,7 @@ describe Chewy::Type::Mapping do
       define_type :product do
         root do
           field :name, 'surname'
-          field :title, type: 'string' do
+          field :title, type: 'text' do
             field :subfield1
           end
           field 'price', type: 'float' do
@@ -37,17 +37,17 @@ describe Chewy::Type::Mapping do
     before do
       stub_index(:products) do
         define_type :product do
-          field :title, type: 'string' do
+          field :title, type: 'text' do
             field :subfield1
           end
         end
       end
     end
 
-    specify { expect(product.root_object.children.map(&:name)).to eq([:title]) }
-    specify { expect(product.root_object.children.map(&:parent)).to eq([product.root_object]) }
-    specify { expect(product.root_object.children[0].children.map(&:name)).to eq([:subfield1]) }
-    specify { expect(product.root_object.children[0].children.map(&:parent)).to eq([product.root_object.children[0]]) }
+    specify { expect(product.root.children.map(&:name)).to eq([:title]) }
+    specify { expect(product.root.children.map(&:parent)).to eq([product.root]) }
+    specify { expect(product.root.children[0].children.map(&:name)).to eq([:subfield1]) }
+    specify { expect(product.root.children[0].children.map(&:parent)).to eq([product.root.children[0]]) }
 
     context 'default root options are set' do
       around do |example|
@@ -67,22 +67,53 @@ describe Chewy::Type::Mapping do
   end
 
   describe '.field' do
-    specify { expect(product.root_object.children.map(&:name)).to eq(%i[name surname title price]) }
-    specify { expect(product.root_object.children.map(&:parent)).to eq([product.root_object] * 4) }
+    specify { expect(product.root.children.map(&:name)).to eq(%i[name surname title price]) }
+    specify { expect(product.root.children.map(&:parent)).to eq([product.root] * 4) }
 
-    specify { expect(product.root_object.children[0].children.map(&:name)).to eq([]) }
-    specify { expect(product.root_object.children[1].children.map(&:name)).to eq([]) }
+    specify { expect(product.root.children[0].children.map(&:name)).to eq([]) }
+    specify { expect(product.root.children[1].children.map(&:name)).to eq([]) }
 
-    specify { expect(product.root_object.children[2].children.map(&:name)).to eq([:subfield1]) }
-    specify { expect(product.root_object.children[2].children.map(&:parent)).to eq([product.root_object.children[2]]) }
+    specify { expect(product.root.children[2].children.map(&:name)).to eq([:subfield1]) }
+    specify { expect(product.root.children[2].children.map(&:parent)).to eq([product.root.children[2]]) }
 
-    specify { expect(product.root_object.children[3].children.map(&:name)).to eq([:subfield2]) }
-    specify { expect(product.root_object.children[3].children.map(&:parent)).to eq([product.root_object.children[3]]) }
+    specify { expect(product.root.children[3].children.map(&:name)).to eq([:subfield2]) }
+    specify { expect(product.root.children[3].children.map(&:parent)).to eq([product.root.children[3]]) }
   end
 
   describe '.mappings_hash' do
-    specify { expect(Class.new(Chewy::Type).mappings_hash).to eq({}) }
-    specify { expect(product.mappings_hash).to eq(product.root_object.mappings_hash) }
+    specify { expect(product.mappings_hash).to eq(product.root.mappings_hash) }
+
+    context 'root merging' do
+      context do
+        before do
+          stub_index(:products) do
+            define_type :product do
+              root _parent: 'project', other_option: 'nothing' do
+                field :name do
+                  field :last_name # will be redefined in the following root flock
+                end
+              end
+              root _parent: 'something_else'
+              root other_option: 'option_value' do
+                field :identifier
+                field :name, type: 'integer'
+              end
+            end
+          end
+        end
+
+        specify do
+          expect(product.mappings_hash).to eq(product: {
+            properties: {
+              name: {type: 'integer'},
+              identifier: {type: Chewy.default_field_type}
+            },
+            other_option: 'option_value',
+            _parent: {type: 'something_else'}
+          })
+        end
+      end
+    end
 
     context 'parent-child relationship' do
       context do
@@ -110,7 +141,7 @@ describe Chewy::Type::Mapping do
           end
         end
 
-        specify { expect(product.mappings_hash[:product][:_parent]).to eq(type: 'project') }
+        specify { expect(product.mappings_hash[:product][:_parent]).to eq('type' => 'project') }
       end
     end
   end

data/spec/spec_helper.rb

@@ -29,8 +29,16 @@ Chewy.settings = {
     number_of_replicas: 0
   }
 }
+
+Chewy.default_field_type = 'string' if Chewy::Runtime.version < '5.0'
 # Chewy.transport_logger = Logger.new(STDERR)
 
+KEYWORD_FIELD = if Chewy::Runtime.version < '5.0'
+  {type: 'string', index: 'not_analyzed'}
+else
+  {type: 'keyword'}
+end
+
 RSpec.configure do |config|
   config.mock_with :rspec
   config.order = :random

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 5.0.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
+  name: resque_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: elasticsearch-extensions
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,21 +123,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: resque_spec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -261,11 +261,12 @@ files:
 - gemfiles/rails.4.0.activerecord.gemfile
 - gemfiles/rails.4.1.activerecord.gemfile
 - gemfiles/rails.4.2.activerecord.gemfile
-- gemfiles/rails.4.2.mongoid.5.1.gemfile
+- gemfiles/rails.4.2.mongoid.5.2.gemfile
 - gemfiles/rails.5.0.activerecord.gemfile
-- gemfiles/rails.5.0.mongoid.6.0.gemfile
+- gemfiles/rails.5.0.mongoid.6.1.gemfile
 - gemfiles/rails.5.1.activerecord.gemfile
-- gemfiles/rails.5.1.mongoid.6.1.gemfile
+- gemfiles/rails.5.1.mongoid.6.3.gemfile
+- gemfiles/rails.5.2.activerecord.gemfile
 - gemfiles/sequel.4.45.gemfile
 - lib/chewy.rb
 - lib/chewy/backports/deep_dup.rb
@@ -534,7 +535,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Elasticsearch ODM client wrapper