chewy 0.8.4 → 0.9.0

data/spec/chewy/strategy/atomic_spec.rb

@@ -51,7 +51,10 @@ describe Chewy::Strategy::Atomic, :orm do
     end
 
     specify do
-      expect { country.save!; other_country.destroy }
+      expect do
+        country.save!
+        other_country.destroy
+      end
         .to update_index(CountriesIndex::Country, strategy: :atomic)
         .and_reindex('HL').and_delete('WD').only
     end

data/spec/chewy/strategy/resque_spec.rb

@@ -33,8 +33,8 @@ if defined?(::Resque)
     end
 
     specify do
-      expect(CitiesIndex::City).to receive(:import!).with([city.id, other_city.id], {suffix: '201601'})
-      Chewy::Strategy::Resque::Worker.perform("CitiesIndex::City", [city.id, other_city.id], suffix: '201601')
+      expect(CitiesIndex::City).to receive(:import!).with([city.id, other_city.id], suffix: '201601')
+      Chewy::Strategy::Resque::Worker.perform('CitiesIndex::City', [city.id, other_city.id], suffix: '201601')
     end
   end
 end

data/spec/chewy/strategy/sidekiq_spec.rb

@@ -33,8 +33,8 @@ if defined?(::Sidekiq)
     end
 
     specify do
-      expect(CitiesIndex::City).to receive(:import!).with([city.id, other_city.id], {suffix: '201601'})
-      Chewy::Strategy::Sidekiq::Worker.new.perform("CitiesIndex::City", [city.id, other_city.id], suffix: '201601')
+      expect(CitiesIndex::City).to receive(:import!).with([city.id, other_city.id], suffix: '201601')
+      Chewy::Strategy::Sidekiq::Worker.new.perform('CitiesIndex::City', [city.id, other_city.id], suffix: '201601')
     end
   end
 end

data/spec/chewy/type/actions_spec.rb

@@ -15,7 +15,7 @@ describe Chewy::Type::Actions, :orm do
     end
   end
 
-  let!(:dummy_cities) { 3.times.map { |i| City.create(name: "name#{i}") } }
+  let!(:dummy_cities) { Array.new(3) { |i| City.create(name: "name#{i}") } }
   let(:city) { CitiesIndex::City }
 
   before do

data/spec/chewy/type/adapter/active_record_spec.rb

@@ -41,7 +41,7 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
     subject { described_class.new(City) }
 
     context do
-      let!(:cities) { 3.times.map { City.create! } }
+      let!(:cities) { Array.new(3) { City.create! } }
 
       specify { expect(subject.identify(City.where(nil))).to match_array(cities.map(&:id)) }
       specify { expect(subject.identify(cities)).to eq(cities.map(&:id)) }
@@ -51,7 +51,7 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
 
     context 'custom primary_key' do
       before { stub_model(:city) { self.primary_key = 'rating' } }
-      let!(:cities) { 3.times.map { |i| City.create! { |c| c.rating = i } } }
+      let!(:cities) { Array.new(3) { |i| City.create! { |c| c.rating = i } } }
 
       specify { expect(subject.identify(City.where(nil))).to match_array([0, 1, 2]) }
       specify { expect(subject.identify(cities)).to eq([0, 1, 2]) }
@@ -68,46 +68,83 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
     end
 
     context do
-      let!(:cities) { 3.times.map { City.create! } }
-      let!(:deleted) { 4.times.map { City.create!.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { City.create! } }
+      let!(:deleted) { Array.new(4) { City.create!.tap(&:destroy) } }
       subject { described_class.new(City) }
 
-      specify { expect(import).to eq([{index: cities}]) }
-      specify { expect(import nil).to eq([]) }
-
-      specify { expect(import(City.order(:id))).to eq([{index: cities}]) }
-      specify { expect(import(City.order(:id), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-
-      specify { expect(import(cities)).to eq([{index: cities}]) }
-      specify { expect(import(cities, batch_size: 2))
-          .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-      specify { expect(import(cities, deleted))
-        .to eq([{index: cities}, {delete: deleted}]) }
-      specify { expect(import(cities, deleted, batch_size: 2)).to eq([
-        {index: cities.first(2)},
-        {index: cities.last(1)},
-        {delete: deleted.first(2)},
-        {delete: deleted.last(2)}]) }
-
-      specify { expect(import(cities.map(&:id))).to eq([{index: cities}]) }
-      specify { expect(import(deleted.map(&:id))).to eq([{delete: deleted.map(&:id)}]) }
-      specify { expect(import(cities.map(&:id), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id)))
-        .to eq([{index: cities}, {delete: deleted.map(&:id)}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 2)).to eq([
-        {index: cities.first(2)},
-        {index: cities.last(1)},
-        {delete: deleted.first(2).map(&:id)},
-        {delete: deleted.last(2).map(&:id)}]) }
-
-      specify { expect(import(cities.first, nil)).to eq([{index: [cities.first]}]) }
-      specify { expect(import(cities.first.id, nil)).to eq([{index: [cities.first]}]) }
+      specify { expect(import).to eq([{ index: cities }]) }
+      specify { expect(import(nil)).to eq([]) }
+
+      specify { expect(import(City.order(:id))).to eq([{ index: cities }]) }
+      specify do
+        expect(import(City.order(:id), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+
+      specify { expect(import(cities)).to eq([{ index: cities }]) }
+      specify do
+        expect(import(cities, batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities, deleted))
+          .to eq([{ index: cities }, { delete: deleted }])
+      end
+      specify do
+        expect(import(cities, deleted, batch_size: 2)).to eq([
+          { index: cities.first(2) },
+          { index: cities.last(1) },
+          { delete: deleted.first(2) },
+          { delete: deleted.last(2) }
+        ])
+      end
+
+      specify { expect(import(cities.map(&:id))).to eq([{ index: cities }]) }
+      specify { expect(import(deleted.map(&:id))).to eq([{ delete: deleted.map(&:id) }]) }
+      specify do
+        expect(import(cities.map(&:id), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id)))
+          .to eq([{ index: cities }, { delete: deleted.map(&:id) }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 2)).to eq([
+          { index: cities.first(2) },
+          { index: cities.last(1) },
+          { delete: deleted.first(2).map(&:id) },
+          { delete: deleted.last(2).map(&:id) }
+        ])
+      end
+
+      specify { expect(import(cities.first, nil)).to eq([{ index: [cities.first] }]) }
+      specify { expect(import(cities.first.id, nil)).to eq([{ index: [cities.first] }]) }
+
+      context 'raw_import' do
+        let(:probe) { double }
+        let(:converter) { ->(raw_hash) { probe.call(raw_hash) } }
+        let(:moscow) { OpenStruct.new(id: 1, name: 'Moscow') }
+        let(:warsaw) { OpenStruct.new(id: 2, name: 'Warsaw') }
+        let(:madrid) { OpenStruct.new(id: 3, name: 'Madrid') }
+        before do
+          @one, @two, @three = City.all.to_a
+        end
+
+        it 'uses the raw import converter to make objects out of raw hashes from the database' do
+          expect(City).not_to receive(:new)
+
+          expect(probe).to receive(:call).with(a_hash_including('id' => @one.id, 'name' => @one.name)).and_return(moscow)
+          expect(probe).to receive(:call).with(a_hash_including('id' => @two.id, 'name' => @one.name)).and_return(warsaw)
+          expect(probe).to receive(:call).with(a_hash_including('id' => @three.id, 'name' => @three.name)).and_return(madrid)
+
+          expect(import(City.where(nil), raw_import: converter)).to eq([{ index: [moscow, warsaw, madrid] }])
+        end
+      end
     end
 
-    context 'additional delete conitions' do
-      let!(:cities) { 4.times.map { |i| City.create! rating: i } }
+    context 'additional delete conditions' do
+      let!(:cities) { Array.new(4) { |i| City.create! rating: i } }
       before { cities.last(2).map(&:destroy) }
       subject { described_class.new(City) }
 
@@ -118,111 +155,164 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
           end
         end
       end
-      subject { described_class.new(City, delete_if: ->{ delete_already? }) }
-
-      specify { expect(import(City.where(nil))).to eq([
-        { index: [cities[0]], delete: [cities[1]] }
-      ]) }
-      specify { expect(import(cities)).to eq([
-        { index: [cities[0]], delete: [cities[1]] },
-        { delete: cities.last(2) }
-      ]) }
-      specify { expect(import(cities.map(&:id))).to eq([
-        { index: [cities[0]], delete: [cities[1]] },
-        { delete: cities.last(2).map(&:id) }
-      ]) }
+      subject { described_class.new(City, delete_if: -> { delete_already? }) }
+
+      specify do
+        expect(import(City.where(nil))).to eq([
+          { index: [cities[0]], delete: [cities[1]] }
+        ])
+      end
+      specify do
+        expect(import(cities)).to eq([
+          { index: [cities[0]], delete: [cities[1]] },
+          { delete: cities.last(2) }
+        ])
+      end
+      specify do
+        expect(import(cities.map(&:id))).to eq([
+          { index: [cities[0]], delete: [cities[1]] },
+          { delete: cities.last(2).map(&:id) }
+        ])
+      end
     end
 
     context 'custom primary_key' do
       before { stub_model(:city) { self.primary_key = 'rating' } }
-      let!(:cities) { 3.times.map { |i| City.create! { |c| c.rating = i + 7 } } }
-      let!(:deleted) { 3.times.map { |i| City.create! { |c| c.rating = i + 10 }.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { |i| City.create! { |c| c.rating = i + 7 } } }
+      let!(:deleted) { Array.new(3) { |i| City.create! { |c| c.rating = i + 10 }.tap(&:destroy) } }
       subject { described_class.new(City) }
 
-      specify { expect(import).to eq([{index: cities}]) }
-
-      specify { expect(import(City.order(:rating))).to eq([{index: cities}]) }
-      specify { expect(import(City.order(:rating), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-
-      specify { expect(import(cities)).to eq([{index: cities}]) }
-      specify { expect(import(cities, batch_size: 2))
-          .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-      specify { expect(import(cities, deleted))
-        .to eq([{index: cities}, {delete: deleted}]) }
-      specify { expect(import(cities, deleted, batch_size: 2)).to eq([
-        {index: cities.first(2)},
-        {index: cities.last(1)},
-        {delete: deleted.first(2)},
-        {delete: deleted.last(1)}]) }
-
-      specify { expect(import(cities.map(&:id))).to eq([{index: cities}]) }
-      specify { expect(import(cities.map(&:id), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id)))
-        .to eq([{index: cities}, {delete: deleted.map(&:id)}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 2)).to eq([
-        {index: cities.first(2)},
-        {index: cities.last(1)},
-        {delete: deleted.first(2).map(&:id)},
-        {delete: deleted.last(1).map(&:id)}]) }
+      specify { expect(import).to eq([{ index: cities }]) }
+
+      specify { expect(import(City.order(:rating))).to eq([{ index: cities }]) }
+      specify do
+        expect(import(City.order(:rating), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+
+      specify { expect(import(cities)).to eq([{ index: cities }]) }
+      specify do
+        expect(import(cities, batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities, deleted))
+          .to eq([{ index: cities }, { delete: deleted }])
+      end
+      specify do
+        expect(import(cities, deleted, batch_size: 2)).to eq([
+          { index: cities.first(2) },
+          { index: cities.last(1) },
+          { delete: deleted.first(2) },
+          { delete: deleted.last(1) }
+        ])
+      end
+
+      specify { expect(import(cities.map(&:id))).to eq([{ index: cities }]) }
+      specify do
+        expect(import(cities.map(&:id), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id)))
+          .to eq([{ index: cities }, { delete: deleted.map(&:id) }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 2)).to eq([
+          { index: cities.first(2) },
+          { index: cities.last(1) },
+          { delete: deleted.first(2).map(&:id) },
+          { delete: deleted.last(1).map(&:id) }
+        ])
+      end
     end
 
     context 'default scope' do
-      let!(:cities) { 4.times.map { |i| City.create!(rating: i/3) } }
-      let!(:deleted) { 3.times.map { |i| City.create!.tap(&:destroy) } }
+      let!(:cities) { Array.new(4) { |i| City.create!(rating: i / 3) } }
+      let!(:deleted) { Array.new(3) { City.create!.tap(&:destroy) } }
       subject { described_class.new(City.where(rating: 0)) }
 
-      specify { expect(import).to eq([{index: cities.first(3)}]) }
+      specify { expect(import).to eq([{ index: cities.first(3) }]) }
 
-      specify { expect(import(City.where('rating < 2')))
-        .to eq([{index: cities.first(3)}]) }
-      specify { expect(import(City.where('rating < 2'), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: [cities[2]]}]) }
-      specify { expect(import(City.where('rating < 1')))
-        .to eq([{index: cities.first(3)}]) }
+      specify do
+        expect(import(City.where('rating < 2')))
+          .to eq([{ index: cities.first(3) }])
+      end
+      specify do
+        expect(import(City.where('rating < 2'), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: [cities[2]] }])
+      end
+      specify do
+        expect(import(City.where('rating < 1')))
+          .to eq([{ index: cities.first(3) }])
+      end
       specify { expect(import(City.where('rating > 1'))).to eq([]) }
 
-      specify { expect(import(cities.first(2)))
-        .to eq([{index: cities.first(2)}]) }
-      specify { expect(import(cities))
-        .to eq([{index: cities.first(3)}, {delete: cities.last(1)}]) }
-      specify { expect(import(cities, batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: [cities[2]]}, {delete: cities.last(1)}]) }
-      specify { expect(import(cities, deleted))
-        .to eq([{index: cities.first(3)}, {delete: cities.last(1) + deleted}]) }
-      specify { expect(import(cities, deleted, batch_size: 3)).to eq([
-        {index: cities.first(3)},
-        {delete: cities.last(1) + deleted.first(2)},
-        {delete: deleted.last(1)}]) }
-
-      specify { expect(import(cities.first(2).map(&:id)))
-        .to eq([{index: cities.first(2)}]) }
-      specify { expect(import(cities.map(&:id)))
-        .to eq([{index: cities.first(3)}, {delete: [cities.last.id]}]) }
-      specify { expect(import(cities.map(&:id), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: [cities[2]]}, {delete: [cities.last.id]}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id)))
-        .to eq([{index: cities.first(3)}, {delete: [cities.last.id] + deleted.map(&:id)}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 3)).to eq([
-        {index: cities.first(3)},
-        {delete: [cities.last.id] + deleted.first(2).map(&:id)},
-        {delete: deleted.last(1).map(&:id)}]) }
+      specify do
+        expect(import(cities.first(2)))
+          .to eq([{ index: cities.first(2) }])
+      end
+      specify do
+        expect(import(cities))
+          .to eq([{ index: cities.first(3) }, { delete: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities, batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: [cities[2]] }, { delete: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities, deleted))
+          .to eq([{ index: cities.first(3) }, { delete: cities.last(1) + deleted }])
+      end
+      specify do
+        expect(import(cities, deleted, batch_size: 3)).to eq([
+          { index: cities.first(3) },
+          { delete: cities.last(1) + deleted.first(2) },
+          { delete: deleted.last(1) }
+        ])
+      end
+
+      specify do
+        expect(import(cities.first(2).map(&:id)))
+          .to eq([{ index: cities.first(2) }])
+      end
+      specify do
+        expect(import(cities.map(&:id)))
+          .to eq([{ index: cities.first(3) }, { delete: [cities.last.id] }])
+      end
+      specify do
+        expect(import(cities.map(&:id), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: [cities[2]] }, { delete: [cities.last.id] }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id)))
+          .to eq([{ index: cities.first(3) }, { delete: [cities.last.id] + deleted.map(&:id) }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 3)).to eq([
+          { index: cities.first(3) },
+          { delete: [cities.last.id] + deleted.first(2).map(&:id) },
+          { delete: deleted.last(1).map(&:id) }
+        ])
+      end
     end
 
     context 'error handling' do
-      let!(:cities) { 3.times.map { |i| City.create! } }
-      let!(:deleted) { 2.times.map { |i| City.create!.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { City.create! } }
+      let!(:deleted) { Array.new(2) { City.create!.tap(&:destroy) } }
       let(:ids) { (cities + deleted).map(&:id) }
       subject { described_class.new(City) }
 
       let(:data_comparer) do
-        ->(id, data) { objects = data[:index] || data[:delete]; !objects.map { |o| o.respond_to?(:id) ? o.id : o }.include?(id) }
+        lambda do |id, data|
+          objects = data[:index] || data[:delete]
+          !objects.map { |o| o.respond_to?(:id) ? o.id : o }.include?(id)
+        end
       end
 
       context 'implicit scope' do
-        specify { expect(subject.import { |data| true }).to eq(true) }
-        specify { expect(subject.import { |data| false }).to eq(false) }
+        specify { expect(subject.import { |_data| true }).to eq(true) }
+        specify { expect(subject.import { |_data| false }).to eq(false) }
         specify { expect(subject.import(batch_size: 1, &data_comparer.curry[cities[0].id])).to eq(false) }
         specify { expect(subject.import(batch_size: 1, &data_comparer.curry[cities[1].id])).to eq(false) }
         specify { expect(subject.import(batch_size: 1, &data_comparer.curry[cities[2].id])).to eq(false) }
@@ -233,8 +323,8 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
       context 'explicit scope' do
         let(:scope) { City.where(id: ids) }
 
-        specify { expect(subject.import(scope) { |data| true }).to eq(true) }
-        specify { expect(subject.import(scope) { |data| false }).to eq(false) }
+        specify { expect(subject.import(scope) { |_data| true }).to eq(true) }
+        specify { expect(subject.import(scope) { |_data| false }).to eq(false) }
         specify { expect(subject.import(scope, batch_size: 1, &data_comparer.curry[cities[0].id])).to eq(false) }
         specify { expect(subject.import(scope, batch_size: 1, &data_comparer.curry[cities[1].id])).to eq(false) }
         specify { expect(subject.import(scope, batch_size: 1, &data_comparer.curry[cities[2].id])).to eq(false) }
@@ -243,8 +333,8 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
       end
 
       context 'objects' do
-        specify { expect(subject.import(cities + deleted) { |data| true }).to eq(true) }
-        specify { expect(subject.import(cities + deleted) { |data| false }).to eq(false) }
+        specify { expect(subject.import(cities + deleted) { |_data| true }).to eq(true) }
+        specify { expect(subject.import(cities + deleted) { |_data| false }).to eq(false) }
         specify { expect(subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[cities[0].id])).to eq(false) }
         specify { expect(subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[cities[1].id])).to eq(false) }
         specify { expect(subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[cities[2].id])).to eq(false) }
@@ -253,8 +343,8 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
       end
 
       context 'ids' do
-        specify { expect(subject.import(ids) { |data| true }).to eq(true) }
-        specify { expect(subject.import(ids) { |data| false }).to eq(false) }
+        specify { expect(subject.import(ids) { |_data| true }).to eq(true) }
+        specify { expect(subject.import(ids) { |_data| false }).to eq(false) }
         specify { expect(subject.import(ids, batch_size: 1, &data_comparer.curry[cities[0].id])).to eq(false) }
         specify { expect(subject.import(ids, batch_size: 1, &data_comparer.curry[cities[1].id])).to eq(false) }
         specify { expect(subject.import(ids, batch_size: 1, &data_comparer.curry[cities[2].id])).to eq(false) }
@@ -266,8 +356,8 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
 
   describe '#load' do
     context do
-      let!(:cities) { 3.times.map { |i| City.create!(rating: i/2) } }
-      let!(:deleted) { 2.times.map { |i| City.create!.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { |i| City.create!(rating: i / 2) } }
+      let!(:deleted) { Array.new(2) { City.create!.tap(&:destroy) } }
 
       let(:type) { double(type_name: 'user') }
 
@@ -277,22 +367,30 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
       specify { expect(subject.load(cities.map { |c| double(id: c.id) }.reverse, _type: type)).to eq(cities.reverse) }
       specify { expect(subject.load(deleted.map { |c| double(id: c.id) }, _type: type)).to eq([nil, nil]) }
       specify { expect(subject.load((cities + deleted).map { |c| double(id: c.id) }, _type: type)).to eq([*cities, nil, nil]) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: ->{ where(rating: 0) }))
-        .to eq(cities.first(2) + [nil]) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) },
-        _type: type, scope: ->{ where(rating: 0) }, user: {scope: ->{ where(rating: 1)}}))
-        .to eq([nil, nil] + cities.last(1)) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: City.where(rating: 1)))
-        .to eq([nil, nil] + cities.last(1)) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) },
-        _type: type, scope: City.where(rating: 1), user: {scope: ->{ where(rating: 0)}}))
-        .to eq(cities.first(2) + [nil]) }
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: -> { where(rating: 0) }))
+          .to eq(cities.first(2) + [nil])
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) },
+          _type: type, scope: -> { where(rating: 0) }, user: { scope: -> { where(rating: 1) } }))
+          .to eq([nil, nil] + cities.last(1))
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: City.where(rating: 1)))
+          .to eq([nil, nil] + cities.last(1))
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) },
+          _type: type, scope: City.where(rating: 1), user: { scope: -> { where(rating: 0) } }))
+          .to eq(cities.first(2) + [nil])
+      end
     end
 
     context 'custom primary_key' do
       before { stub_model(:city) { self.primary_key = 'rating' } }
-      let!(:cities) { 3.times.map { |i| City.create!(country_id: i/2) { |c| c.rating = i + 7 } } }
-      let!(:deleted) { 2.times.map { |i| City.create! { |c| c.rating = i + 10 }.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { |i| City.create!(country_id: i / 2) { |c| c.rating = i + 7 } } }
+      let!(:deleted) { Array.new(2) { |i| City.create! { |c| c.rating = i + 10 }.tap(&:destroy) } }
 
       let(:type) { double(type_name: 'user') }
 
@@ -302,16 +400,24 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
       specify { expect(subject.load(cities.map { |c| double(id: c.id) }.reverse, _type: type)).to eq(cities.reverse) }
       specify { expect(subject.load(deleted.map { |c| double(id: c.id) }, _type: type)).to eq([nil, nil]) }
       specify { expect(subject.load((cities + deleted).map { |c| double(id: c.id) }, _type: type)).to eq([*cities, nil, nil]) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: ->{ where(country_id: 0) }))
-        .to eq(cities.first(2) + [nil]) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) },
-        _type: type, scope: ->{ where(country_id: 0) }, user: {scope: ->{ where(country_id: 1)}}))
-        .to eq([nil, nil] + cities.last(1)) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: City.where(country_id: 1)))
-        .to eq([nil, nil] + cities.last(1)) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) },
-        _type: type, scope: City.where(country_id: 1), user: {scope: ->{ where(country_id: 0)}}))
-        .to eq(cities.first(2) + [nil]) }
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: -> { where(country_id: 0) }))
+          .to eq(cities.first(2) + [nil])
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) },
+          _type: type, scope: -> { where(country_id: 0) }, user: { scope: -> { where(country_id: 1) } }))
+          .to eq([nil, nil] + cities.last(1))
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: City.where(country_id: 1)))
+          .to eq([nil, nil] + cities.last(1))
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) },
+          _type: type, scope: City.where(country_id: 1), user: { scope: -> { where(country_id: 0) } }))
+          .to eq(cities.first(2) + [nil])
+      end
     end
   end
 end