chewy 0.8.4 → 0.9.0

data/spec/chewy/type_spec.rb

@@ -22,12 +22,13 @@ describe Chewy::Type do
     specify { expect { PlacesIndex::City.non_existing_method_call }.to raise_error(NoMethodError) }
 
     specify { expect(PlacesIndex::City._default_import_options).to eq({}) }
-    specify { expect { PlacesIndex::City.default_import_options(invalid_option: "Yeah!") }.to raise_error(ArgumentError) }
+    specify { expect { PlacesIndex::City.default_import_options(invalid_option: 'Yeah!') }.to raise_error(ArgumentError) }
 
     context 'default_import_options is set' do
-      before { PlacesIndex::City.default_import_options(batch_size: 500) }
+      let(:converter) { -> {} }
+      before { PlacesIndex::City.default_import_options(batch_size: 500, raw_import: converter) }
 
-      specify { expect(PlacesIndex::City._default_import_options).to eq(batch_size: 500) }
+      specify { expect(PlacesIndex::City._default_import_options).to eq(batch_size: 500, raw_import: converter) }
     end
   end
 end

data/spec/chewy_spec.rb

@@ -19,11 +19,11 @@ describe Chewy do
       end
     end
 
-    specify { expect { described_class.derive_type('developers_index#developers') }.to raise_error Chewy::UnderivableType, /DevelopersIndexIndex/ }
-    specify { expect { described_class.derive_type('some#developers') }.to raise_error Chewy::UnderivableType, /SomeIndex/ }
-    specify { expect { described_class.derive_type('borogoves#developers') }.to raise_error Chewy::UnderivableType, /Borogoves/ }
-    specify { expect { described_class.derive_type('developers#borogoves') }.to raise_error Chewy::UnderivableType, /DevelopersIndex.*borogoves/ }
-    specify { expect { described_class.derive_type('namespace/autocomplete') }.to raise_error Chewy::UnderivableType, /AutocompleteIndex.*namespace\/autocomplete#type_name/ }
+    specify { expect { described_class.derive_type('developers_index#developers') }.to raise_error(Chewy::UnderivableType, /DevelopersIndexIndex/) }
+    specify { expect { described_class.derive_type('some#developers') }.to raise_error(Chewy::UnderivableType, /SomeIndex/) }
+    specify { expect { described_class.derive_type('borogoves#developers') }.to raise_error(Chewy::UnderivableType, /Borogoves/) }
+    specify { expect { described_class.derive_type('developers#borogoves') }.to raise_error(Chewy::UnderivableType, /DevelopersIndex.*borogoves/) }
+    specify { expect { described_class.derive_type('namespace/autocomplete') }.to raise_error(Chewy::UnderivableType, %r{AutocompleteIndex.*namespace/autocomplete#type_name}) }
 
     specify { expect(described_class.derive_type(DevelopersIndex::Developer)).to eq(DevelopersIndex::Developer) }
     specify { expect(described_class.derive_type('developers')).to eq(DevelopersIndex::Developer) }
@@ -64,6 +64,7 @@ describe Chewy do
       it { is_expected.to be < Chewy::Type }
       its(:name) { should == 'CitiesIndex::City' }
       its(:index) { should == CitiesIndex }
+      its(:derivable_index_name) { should == 'cities' }
       its(:type_name) { should == 'city' }
     end
 
@@ -77,6 +78,7 @@ describe Chewy do
       it { is_expected.to be < Chewy::Type }
       its(:name) { should == 'Namespace::CitiesIndex::City' }
       its(:index) { should == Namespace::CitiesIndex }
+      its(:derivable_index_name) { should == 'namespace/cities' }
       its(:type_name) { should == 'city' }
     end
 
@@ -113,7 +115,7 @@ describe Chewy do
 
   describe '.client' do
     let!(:initial_client) { Thread.current[:chewy_client] }
-    let(:faraday_block) { proc { } }
+    let(:faraday_block) { proc {} }
     let(:mock_client) { double(:client) }
     let(:expected_client_config) { { transport_options: {} } }
 
@@ -121,8 +123,8 @@ describe Chewy do
       Thread.current[:chewy_client] = nil
       allow(Chewy).to receive_messages(configuration: { transport_options: { proc: faraday_block } })
 
-      allow(::Elasticsearch::Client).to receive(:new).with(expected_client_config) do |*args, &passed_block|
-        # RSpec's `with(…, &block)` was used previously, but doesn't actually do
+      allow(::Elasticsearch::Client).to receive(:new).with(expected_client_config) do |*_args, &passed_block|
+        # RSpec's `with(..., &block)` was used previously, but doesn't actually do
         # any verification of the passed block (even of its presence).
         expect(passed_block.source_location).to eq(faraday_block.source_location)
 

data/spec/spec_helper.rb

@@ -6,11 +6,14 @@ begin
   require 'active_record'
   require 'sequel'
 rescue LoadError
+  nil
 end
 
 require 'rspec/its'
 require 'rspec/collection_matchers'
 
+require 'timecop'
+
 Kaminari::Hooks.init if defined?(::Kaminari)
 
 require 'support/fail_helpers'

data/spec/support/active_record.rb

@@ -25,7 +25,7 @@ module ActiveRecordClassHelpers
     :active_record
   end
 
-  def stub_model name, superclass = nil, &block
+  def stub_model(name, superclass = nil, &block)
     stub_class(name, superclass || ActiveRecord::Base, &block)
   end
 end

data/spec/support/class_helpers.rb

@@ -1,31 +1,30 @@
 module ClassHelpers
   extend ActiveSupport::Concern
 
-  def stub_index name, superclass = nil, &block
-    stub_class("#{name.to_s.camelize}Index", superclass || Chewy::Index) { index_name = name }
+  def stub_index(name, superclass = nil, &block)
+    stub_class("#{name.to_s.camelize}Index", superclass || Chewy::Index)
       .tap { |i| i.class_eval(&block) if block }
   end
 
-  def stub_class name, superclass = nil, &block
+  def stub_class(name, superclass = nil, &block)
     stub_const(name.to_s.camelize, Class.new(superclass || Object, &block))
   end
 
-  def stub_model name, superclass = nil, &block
+  def stub_model(_name, _superclass = nil)
     raise NotImplementedError, 'Seems like no ORM/ODM are loaded, please check your Gemfile'
   end
 
-  def skip_on_version_gte version, message = "Removed from elasticsearch #{version}"
+  def skip_on_version_gte(version, message = "Removed from elasticsearch #{version}")
     skip message if Chewy::Runtime.version >= version
   end
 
-  def skip_on_version_lt version, message = "Only for elasticsearch #{version} and greater"
+  def skip_on_version_lt(version, message = "Only for elasticsearch #{version} and greater")
     skip message if Chewy::Runtime.version < version
   end
 
-  def skip_on_plugin_missing_from_version plugin, version, message = "Plugin '#{plugin}' is missing on elasticsearch > #{version}"
-    if Chewy::Runtime.version >= version
-      plugins = Chewy.client.nodes.info(plugins: true)["nodes"].values.map { |item| item["plugins"] }.flatten
-      skip message unless plugins.find { |item| item["name"] == plugin }
-    end
+  def skip_on_plugin_missing_from_version(plugin, version, message = "Plugin '#{plugin}' is missing on elasticsearch > #{version}")
+    return if Chewy::Runtime.version < version
+    plugins = Chewy.client.nodes.info(plugins: true)['nodes'].values.map { |item| item['plugins'] }.flatten
+    skip message unless plugins.find { |item| item['name'] == plugin }
   end
 end

data/spec/support/mongoid.rb

@@ -11,7 +11,7 @@ CONFIG = {
       uri: 'mongodb://127.0.0.1:27017/chewy_mongoid_test'
     }
   }
-}
+}.freeze
 
 Mongoid.configure do |config|
   config.load_configuration(CONFIG)
@@ -49,7 +49,7 @@ module MongoidClassHelpers
     :mongoid
   end
 
-  def stub_model name, superclass = nil, &block
+  def stub_model(name, superclass = nil, &block)
     mixin = "MongoidClassHelpers::#{name.to_s.camelize}".safe_constantize || Mongoid::Document
     superclass ||= Class.new do
       include mixin

data/spec/support/sequel.rb

@@ -1,6 +1,6 @@
 require 'database_cleaner'
 
-DB = Sequel.sqlite# logger: Logger.new(STDOUT)
+DB = Sequel.sqlite # logger: Logger.new(STDOUT)
 
 DB.create_table :countries do
   primary_key :id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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: rubocop
+  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: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +230,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -215,37 +245,19 @@ files:
 - 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.4.0.0.gemfile
-- gemfiles/rails.4.0.mongoid.4.0.0.kaminari.gemfile
-- gemfiles/rails.4.0.mongoid.4.0.0.will_paginate.gemfile
-- gemfiles/rails.4.0.mongoid.5.1.0.gemfile
-- gemfiles/rails.4.0.mongoid.5.1.0.kaminari.gemfile
-- gemfiles/rails.4.0.mongoid.5.1.0.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.4.0.0.gemfile
-- gemfiles/rails.4.1.mongoid.4.0.0.kaminari.gemfile
-- gemfiles/rails.4.1.mongoid.4.0.0.will_paginate.gemfile
-- gemfiles/rails.4.1.mongoid.5.1.0.gemfile
-- gemfiles/rails.4.1.mongoid.5.1.0.kaminari.gemfile
-- gemfiles/rails.4.1.mongoid.5.1.0.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.4.0.0.gemfile
-- gemfiles/rails.4.2.mongoid.4.0.0.kaminari.gemfile
-- gemfiles/rails.4.2.mongoid.4.0.0.will_paginate.gemfile
-- gemfiles/rails.4.2.mongoid.5.1.0.gemfile
-- gemfiles/rails.4.2.mongoid.5.1.0.kaminari.gemfile
-- gemfiles/rails.4.2.mongoid.5.1.0.will_paginate.gemfile
-- gemfiles/rails.5.0.0.beta3.activerecord.gemfile
-- gemfiles/rails.5.0.0.beta3.activerecord.kaminari.gemfile
-- gemfiles/rails.5.0.0.beta3.activerecord.will_paginate.gemfile
-- gemfiles/sequel.4.31.gemfile
+- gemfiles/rails.4.2.mongoid.4.0.gemfile
+- gemfiles/rails.4.2.mongoid.4.0.kaminari.gemfile
+- gemfiles/rails.4.2.mongoid.4.0.will_paginate.gemfile
+- gemfiles/rails.4.2.mongoid.5.1.gemfile
+- gemfiles/rails.4.2.mongoid.5.1.kaminari.gemfile
+- gemfiles/rails.4.2.mongoid.5.1.will_paginate.gemfile
+- gemfiles/rails.5.0.activerecord.gemfile
+- gemfiles/rails.5.0.activerecord.kaminari.gemfile
+- gemfiles/rails.5.0.activerecord.will_paginate.gemfile
+- gemfiles/sequel.4.38.gemfile
 - lib/chewy.rb
 - lib/chewy/backports/deep_dup.rb
 - lib/chewy/backports/duplicable.rb
@@ -257,7 +269,15 @@ files:
 - lib/chewy/index/actions.rb
 - lib/chewy/index/aliases.rb
 - lib/chewy/index/settings.rb
+- lib/chewy/journal.rb
+- lib/chewy/journal/apply.rb
+- lib/chewy/journal/clean.rb
+- lib/chewy/journal/entry.rb
+- lib/chewy/journal/query.rb
 - lib/chewy/log_subscriber.rb
+- lib/chewy/minitest.rb
+- lib/chewy/minitest/helpers.rb
+- lib/chewy/minitest/search_index_receiver.rb
 - lib/chewy/query.rb
 - lib/chewy/query/compose.rb
 - lib/chewy/query/criteria.rb
@@ -330,6 +350,11 @@ files:
 - spec/chewy/index/aliases_spec.rb
 - spec/chewy/index/settings_spec.rb
 - spec/chewy/index_spec.rb
+- spec/chewy/journal/apply_spec.rb
+- spec/chewy/journal/entry_spec.rb
+- spec/chewy/journal_spec.rb
+- spec/chewy/minitest/helpers_spec.rb
+- spec/chewy/minitest/search_index_receiver_spec.rb
 - spec/chewy/query/criteria_spec.rb
 - spec/chewy/query/filters_spec.rb
 - spec/chewy/query/loading_spec.rb
@@ -401,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Elasticsearch ODM client wrapper
@@ -414,6 +439,11 @@ test_files:
 - spec/chewy/index/aliases_spec.rb
 - spec/chewy/index/settings_spec.rb
 - spec/chewy/index_spec.rb
+- spec/chewy/journal/apply_spec.rb
+- spec/chewy/journal/entry_spec.rb
+- spec/chewy/journal_spec.rb
+- spec/chewy/minitest/helpers_spec.rb
+- spec/chewy/minitest/search_index_receiver_spec.rb
 - spec/chewy/query/criteria_spec.rb
 - spec/chewy/query/filters_spec.rb
 - spec/chewy/query/loading_spec.rb

data/gemfiles/rails.4.0.activerecord.kaminari.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.0.0"
-gem "activesupport", "~> 4.0.0"
-gem "kaminari", "0.16.3", :require => false
-
-group :test do
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec :path => "../"

data/gemfiles/rails.4.0.activerecord.will_paginate.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.0.0"
-gem "activesupport", "~> 4.0.0"
-gem "will_paginate", :require => false
-
-group :test do
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec :path => "../"

data/gemfiles/rails.4.0.mongoid.4.0.0.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mongoid", "> 4.0.0"
-gem "activesupport", "~> 4.0.0"
-gem "resque", :require => false
-gem "sidekiq", :require => false
-
-group :test do
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec :path => "../"

data/gemfiles/rails.4.0.mongoid.5.1.0.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mongoid", "> 5.1.0"
-gem "activesupport", "~> 4.0.0"
-gem "resque", :require => false
-gem "sidekiq", :require => false
-
-group :test do
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec :path => "../"

data/gemfiles/rails.4.0.mongoid.5.1.0.kaminari.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mongoid", "> 5.1.0"
-gem "activesupport", "~> 4.0.0"
-gem "kaminari", "0.16.3", :require => false
-
-group :test do
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec :path => "../"

data/gemfiles/rails.4.0.mongoid.5.1.0.will_paginate.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mongoid", "> 5.1.0"
-gem "activesupport", "~> 4.0.0"
-gem "will_paginate", :require => false
-
-group :test do
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec :path => "../"

data/gemfiles/rails.4.1.activerecord.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.1.0"
-gem "activesupport", "~> 4.1.0"
-gem "resque", :require => false
-gem "sidekiq", :require => false
-
-group :test do
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec :path => "../"