chewy 0.7.0 → 0.8.0

data/spec/chewy/type/mapping_spec.rb

@@ -20,14 +20,17 @@ describe Chewy::Type::Mapping do
   end
 
   describe '.field' do
-    specify { expect(product.root_object.nested.keys).to match_array([:name, :surname, :title, :price]) }
-    specify { expect(product.root_object.nested.values).to satisfy { |v| v.all? { |f| f.is_a? Chewy::Fields::Base } } }
+    specify { expect(product.root_object.children.map(&:name)).to eq([:name, :surname, :title, :price]) }
+    specify { expect(product.root_object.children.map(&:parent)).to eq([product.root_object] * 4) }
 
-    specify { expect(product.root_object.nested[:title].nested.keys).to eq([:subfield1]) }
-    specify { expect(product.root_object.nested[:title].nested[:subfield1]).to be_a Chewy::Fields::Base }
+    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_object.nested[:price].nested.keys).to eq([:subfield2]) }
-    specify { expect(product.root_object.nested[:price].nested[:subfield2]).to be_a Chewy::Fields::Base }
+    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_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]]) }
   end
 
   describe '.mappings_hash' do
@@ -60,7 +63,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
@@ -76,7 +79,9 @@ describe Chewy::Type::Mapping do
       end
     end
 
-    specify { expect(product.root_object.nested[:title].nested.keys).to eq([:subfield1]) }
-    specify { expect(product.root_object.nested[:title].nested[:subfield1]).to be_a Chewy::Fields::Base }
+    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]]) }
   end
 end

data/spec/chewy/type/observe_spec.rb

@@ -22,7 +22,9 @@ describe Chewy::Type::Import do
     before do
       stub_model(:city) do
         update_index('cities#city') { self }
-        update_index 'countries#country', :country
+        update_index 'countries#country' do
+          changes['country_id'] || previous_changes['country_id'] || country
+        end
       end
 
       stub_model(:country) do
@@ -42,14 +44,27 @@ describe Chewy::Type::Import do
       end
     end
 
-    let(:city) { Chewy.strategy(:atomic) { City.create!(id: 1, country: Country.create!(id: 1)) } }
-    let(:country) { Chewy.strategy(:atomic) { Country.create!(id: 1, cities: 2.times.map { |i| City.create!(id: i) }) } }
+    context do
+      let!(:country1) { Chewy.strategy(:atomic) { Country.create!(id: 1) } }
+      let!(:country2) { Chewy.strategy(:atomic) { Country.create!(id: 2) } }
+      let!(:city) { Chewy.strategy(:atomic) { City.create!(id: 1, country: country1) } }
+
+      specify { expect { city.save! }.to update_index('cities#city').and_reindex(city) }
+      specify { expect { city.save! }.to update_index('countries#country').and_reindex(country1) }
+
+      specify { expect { city.update_attributes!(country: nil) }.to update_index('cities#city').and_reindex(city) }
+      specify { expect { city.update_attributes!(country: nil) }.to update_index('countries#country').and_reindex(country1) }
 
-    specify { expect { city.save! }.to update_index('cities#city').and_reindex(city) }
-    specify { expect { city.save! }.to update_index('countries#country').and_reindex(city.country) }
-    specify { expect { country.save! }.to update_index('cities#city').and_reindex(country.cities) }
-    specify { expect { country.save! }.to update_index('countries#country').and_reindex(country) }
+      specify { expect { city.update_attributes!(country: country2) }.to update_index('cities#city').and_reindex(city) }
+      specify { expect { city.update_attributes!(country: country2) }.to update_index('countries#country').and_reindex(country1, country2) }
+    end
+
+    context do
+      let!(:country) { Chewy.strategy(:atomic) { Country.create!(id: 1, cities: 2.times.map { |i| City.create!(id: i) }) } }
 
+      specify { expect { country.save! }.to update_index('cities#city').and_reindex(country.cities) }
+      specify { expect { country.save! }.to update_index('countries#country').and_reindex(country) }
+    end
   end
 
   context 'transactions', :active_record do

data/spec/spec_helper.rb

@@ -28,6 +28,7 @@ Chewy.settings = {
 
 RSpec.configure do |config|
   config.mock_with :rspec
+  config.order = :random
 
   config.include FailHelpers
   config.include ClassHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: resque_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +257,8 @@ files:
 - lib/chewy/strategy/atomic.rb
 - lib/chewy/strategy/base.rb
 - lib/chewy/strategy/bypass.rb
+- lib/chewy/strategy/resque.rb
+- lib/chewy/strategy/sidekiq.rb
 - lib/chewy/strategy/urgent.rb
 - lib/chewy/type.rb
 - lib/chewy/type/actions.rb
@@ -251,6 +267,7 @@ files:
 - lib/chewy/type/adapter/mongoid.rb
 - lib/chewy/type/adapter/object.rb
 - lib/chewy/type/adapter/orm.rb
+- lib/chewy/type/crutch.rb
 - lib/chewy/type/import.rb
 - lib/chewy/type/mapping.rb
 - lib/chewy/type/observe.rb
@@ -295,6 +312,8 @@ files:
 - spec/chewy/runtime/version_spec.rb
 - spec/chewy/runtime_spec.rb
 - spec/chewy/search_spec.rb
+- spec/chewy/strategy/resque_spec.rb
+- spec/chewy/strategy/sidekiq_spec.rb
 - spec/chewy/strategy_spec.rb
 - spec/chewy/type/actions_spec.rb
 - spec/chewy/type/adapter/active_record_spec.rb
@@ -372,6 +391,8 @@ test_files:
 - spec/chewy/runtime/version_spec.rb
 - spec/chewy/runtime_spec.rb
 - spec/chewy/search_spec.rb
+- spec/chewy/strategy/resque_spec.rb
+- spec/chewy/strategy/sidekiq_spec.rb
 - spec/chewy/strategy_spec.rb
 - spec/chewy/type/actions_spec.rb
 - spec/chewy/type/adapter/active_record_spec.rb