chewy 7.6.0 → 8.0.0

data/spec/chewy/journal_spec.rb

@@ -21,7 +21,7 @@ describe Chewy::Journal do
             default_import_options journal: true
           end
 
-          Chewy.massacre
+          drop_indices
           Chewy.settings[:prefix] = 'some_prefix'
           Timecop.freeze(time)
         end
@@ -145,7 +145,7 @@ describe Chewy::Journal do
   end
 
   context do
-    before { Chewy.massacre }
+    before { drop_indices }
     before do
       stub_model(:city) do
         update_index 'cities', :self

data/spec/chewy/minitest/helpers_spec.rb

@@ -17,7 +17,7 @@ describe :minitest_helper do
   end
 
   before do
-    Chewy.massacre
+    drop_indices
   end
 
   before do
@@ -121,13 +121,9 @@ describe :minitest_helper do
         }
       end
 
-      let(:unexpected_query_error_message) do
-        'got {:index=>["dummies"], :body=>{:query=>{:bool=>{:filter=>{:bool=>{:must=>{:match=>{:foo=>"bar"}}, :should=>{:multi_match=>{:foo=>"bar"}}}}}}}} instead of expected query.'
-      end
-
       specify do
         expect { assert_elasticsearch_query(query, unexpected_query) }
-          .to raise_error(RuntimeError, unexpected_query_error_message)
+          .to raise_error(RuntimeError, /instead of expected query\./)
       end
     end
   end

data/spec/chewy/multi_search_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'chewy/multi_search'
 
 describe Chewy::MultiSearch do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_model(:city)

data/spec/chewy/rake_helper_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'rake'
 
 describe Chewy::RakeHelper, :orm do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     described_class.instance_variable_set(:@journal_exists, journal_exists)

data/spec/chewy/repository_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe Chewy::Repository do
   subject { described_class.send(:new) }
 
-  its(:analyzers) { should == {} }
-  its(:tokenizers) { should == {} }
-  its(:filters) { should == {} }
-  its(:char_filters) { should == {} }
+  specify { expect(subject.analyzers).to eq({}) }
+  specify { expect(subject.tokenizers).to eq({}) }
+  specify { expect(subject.filters).to eq({}) }
+  specify { expect(subject.char_filters).to eq({}) }
 
   describe '#analyzer' do
     specify { expect(subject.analyzer(:name)).to be_nil }

data/spec/chewy/rspec/update_index_spec.rb

@@ -9,7 +9,7 @@ describe :update_index do
   end
 
   before do
-    Chewy.massacre
+    drop_indices
     DummiesIndex.create!
   end
 
@@ -262,7 +262,7 @@ describe :update_index do
 
         specify { expectation.to fail_matching 'Expected document with id `43` to be reindexed' }
         specify { expectation.to fail_matching '2 times, but was reindexed 1 times' }
-        specify { expectation.to fail_matching 'with {:a=>2}, but it was reindexed with {:a=>"1"}' }
+        specify { expectation.to fail_matching 'but it was reindexed with' }
       end
     end
   end

data/spec/chewy/runtime_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Chewy::Runtime do
   describe '.version' do
     specify { expect(described_class.version).to be_a(described_class::Version) }
-    specify { expect(described_class.version).to be >= '7.0' }
-    specify { expect(described_class.version).to be < '8.0' }
+    specify { expect(described_class.version).to be >= '8.0' }
+    specify { expect(described_class.version).to be < '9.0' }
   end
 end

data/spec/chewy/search/loader_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Search::Loader do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_model(:city)

data/spec/chewy/search/pagination/kaminari_examples.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 shared_examples :kaminari do |request_base_class|
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_index(:products) do

data/spec/chewy/search/query_proxy_spec.rb

@@ -12,10 +12,6 @@ describe Chewy::Search::QueryProxy do
       expect(subject.must(multi_match: {foo: 'bar'}).render[:body])
         .to eq(query: {bool: {must: [{match: {foo: 'bar'}}, {multi_match: {foo: 'bar'}}]}})
     end
-    specify do
-      expect(subject.must(multi_match: {foo: 'bar'}).render[:body])
-        .to eq(query: {bool: {must: [{match: {foo: 'bar'}}, {multi_match: {foo: 'bar'}}]}})
-    end
   end
 
   describe '#should' do
@@ -24,10 +20,6 @@ describe Chewy::Search::QueryProxy do
       expect(subject.should(multi_match: {foo: 'bar'}).render[:body])
         .to eq(query: {bool: {must: {match: {foo: 'bar'}}, should: {multi_match: {foo: 'bar'}}}})
     end
-    specify do
-      expect(subject.should(multi_match: {foo: 'bar'}).render[:body])
-        .to eq(query: {bool: {must: {match: {foo: 'bar'}}, should: {multi_match: {foo: 'bar'}}}})
-    end
   end
 
   describe '#must_not' do
@@ -36,10 +28,6 @@ describe Chewy::Search::QueryProxy do
       expect(subject.must_not(multi_match: {foo: 'bar'}).render[:body])
         .to eq(query: {bool: {must: {match: {foo: 'bar'}}, must_not: {multi_match: {foo: 'bar'}}}})
     end
-    specify do
-      expect(subject.must_not(multi_match: {foo: 'bar'}).render[:body])
-        .to eq(query: {bool: {must: {match: {foo: 'bar'}}, must_not: {multi_match: {foo: 'bar'}}}})
-    end
   end
 
   describe '#and' do
@@ -48,10 +36,6 @@ describe Chewy::Search::QueryProxy do
       expect(subject.and(multi_match: {foo: 'bar'}).render[:body])
         .to eq(query: {bool: {must: [{match: {foo: 'bar'}}, {multi_match: {foo: 'bar'}}]}})
     end
-    specify do
-      expect(subject.and(multi_match: {foo: 'bar'}).render[:body])
-        .to eq(query: {bool: {must: [{match: {foo: 'bar'}}, {multi_match: {foo: 'bar'}}]}})
-    end
     specify do
       expect(subject.and(scope).render[:body])
         .to eq(query: {bool: {must: [{match: {foo: 'bar'}}, {bool: {must_not: {match: {foo: 'bar'}}}}]}})
@@ -64,10 +48,6 @@ describe Chewy::Search::QueryProxy do
       expect(subject.or(multi_match: {foo: 'bar'}).render[:body])
         .to eq(query: {bool: {should: [{match: {foo: 'bar'}}, {multi_match: {foo: 'bar'}}]}})
     end
-    specify do
-      expect(subject.or(multi_match: {foo: 'bar'}).render[:body])
-        .to eq(query: {bool: {should: [{match: {foo: 'bar'}}, {multi_match: {foo: 'bar'}}]}})
-    end
     specify do
       expect(subject.or(scope).render[:body])
         .to eq(query: {bool: {should: [{match: {foo: 'bar'}}, {bool: {must_not: {match: {foo: 'bar'}}}}]}})
@@ -80,10 +60,6 @@ describe Chewy::Search::QueryProxy do
       expect(subject.not(multi_match: {foo: 'bar'}).render[:body])
         .to eq(query: {bool: {must: {match: {foo: 'bar'}}, must_not: {multi_match: {foo: 'bar'}}}})
     end
-    specify do
-      expect(subject.not(multi_match: {foo: 'bar'}).render[:body])
-        .to eq(query: {bool: {must: {match: {foo: 'bar'}}, must_not: {multi_match: {foo: 'bar'}}}})
-    end
     specify do
       expect(subject.not(scope).render[:body])
         .to eq(query: {bool: {must: {match: {foo: 'bar'}}, must_not: {bool: {must_not: {match: {foo: 'bar'}}}}}})

data/spec/chewy/search/request_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Search::Request do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_index(:products) do
@@ -54,11 +54,15 @@ describe Chewy::Search::Request do
   describe '#inspect' do
     specify do
       expect(described_class.new(ProductsIndex).inspect)
-        .to eq('<Chewy::Search::Request {:index=>["products"], :body=>{}}>')
+        .to match(/\A<Chewy::Search::Request/)
+        .and include('"products"')
     end
     specify do
       expect(ProductsIndex.limit(10).inspect)
-        .to eq('<ProductsIndex::Query {:index=>["products"], :body=>{:size=>10}}>')
+        .to match(/\A<ProductsIndex::Query/)
+        .and include('"products"')
+        .and include('size')
+        .and include('10')
     end
   end
 

data/spec/chewy/search/response_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Search::Response, :orm do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_model(:city)
@@ -39,7 +39,7 @@ describe Chewy::Search::Response, :orm do
     specify { expect(subject.hits).to all be_a(Hash) }
     specify do
       expect(subject.hits.flat_map(&:keys).uniq)
-        .to match_array(%w[_id _index _type _score _source sort])
+        .to match_array(%w[_id _index _score _source sort])
     end
 
     context do
@@ -68,32 +68,10 @@ describe Chewy::Search::Response, :orm do
 
   describe '#took' do
     specify { expect(subject.took).to be >= 0 }
-
-    context do
-      let(:request) do
-        Chewy::Search::Request.new(CitiesIndex)
-          .query(script: {script: {inline: 'sleep(100); true', lang: 'groovy'}})
-      end
-      specify do
-        pending
-        expect(subject.took).to be > 100
-      end
-    end
   end
 
   describe '#timed_out?' do
     specify { expect(subject.timed_out?).to eq(false) }
-
-    context do
-      let(:request) do
-        Chewy::Search::Request.new(CitiesIndex)
-          .query(script: {script: {inline: 'sleep(100); true', lang: 'groovy'}}).timeout('10ms')
-      end
-      specify do
-        pending
-        expect(subject.timed_out?).to eq(true)
-      end
-    end
   end
 
   describe '#suggest' do

data/spec/chewy/search/scrolling_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Search::Scrolling, :orm do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_model(:city)

data/spec/chewy/search_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Search do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_index(:products)

data/spec/chewy/stash_spec.rb

@@ -5,7 +5,7 @@ describe Chewy::Stash::Journal, :orm do
     response['deleted'] || response['_indices']['_all']['deleted']
   end
 
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_model(:city)

data/spec/chewy/strategy/delayed_sidekiq_spec.rb

@@ -21,13 +21,23 @@ if defined?(Sidekiq)
         update_index('cities') { self }
       end
 
+      stub_uuid_model(:user) do
+        update_index('users') { self }
+      end
+
       stub_index(:cities) do
         index_scope City
       end
+
+      stub_index(:users) do
+        index_scope User
+      end
     end
 
     let(:city) { City.create!(name: 'hello') }
     let(:other_city) { City.create!(name: 'world') }
+    let(:user) { User.create!(name: 'John') }
+    let(:other_user) { User.create!(name: 'Jane') }
 
     it 'does not trigger immediate reindex due to it`s async nature' do
       expect { [city, other_city].map(&:save!) }
@@ -36,12 +46,19 @@ if defined?(Sidekiq)
 
     it "respects 'refresh: false' options" do
       allow(Chewy).to receive(:disable_refresh_async).and_return(true)
-      expect(CitiesIndex).to receive(:import!).with(match_array([city.id, other_city.id]), refresh: false)
+      expect(CitiesIndex).to receive(:import!).with(match_array([city.id.to_s, other_city.id.to_s]), refresh: false)
       scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [city.id, other_city.id])
       scheduler.postpone
       Chewy::Strategy::DelayedSidekiq::Worker.drain
     end
 
+    it 'works with models with string primary key' do
+      expect(UsersIndex).to receive(:import!).with(match_array([user.id, other_user.id]))
+      scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(UsersIndex, [user.id, other_user.id])
+      scheduler.postpone
+      Chewy::Strategy::DelayedSidekiq::Worker.drain
+    end
+
     context 'with default config' do
       it 'does schedule a job that triggers reindex with default options' do
         Timecop.freeze do
@@ -109,7 +126,7 @@ if defined?(Sidekiq)
     context 'two reindex call within the timewindow' do
       it 'accumulates all ids does the reindex one time' do
         Timecop.freeze do
-          expect(CitiesIndex).to receive(:import!).with(match_array([city.id, other_city.id])).once
+          expect(CitiesIndex).to receive(:import!).with(match_array([city.id.to_s, other_city.id.to_s])).once
           scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [city.id])
           scheduler.postpone
           scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [other_city.id])
@@ -121,7 +138,7 @@ if defined?(Sidekiq)
       context 'one call with update_fields another one without update_fields' do
         it 'does reindex of all fields' do
           Timecop.freeze do
-            expect(CitiesIndex).to receive(:import!).with(match_array([city.id, other_city.id])).once
+            expect(CitiesIndex).to receive(:import!).with(match_array([city.id.to_s, other_city.id.to_s])).once
             scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [city.id], update_fields: ['name'])
             scheduler.postpone
             scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [other_city.id])
@@ -134,7 +151,7 @@ if defined?(Sidekiq)
       context 'both calls with different update fields' do
         it 'deos reindex with union of fields' do
           Timecop.freeze do
-            expect(CitiesIndex).to receive(:import!).with(match_array([city.id, other_city.id]), update_fields: %w[name description]).once
+            expect(CitiesIndex).to receive(:import!).with(match_array([city.id.to_s, other_city.id.to_s]), update_fields: match_array(%w[name description])).once
             scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [city.id], update_fields: ['name'])
             scheduler.postpone
             scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [other_city.id], update_fields: ['description'])
@@ -148,8 +165,8 @@ if defined?(Sidekiq)
     context 'two calls within different timewindows' do
       it 'does two separate reindexes' do
         Timecop.freeze do
-          expect(CitiesIndex).to receive(:import!).with([city.id]).once
-          expect(CitiesIndex).to receive(:import!).with([other_city.id]).once
+          expect(CitiesIndex).to receive(:import!).with([city.id.to_s]).once
+          expect(CitiesIndex).to receive(:import!).with([other_city.id.to_s]).once
           Timecop.travel(20.seconds.ago) do
             scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [city.id])
             scheduler.postpone
@@ -164,8 +181,8 @@ if defined?(Sidekiq)
     context 'first call has update_fields' do
       it 'does first reindex with the expected update_fields and second without update_fields' do
         Timecop.freeze do
-          expect(CitiesIndex).to receive(:import!).with([city.id], update_fields: ['name']).once
-          expect(CitiesIndex).to receive(:import!).with([other_city.id]).once
+          expect(CitiesIndex).to receive(:import!).with([city.id.to_s], update_fields: ['name']).once
+          expect(CitiesIndex).to receive(:import!).with([other_city.id.to_s]).once
           Timecop.travel(20.seconds.ago) do
             scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [city.id], update_fields: ['name'])
             scheduler.postpone
@@ -180,8 +197,8 @@ if defined?(Sidekiq)
     context 'both calls have update_fields option' do
       it 'does both reindexes with their expected update_fields option' do
         Timecop.freeze do
-          expect(CitiesIndex).to receive(:import!).with([city.id], update_fields: ['name']).once
-          expect(CitiesIndex).to receive(:import!).with([other_city.id], update_fields: ['description']).once
+          expect(CitiesIndex).to receive(:import!).with([city.id.to_s], update_fields: ['name']).once
+          expect(CitiesIndex).to receive(:import!).with([other_city.id.to_s], update_fields: ['description']).once
           Timecop.travel(20.seconds.ago) do
             scheduler = Chewy::Strategy::DelayedSidekiq::Scheduler.new(CitiesIndex, [city.id], update_fields: ['name'])
             scheduler.postpone

data/spec/chewy/strategy_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Strategy do
-  before { Chewy.massacre }
+  before { drop_indices }
   subject(:strategy) { Chewy::Strategy.new }
 
   describe '#current' do

data/spec/chewy_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Chewy do
-  it 'should have a version number' do
-    expect(Chewy::VERSION).not_to be nil
+  it 'has a version number' do
+    expect(Chewy::VERSION).not_to be_nil
   end
 
   describe '.derive_name' do
@@ -31,24 +31,6 @@ describe Chewy do
     end
   end
 
-  describe '.massacre' do
-    before { Chewy.massacre }
-
-    before do
-      allow(Chewy).to receive_messages(configuration: Chewy.configuration.merge(prefix: 'prefix1'))
-      stub_index(:admins).create!
-      allow(Chewy).to receive_messages(configuration: Chewy.configuration.merge(prefix: 'prefix2'))
-      stub_index(:developers).create!
-
-      Chewy.massacre
-
-      allow(Chewy).to receive_messages(configuration: Chewy.configuration.merge(prefix: 'prefix1'))
-    end
-
-    specify { expect(AdminsIndex.exists?).to eq(true) }
-    specify { expect(DevelopersIndex.exists?).to eq(false) }
-  end
-
   describe '.client' do
     let!(:initial_client) { Chewy.current[:chewy_client] }
     let(:faraday_block) { proc {} }
@@ -84,7 +66,8 @@ describe Chewy do
       # To avoid flaky issues when previous specs were run
       allow(Chewy::Index).to receive(:descendants).and_return([CitiesIndex, PlacesIndex])
 
-      Chewy.massacre
+      CitiesIndex.delete
+      PlacesIndex.delete
     end
 
     specify do
@@ -111,7 +94,7 @@ describe Chewy do
       expect(CitiesIndex.exists?).to eq true
       expect(PlacesIndex.exists?).to eq true
 
-      expect { Chewy.create_indices! }.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest)
+      expect { Chewy.create_indices! }.to raise_error(Elastic::Transport::Transport::Errors::BadRequest)
     end
   end
 end

data/spec/spec_helper.rb

@@ -28,6 +28,32 @@ Chewy.settings = {
   }
 }
 
+# To work with security enabled:
+#
+# user = ENV['ES_USER'] || 'elastic'
+# password = ENV['ES_PASSWORD'] || ''
+# ca_cert = ENV['ES_CA_CERT'] || './tmp/http_ca.crt'
+#
+# Chewy.settings.merge!(
+#   user: user,
+#   password: password,
+#   transport_options: {
+#     ssl: {
+#       ca_file: ca_cert
+#     }
+#   }
+# )
+
+# Low-level substitute for now-obsolete drop_indices
+def drop_indices
+  response = Chewy.client.cat.indices
+  indices = response.body.lines.map { |line| line.split[2] }
+  return if indices.blank?
+
+  Chewy.client.indices.delete(index: indices)
+  Chewy.wait_for_status
+end
+
 # Chewy.transport_logger = Logger.new(STDERR)
 
 RSpec.configure do |config|

data/spec/support/active_record.rb

@@ -6,17 +6,16 @@ if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks)
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 
-ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'countries'")
-ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'cities'")
-ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'locations'")
-ActiveRecord::Schema.define do
+def create_countries_table
   create_table :countries do |t|
     t.column :name, :string
     t.column :country_code, :string
     t.column :rating, :integer
     t.column :updated_at, :datetime
   end
+end
 
+def create_cities_table
   create_table :cities do |t|
     t.column :country_id, :integer
     t.column :name, :string
@@ -25,13 +24,17 @@ ActiveRecord::Schema.define do
     t.column :rating, :integer
     t.column :updated_at, :datetime
   end
+end
 
+def create_locations_table
   create_table :locations do |t|
     t.column :city_id, :integer
     t.column :lat, :string
     t.column :lon, :string
   end
+end
 
+def create_comments_table
   create_table :comments do |t|
     t.column :content, :string
     t.column :comment_type, :string
@@ -40,6 +43,26 @@ ActiveRecord::Schema.define do
   end
 end
 
+def create_users_table
+  create_table :users, id: false do |t|
+    t.column :id, :string
+    t.column :name, :string
+  end
+end
+
+ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'countries'")
+ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'cities'")
+ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'locations'")
+ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'comments'")
+ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'users'")
+ActiveRecord::Schema.define do
+  create_countries_table
+  create_cities_table
+  create_locations_table
+  create_comments_table
+  create_users_table
+end
+
 module ActiveRecordClassHelpers
   extend ActiveSupport::Concern
 
@@ -73,6 +96,14 @@ module ActiveRecordClassHelpers
   def stub_model(name, superclass = nil, &block)
     stub_class(name, superclass || ActiveRecord::Base, &block)
   end
+
+  def stub_uuid_model(name, superclass = nil, &block)
+    stub_class(name, superclass || ActiveRecord::Base) do
+      before_create { self.id = SecureRandom.uuid }
+      define_singleton_method(:primary_key, -> { 'id' })
+      class_eval(&block)
+    end
+  end
 end
 
 RSpec.configure do |config|