chewy 0.8.4 → 0.9.0

data/Rakefile

@@ -4,4 +4,14 @@ require 'elasticsearch/extensions/test/cluster/tasks'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
+
+namespace :es do
+  task :start do
+    Rake.application['elasticsearch:start'].invoke
+  end
+
+  task :stop do
+    Rake.application['elasticsearch:stop'].invoke
+  end
+end

data/chewy.gemspec

@@ -3,7 +3,7 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'chewy/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable BlockLength
   spec.name          = 'chewy'
   spec.version       = Chewy::VERSION
   spec.authors       = ['pyromaniac']
@@ -20,21 +20,19 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'rspec', '~> 3.4.0'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'rspec-collection_matchers'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'elasticsearch-extensions'
   spec.add_development_dependency 'resque_spec'
+  spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubysl', '~> 2.0' if RUBY_ENGINE == 'rbx'
 
   spec.add_development_dependency 'method_source'
-  if RUBY_VERSION < '2.1.0'
-    spec.add_development_dependency 'unparser', '0.2.4'
-  else
-    spec.add_development_dependency 'unparser'
-  end
+  spec.add_development_dependency 'unparser'
 
   spec.add_dependency 'activesupport', '>= 3.2'
   spec.add_dependency 'elasticsearch', '>= 1.0.0'

data/gemfiles/rails.3.2.activerecord.gemfile

@@ -10,6 +10,7 @@ gem "sidekiq", :require => false
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

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

@@ -9,6 +9,7 @@ gem "kaminari", "0.16.3", :require => false
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

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

@@ -9,6 +9,7 @@ gem "will_paginate", :require => false
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/rails.4.2.activerecord.gemfile

@@ -11,6 +11,7 @@ gem "sidekiq", :require => false
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

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

@@ -10,6 +10,7 @@ gem "kaminari", "0.16.3", :require => false
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

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

@@ -10,6 +10,7 @@ gem "will_paginate", :require => false
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{rails.4.2.mongoid.4.0.0.gemfile → rails.4.2.mongoid.4.0.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "> 4.0.0"
+gem "mongoid", "~> 4.0.0"
 gem "activesupport", "~> 4.2.0"
 gem "resque", :require => false
 gem "sidekiq", :require => false
@@ -10,6 +10,7 @@ gem "sidekiq", :require => false
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{rails.4.2.mongoid.4.0.0.kaminari.gemfile → rails.4.2.mongoid.4.0.kaminari.gemfile}

@@ -2,13 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "> 4.0.0"
+gem "mongoid", "~> 4.0.0"
 gem "activesupport", "~> 4.2.0"
 gem "kaminari", "0.16.3", :require => false
 
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{rails.4.2.mongoid.4.0.0.will_paginate.gemfile → rails.4.2.mongoid.4.0.will_paginate.gemfile}

@@ -2,13 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "> 4.0.0"
+gem "mongoid", "~> 4.0.0"
 gem "activesupport", "~> 4.2.0"
 gem "will_paginate", :require => false
 
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{rails.4.2.mongoid.5.1.0.gemfile → rails.4.2.mongoid.5.1.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "> 5.1.0"
+gem "mongoid", "~> 5.1.0"
 gem "activesupport", "~> 4.2.0"
 gem "resque", :require => false
 gem "sidekiq", :require => false
@@ -10,6 +10,7 @@ gem "sidekiq", :require => false
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{rails.4.2.mongoid.5.1.0.kaminari.gemfile → rails.4.2.mongoid.5.1.kaminari.gemfile}

@@ -2,13 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "> 5.1.0"
+gem "mongoid", "~> 5.1.0"
 gem "activesupport", "~> 4.2.0"
 gem "kaminari", "0.16.3", :require => false
 
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{rails.4.2.mongoid.5.1.0.will_paginate.gemfile → rails.4.2.mongoid.5.1.will_paginate.gemfile}

@@ -2,13 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "> 5.1.0"
+gem "mongoid", "~> 5.1.0"
 gem "activesupport", "~> 4.2.0"
 gem "will_paginate", :require => false
 
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{rails.4.0.activerecord.gemfile → rails.5.0.activerecord.gemfile}

@@ -2,14 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.0.0"
-gem "activesupport", "~> 4.0.0"
+gem "activerecord", "~> 5.0.0"
+gem "activesupport", "~> 5.0.0"
+gem "activejob", "~> 5.0.0"
 gem "resque", :require => false
 gem "sidekiq", :require => false
 
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{rails.4.0.mongoid.4.0.0.kaminari.gemfile → rails.5.0.activerecord.kaminari.gemfile}

@@ -2,13 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "> 4.0.0"
-gem "activesupport", "~> 4.0.0"
+gem "activerecord", "~> 5.0.0"
+gem "activesupport", "~> 5.0.0"
+gem "activejob", "~> 5.0.0"
 gem "kaminari", "0.16.3", :require => false
 
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{rails.4.0.mongoid.4.0.0.will_paginate.gemfile → rails.5.0.activerecord.will_paginate.gemfile}

@@ -2,13 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "> 4.0.0"
-gem "activesupport", "~> 4.0.0"
+gem "activerecord", "~> 5.0.0"
+gem "activesupport", "~> 5.0.0"
+gem "activejob", "~> 5.0.0"
 gem "will_paginate", :require => false
 
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/gemfiles/{sequel.4.31.gemfile → sequel.4.38.gemfile}

@@ -2,12 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "sequel", "~> 4.31.0"
-gem "activesupport", "~> 4.2.0"
+gem "sequel", "~> 4.38.0"
+gem "activesupport", "~> 5.0.0"
 
 group :test do
   gem "guard"
   gem "guard-rspec"
+  gem "listen", "~> 3.0.0"
 end
 
 gemspec :path => "../"

data/lib/chewy.rb

@@ -31,12 +31,14 @@ require 'chewy/index'
 require 'chewy/type'
 require 'chewy/fields/base'
 require 'chewy/fields/root'
-require 'chewy/railtie' if defined?(::Rails)
+require 'chewy/journal'
+require 'chewy/railtie' if defined?(::Rails::Railtie)
 
 begin
   require 'kaminari'
   require 'chewy/query/pagination/kaminari'
 rescue LoadError
+  nil
 end
 
 begin
@@ -44,6 +46,7 @@ begin
   require 'will_paginate/collection'
   require 'chewy/query/pagination/will_paginate'
 rescue LoadError
+  nil
 end
 
 ActiveSupport.on_load(:active_record) do
@@ -52,23 +55,28 @@ ActiveSupport.on_load(:active_record) do
   begin
     require 'will_paginate/active_record'
   rescue LoadError
+    nil
   end
 end
 
 ActiveSupport.on_load(:mongoid) do
-  module Mongoid::Document::ClassMethods
-    include Chewy::Type::Observe::MongoidMethods
+  module Mongoid
+    module Document
+      module ClassMethods
+        include Chewy::Type::Observe::MongoidMethods
+      end
+    end
   end
 
   begin
     require 'will_paginate/mongoid'
     require 'chewy/query/pagination/will_paginate'
   rescue LoadError
+    nil
   end
 end
 
 module Chewy
-
   @adapters = [
     Chewy::Type::Adapter::ActiveRecord,
     Chewy::Type::Adapter::Mongoid,
@@ -89,34 +97,34 @@ module Chewy
     #
     # If index has more then one type - it raises Chewy::UnderivableType.
     #
-    def derive_type name
+    def derive_type(name)
       return name if name.is_a?(Class) && name < Chewy::Type
 
       index_name, type_name = name.split('#', 2)
       class_name = "#{index_name.camelize}Index"
       index = class_name.safe_constantize
-      raise Chewy::UnderivableType.new("Can not find index named `#{class_name}`") unless index && index < Chewy::Index
-      type = if type_name.present?
-        index.type_hash[type_name] or raise Chewy::UnderivableType.new("Index `#{class_name}` doesn`t have type named `#{type_name}`")
+      raise Chewy::UnderivableType, "Can not find index named `#{class_name}`" unless index && index < Chewy::Index
+      if type_name.present?
+        index.type_hash[type_name] or raise Chewy::UnderivableType, "Index `#{class_name}` doesn`t have type named `#{type_name}`"
       elsif index.types.one?
         index.types.first
       else
-        raise Chewy::UnderivableType.new("Index `#{class_name}` has more than one type, please specify type via `#{index_name}#type_name`")
+        raise Chewy::UnderivableType, "Index `#{class_name}` has more than one type, please specify type via `#{index_name}#type_name`"
       end
     end
 
     # Creates Chewy::Type ancestor defining index and adapter methods.
     #
-    def create_type index, target, options = {}, &block
+    def create_type(index, target, options = {}, &block)
       type = Class.new(Chewy::Type)
 
-      adapter = adapters.find { |adapter| adapter.accepts?(target) }.new(target, options)
+      adapter = adapters.find { |klass| klass.accepts?(target) }.new(target, options)
 
       index.const_set(adapter.name, type)
       type.send(:define_singleton_method, :index) { index }
       type.send(:define_singleton_method, :adapter) { adapter }
 
-      type.class_eval &block if block
+      type.class_eval(&block) if block
       type
     end
 
@@ -144,7 +152,7 @@ module Chewy
     # Be careful, if current prefix is blank, this will destroy all the indexes.
     #
     def massacre
-      Chewy.client.indices.delete(index: [Chewy.configuration[:prefix], '*'].delete_if(&:blank?).join(?_))
+      Chewy.client.indices.delete(index: [Chewy.configuration[:prefix], '*'].delete_if(&:blank?).join('_'))
       Chewy.wait_for_status
     end
     alias_method :delete_all, :massacre
@@ -172,7 +180,7 @@ module Chewy
     #   Chewy.strategy.pop
     #   city3.do_update! # index updated again
     #
-    def strategy name = nil, &block
+    def strategy(name = nil, &block)
       Thread.current[:chewy_strategy] ||= Chewy::Strategy.new
       if name
         if block
@@ -188,11 +196,11 @@ module Chewy
     def config
       Chewy::Config.instance
     end
-    delegate *Chewy::Config.delegated, to: :config
+    delegate(*Chewy::Config.delegated, to: :config)
 
     def repository
       Chewy::Repository.instance
     end
-    delegate *Chewy::Repository.delegated, to: :repository
+    delegate(*Chewy::Repository.delegated, to: :repository)
   end
 end

data/lib/chewy/backports/deep_dup.rb

@@ -25,7 +25,7 @@ class Array
   #   array[1][2] # => nil
   #   dup[1][2]   # => 4
   def deep_dup
-    map { |it| it.deep_dup }
+    map(&:deep_dup)
   end
 end
 

data/lib/chewy/backports/duplicable.rb

@@ -86,5 +86,6 @@ class BigDecimal
     end
   rescue TypeError
     # can't dup, so use superclass implementation
+    nil
   end
 end

data/lib/chewy/config.rb

@@ -36,10 +36,14 @@ module Chewy
       # in tests with transactional fixtures or transactional
       # DatabaseCleaner strategy.
       #
-      :use_after_commit_callbacks
+      :use_after_commit_callbacks,
+
+      # Where Chewy expects to find index definitions
+      # within a Rails app folder.
+      :indices_path
 
     def self.delegated
-      public_instance_methods - self.superclass.public_instance_methods - Singleton.public_instance_methods
+      public_instance_methods - superclass.public_instance_methods - Singleton.public_instance_methods
     end
 
     def initialize
@@ -49,14 +53,15 @@ module Chewy
       @root_strategy = :base
       @request_strategy = :atomic
       @use_after_commit_callbacks = true
+      @indices_path = 'app/chewy'
     end
 
-    def transport_logger= logger
+    def transport_logger=(logger)
       Chewy.client.transport.logger = logger
       @transport_logger = logger
     end
 
-    def transport_tracer= tracer
+    def transport_tracer=(tracer)
       Chewy.client.transport.tracer = tracer
       @transport_tracer = tracer
     end
@@ -106,12 +111,13 @@ module Chewy
     #
     def configuration
       yaml_settings.merge(settings.deep_symbolize_keys).tap do |configuration|
-        configuration.merge!(logger: transport_logger) if transport_logger
+        configuration[:logger] = transport_logger if transport_logger
+        configuration[:indices_path] ||= indices_path if indices_path
         configuration.merge!(tracer: transport_tracer) if transport_tracer
       end
     end
 
-    def configuration= options
+    def configuration=(options)
       ActiveSupport::Deprecation.warn("`Chewy.configuration = {foo: 'bar'}` method is deprecated and will be removed soon, use `Chewy.settings = {foo: 'bar'}` method instead")
       self.settings = options
     end
@@ -121,7 +127,7 @@ module Chewy
     def yaml_settings
       @yaml_settings ||= begin
         if defined?(Rails)
-          file = Rails.root.join(*%w(config chewy.yml))
+          file = Rails.root.join('config', 'chewy.yml')
 
           if File.exist?(file)
             yaml = ERB.new(File.read(file)).result