chewy 0.6.2 → 0.7.0

data/spec/chewy/type/observe_spec.rb

@@ -11,7 +11,7 @@ describe Chewy::Type::Import do
     let(:backreferenced) { 3.times.map { |i| double(id: i) } }
 
     specify { expect { DummiesIndex.dummy.update_index(backreferenced) }
-      .not_to update_index('dummies#dummy', atomic: false) }
+      .to raise_error Chewy::UndefinedUpdateStrategy }
     specify { expect { DummiesIndex.dummy.update_index([]) }
       .not_to update_index('dummies#dummy') }
     specify { expect { DummiesIndex.dummy.update_index(nil) }
@@ -21,17 +21,18 @@ describe Chewy::Type::Import do
   context 'integration', :orm do
     before do
       stub_model(:city) do
-        belongs_to :country
         update_index('cities#city') { self }
         update_index 'countries#country', :country
       end
 
       stub_model(:country) do
-        has_many :cities
         update_index('cities#city') { cities }
         update_index 'countries#country', :self
       end
 
+      City.belongs_to :country
+      Country.has_many :cities
+
       stub_index(:cities) do
         define_type City
       end
@@ -41,45 +42,41 @@ describe Chewy::Type::Import do
       end
     end
 
-    let(:city) { City.create!(id: 1, country: Country.create!(id: 1)) }
-    let(:country) { Country.create!(id: 1, cities: 2.times.map { |i| City.create!(id: i) }) }
+    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) }) } }
 
-    specify { expect { city.save! }.not_to update_index('cities#city', atomic: false) }
+    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) }
 
-    context do
-      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) }
-    end
+  end
 
+  context 'transactions', :active_record do
     context do
-      let(:other_city) { City.create! }
-
-      specify do
-        expect(CitiesIndex::City).not_to receive(:import)
-        [city, other_city].map(&:save!)
-      end
+      before { stub_model(:city) { update_index 'cities#city', :self } }
+      before { stub_index(:cities) { define_type City } }
 
       specify do
-        expect(CitiesIndex::City).to receive(:import).with([city.id, other_city.id]).once
-        Chewy.atomic { [city, other_city].map(&:save!) }
+        Chewy.strategy(:urgent) do
+          ActiveRecord::Base.transaction do
+            expect { City.create! }.not_to update_index('cities#city')
+          end
+        end
       end
     end
 
     context do
-      before { allow(Chewy).to receive_messages(urgent_update: true) }
-      let(:other_country) { Country.create! }
-
-      specify do
-        expect(CountriesIndex::Country).to receive(:import).at_least(2).times
-        [country, other_country].map(&:save!)
-      end
+      before { allow(Chewy).to receive_messages(use_after_commit_callbacks: false) }
+      before { stub_model(:city) { update_index 'cities#city', :self } }
+      before { stub_index(:cities) { define_type City } }
 
       specify do
-        expect(CountriesIndex::Country).to receive(:import).with([country.id, other_country.id]).once
-        Chewy.atomic { [country, other_country].map(&:save!) }
+        Chewy.strategy(:urgent) do
+          ActiveRecord::Base.transaction do
+            expect { City.create! }.to update_index('cities#city')
+          end
+        end
       end
     end
   end

data/spec/chewy/type_spec.rb

@@ -1,4 +1,23 @@
 require 'spec_helper'
 
 describe Chewy::Type do
+  describe '.scopes' do
+    before do
+      stub_index(:places) do
+        def self.by_id
+        end
+
+        define_type :city do
+          def self.by_rating
+          end
+
+          def self.by_name
+          end
+        end
+      end
+    end
+
+    specify { expect(described_class.scopes).to eq([]) }
+    specify { expect(PlacesIndex::City.scopes).to match_array([:by_rating, :by_name]) }
+  end
 end

data/spec/chewy_spec.rb

@@ -57,7 +57,8 @@ describe Chewy do
     end
 
     context 'model scope', :orm do
-      before { stub_model(:city) }
+      before { stub_model(:country) }
+      before { stub_model(:city) { belongs_to :country } }
       subject { described_class.create_type(CitiesIndex, City.includes(:country)) }
 
       it { is_expected.to be_a Class }
@@ -97,9 +98,9 @@ describe Chewy do
     before { Chewy.massacre }
 
     before do
-      allow(Chewy).to receive_messages(configuration: Chewy.configuration.merge(prefix: 'prefix1'))
+      allow(Chewy).to receive_messages(configuration: { prefix: 'prefix1' })
       stub_index(:admins).create!
-      allow(Chewy).to receive_messages(configuration: Chewy.configuration.merge(prefix: 'prefix2'))
+      allow(Chewy).to receive_messages(configuration: { prefix: 'prefix2' })
       stub_index(:developers).create!
       stub_index(:companies).create!
 
@@ -110,4 +111,19 @@ describe Chewy do
     specify { expect(DevelopersIndex.exists?).to eq(false) }
     specify { expect(CompaniesIndex.exists?).to eq(false) }
   end
+
+  describe '#urgent_update=' do
+    specify do
+      described_class.urgent_update = true
+      expect(described_class.strategy.current).to be_a(Chewy::Strategy::Urgent)
+      described_class.urgent_update = false
+      expect(described_class.strategy.current).to be_a(Chewy::Strategy::Base)
+    end
+  end
+
+  describe '#atomic' do
+    specify do
+      described_class.atomic { expect(described_class.strategy.current).to be_a(Chewy::Strategy::Atomic) }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ require 'support/class_helpers'
 
 require 'chewy/rspec'
 
-Chewy.configuration = {
+Chewy.settings = {
   host: 'localhost:9250',
   wait_for_status: 'green',
   index: {

data/spec/support/active_record.rb

@@ -2,6 +2,7 @@ require 'database_cleaner'
 
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 ActiveRecord::Base.logger = Logger.new('/dev/null')
+ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks)
 
 ActiveRecord::Schema.define do
   create_table :countries do |t|
@@ -40,7 +41,7 @@ RSpec.configure do |config|
 
   config.before(:suite) do
     DatabaseCleaner.clean_with :truncation
-    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.strategy = :truncation
   end
 
   config.before do

data/spec/support/mongoid.rb

@@ -17,24 +17,37 @@ Mongoid.logger = Logger.new('/dev/null')
 module MongoidClassHelpers
   extend ActiveSupport::Concern
 
+  module Country
+    extend ActiveSupport::Concern
+
+    included do
+      include Mongoid::Document
+
+      field :name, type: String
+      field :country_code, type: String
+      field :rating, type: Integer
+    end
+  end
+
+  module City
+    extend ActiveSupport::Concern
+
+    included do
+      include Mongoid::Document
+
+      field :name, type: String
+      field :rating, type: Integer
+    end
+  end
+
   def stub_model name, superclass = nil, &block
-    model = name.to_s.camelize.constantize rescue nil
-
-    if model
-      model.class_eval(&block) if block
-      model
-    else
-      klass = if superclass && superclass.ancestors.include?(Mongoid::Document)
-        superclass
-      else
-        Class.new(*([superclass].compact)) do
-          include Mongoid::Document
-          store_in collection: name.to_s.tableize
-        end
-      end
-
-      stub_class(name, klass, &block)
+    mixin = "MongoidClassHelpers::#{name.to_s.camelize}".safe_constantize || Mongoid::Document
+    superclass ||= Class.new do
+      include mixin
+      store_in collection: name.to_s.tableize
     end
+
+    stub_class(name, superclass, &block)
   end
 
   def active_record?
@@ -57,28 +70,6 @@ RSpec.configure do |config|
   end
 
   config.before do
-    Object.send(:remove_const, :City) if defined? City
-    Object.send(:remove_const, :Country) if defined? Country
-
-    class Country
-      include Mongoid::Document
-
-      field :name, type: String
-      field :country_code, type: String
-      field :rating, type: Integer
-
-      has_many :cities, order: :id.asc
-    end
-
-    class City
-      include Mongoid::Document
-
-      field :name, type: String
-      field :rating, type: Integer
-
-      belongs_to :country
-    end
-
     DatabaseCleaner.start
   end
 

metadata

@@ -1,139 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: appraisal
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   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: sqlite3
   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: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch-extensions
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: Chewy provides functionality for Elasticsearch index handling, documents
@@ -144,9 +158,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -155,27 +170,27 @@ files:
 - Rakefile
 - chewy.gemspec
 - filters
-- gemfiles/Gemfile.rails-3.2.active_record
-- gemfiles/Gemfile.rails-3.2.active_record.kaminari
-- gemfiles/Gemfile.rails-3.2.active_record.will_paginate
-- gemfiles/Gemfile.rails-4.0.active_record
-- gemfiles/Gemfile.rails-4.0.active_record.kaminari
-- gemfiles/Gemfile.rails-4.0.active_record.will_paginate
-- gemfiles/Gemfile.rails-4.0.mongoid
-- gemfiles/Gemfile.rails-4.0.mongoid.kaminari
-- gemfiles/Gemfile.rails-4.0.mongoid.will_paginate
-- gemfiles/Gemfile.rails-4.1.active_record
-- gemfiles/Gemfile.rails-4.1.active_record.kaminari
-- gemfiles/Gemfile.rails-4.1.active_record.will_paginate
-- gemfiles/Gemfile.rails-4.1.mongoid
-- gemfiles/Gemfile.rails-4.1.mongoid.kaminari
-- gemfiles/Gemfile.rails-4.1.mongoid.will_paginate
-- gemfiles/Gemfile.rails-4.2.active_record
-- gemfiles/Gemfile.rails-4.2.active_record.kaminari
-- gemfiles/Gemfile.rails-4.2.active_record.will_paginate
-- gemfiles/Gemfile.rails-4.2.mongoid
-- gemfiles/Gemfile.rails-4.2.mongoid.kaminari
-- gemfiles/Gemfile.rails-4.2.mongoid.will_paginate
+- gemfiles/rails.3.2.activerecord.gemfile
+- gemfiles/rails.3.2.activerecord.kaminari.gemfile
+- gemfiles/rails.3.2.activerecord.will_paginate.gemfile
+- gemfiles/rails.4.0.activerecord.gemfile
+- gemfiles/rails.4.0.activerecord.kaminari.gemfile
+- gemfiles/rails.4.0.activerecord.will_paginate.gemfile
+- gemfiles/rails.4.0.mongoid.gemfile
+- gemfiles/rails.4.0.mongoid.kaminari.gemfile
+- gemfiles/rails.4.0.mongoid.will_paginate.gemfile
+- gemfiles/rails.4.1.activerecord.gemfile
+- gemfiles/rails.4.1.activerecord.kaminari.gemfile
+- gemfiles/rails.4.1.activerecord.will_paginate.gemfile
+- gemfiles/rails.4.1.mongoid.gemfile
+- gemfiles/rails.4.1.mongoid.kaminari.gemfile
+- gemfiles/rails.4.1.mongoid.will_paginate.gemfile
+- gemfiles/rails.4.2.activerecord.gemfile
+- gemfiles/rails.4.2.activerecord.kaminari.gemfile
+- gemfiles/rails.4.2.activerecord.will_paginate.gemfile
+- gemfiles/rails.4.2.mongoid.gemfile
+- gemfiles/rails.4.2.mongoid.kaminari.gemfile
+- gemfiles/rails.4.2.mongoid.will_paginate.gemfile
 - lib/chewy.rb
 - lib/chewy/backports/deep_dup.rb
 - lib/chewy/backports/duplicable.rb
@@ -187,6 +202,7 @@ files:
 - lib/chewy/index/actions.rb
 - lib/chewy/index/aliases.rb
 - lib/chewy/index/settings.rb
+- lib/chewy/log_subscriber.rb
 - lib/chewy/query.rb
 - lib/chewy/query/compose.rb
 - lib/chewy/query/criteria.rb
@@ -215,18 +231,26 @@ files:
 - lib/chewy/query/pagination.rb
 - lib/chewy/query/pagination/kaminari.rb
 - lib/chewy/query/pagination/will_paginate.rb
+- lib/chewy/query/scoping.rb
 - lib/chewy/railtie.rb
+- lib/chewy/repository.rb
 - lib/chewy/rspec.rb
 - lib/chewy/rspec/update_index.rb
 - lib/chewy/runtime.rb
 - lib/chewy/runtime/version.rb
 - lib/chewy/search.rb
+- lib/chewy/strategy.rb
+- lib/chewy/strategy/atomic.rb
+- lib/chewy/strategy/base.rb
+- lib/chewy/strategy/bypass.rb
+- lib/chewy/strategy/urgent.rb
 - lib/chewy/type.rb
 - lib/chewy/type/actions.rb
 - lib/chewy/type/adapter/active_record.rb
 - lib/chewy/type/adapter/base.rb
 - lib/chewy/type/adapter/mongoid.rb
 - lib/chewy/type/adapter/object.rb
+- lib/chewy/type/adapter/orm.rb
 - lib/chewy/type/import.rb
 - lib/chewy/type/mapping.rb
 - lib/chewy/type/observe.rb
@@ -238,9 +262,9 @@ files:
 - spec/chewy/config_spec.rb
 - spec/chewy/fields/base_spec.rb
 - spec/chewy/fields/root_spec.rb
+- spec/chewy/fields/time_fields_spec.rb
 - spec/chewy/index/actions_spec.rb
 - spec/chewy/index/aliases_spec.rb
-- spec/chewy/index/search_spec.rb
 - spec/chewy/index/settings_spec.rb
 - spec/chewy/index_spec.rb
 - spec/chewy/query/criteria_spec.rb
@@ -266,9 +290,12 @@ files:
 - spec/chewy/query/pagination/will_paginage_spec.rb
 - spec/chewy/query/pagination_spec.rb
 - spec/chewy/query_spec.rb
+- spec/chewy/repository_spec.rb
 - spec/chewy/rspec/update_index_spec.rb
 - spec/chewy/runtime/version_spec.rb
 - spec/chewy/runtime_spec.rb
+- spec/chewy/search_spec.rb
+- spec/chewy/strategy_spec.rb
 - spec/chewy/type/actions_spec.rb
 - spec/chewy/type/adapter/active_record_spec.rb
 - spec/chewy/type/adapter/mongoid_spec.rb
@@ -294,17 +321,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Elasticsearch ODM client wrapper
@@ -312,9 +339,9 @@ test_files:
 - spec/chewy/config_spec.rb
 - spec/chewy/fields/base_spec.rb
 - spec/chewy/fields/root_spec.rb
+- spec/chewy/fields/time_fields_spec.rb
 - spec/chewy/index/actions_spec.rb
 - spec/chewy/index/aliases_spec.rb
-- spec/chewy/index/search_spec.rb
 - spec/chewy/index/settings_spec.rb
 - spec/chewy/index_spec.rb
 - spec/chewy/query/criteria_spec.rb
@@ -340,9 +367,12 @@ test_files:
 - spec/chewy/query/pagination/will_paginage_spec.rb
 - spec/chewy/query/pagination_spec.rb
 - spec/chewy/query_spec.rb
+- spec/chewy/repository_spec.rb
 - spec/chewy/rspec/update_index_spec.rb
 - spec/chewy/runtime/version_spec.rb
 - spec/chewy/runtime_spec.rb
+- spec/chewy/search_spec.rb
+- spec/chewy/strategy_spec.rb
 - spec/chewy/type/actions_spec.rb
 - spec/chewy/type/adapter/active_record_spec.rb
 - spec/chewy/type/adapter/mongoid_spec.rb