chewy 0.8.1 → 0.8.2

data/gemfiles/rails.4.2.activerecord.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
 gem "activesupport", "~> 4.2.0"
+gem "activejob", "~> 4.2.0"
 gem "resque", :require => false
 gem "sidekiq", :require => false
 

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

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
 gem "activesupport", "~> 4.2.0"
+gem "activejob", "~> 4.2.0"
 gem "kaminari", "0.16.3", :require => false
 
 group :test do

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

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
 gem "activesupport", "~> 4.2.0"
+gem "activejob", "~> 4.2.0"
 gem "will_paginate", :require => false
 
 group :test do

data/gemfiles/sequel.4.23.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sequel", "~> 4.23.0"
+gem "activesupport", "~> 4.2.0"
+
+group :test do
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec :path => "../"

data/lib/chewy.rb

@@ -1,9 +1,17 @@
-require 'active_support'
-require 'active_support/log_subscriber'
-require 'active_support/deprecation'
-require 'active_support/core_ext'
 require 'active_support/concern'
+require 'active_support/deprecation'
 require 'active_support/json'
+require 'active_support/log_subscriber'
+
+require 'active_support/core_ext/array/access'
+require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/inclusion'
+require 'active_support/core_ext/string/inflections'
+
 require 'i18n/core_ext/hash'
 require 'chewy/backports/deep_dup' unless Object.respond_to?(:deep_dup)
 require 'singleton'
@@ -13,6 +21,7 @@ require 'elasticsearch'
 require 'chewy/version'
 require 'chewy/errors'
 require 'chewy/config'
+require 'chewy/rake_helper'
 require 'chewy/repository'
 require 'chewy/runtime'
 require 'chewy/log_subscriber'
@@ -58,7 +67,17 @@ ActiveSupport.on_load(:mongoid) do
 end
 
 module Chewy
+
+  @adapters = [
+    Chewy::Type::Adapter::ActiveRecord,
+    Chewy::Type::Adapter::Mongoid,
+    Chewy::Type::Adapter::Sequel,
+    Chewy::Type::Adapter::Object
+  ]
+
   class << self
+    attr_accessor :adapters
+
     # Derives type from string `index#type` representation:
     #
     #   Chewy.derive_type('users#user') # => UsersIndex::User
@@ -90,13 +109,7 @@ module Chewy
     def create_type index, target, options = {}, &block
       type = Class.new(Chewy::Type)
 
-      adapter = if defined?(::ActiveRecord::Base) && ((target.is_a?(Class) && target < ::ActiveRecord::Base) || target.is_a?(::ActiveRecord::Relation))
-        Chewy::Type::Adapter::ActiveRecord.new(target, options)
-      elsif defined?(::Mongoid::Document) && ((target.is_a?(Class) && target.ancestors.include?(::Mongoid::Document)) || target.is_a?(::Mongoid::Criteria))
-        Chewy::Type::Adapter::Mongoid.new(target, options)
-      else
-        Chewy::Type::Adapter::Object.new(target, options)
-      end
+      adapter = adapters.find { |adapter| adapter.accepts?(target) }.new(target, options)
 
       index.const_set(adapter.name, type)
       type.send(:define_singleton_method, :index) { index }

data/lib/chewy/config.rb

@@ -19,8 +19,8 @@ module Chewy
       #
       :post_filter_mode,
 
-      # The first trategy in stack. `:base` by default.
-      # If you neet to return to the previous chewy behavior -
+      # The first strategy in stack. `:base` by default.
+      # If you need to return to the previous chewy behavior -
       # just set it to `:bypass`
       #
       :root_strategy,
@@ -106,8 +106,8 @@ module Chewy
     #
     def configuration
       yaml_settings.merge(settings.deep_symbolize_keys).tap do |configuration|
-        configuration.merge(logger: transport_logger) if transport_logger
-        configuration.merge(tracer: transport_tracer) if transport_tracer
+        configuration.merge!(logger: transport_logger) if transport_logger
+        configuration.merge!(tracer: transport_tracer) if transport_tracer
       end
     end
 

data/lib/chewy/index.rb

@@ -92,7 +92,7 @@ module Chewy
     #
     #   UsersIndex.types # => [UsersIndex::Admin, UsersIndex::Manager, UsersIndex::User]
     #
-    # If arguments are passed it treats like a part of chainable query dsl and
+    # If arguments are passed it treats like a part of chainable query DSL and
     # adds types array for index to select.
     #
     #   UsersIndex.filters { name =~ 'ro' }.types(:admin, :manager)

data/lib/chewy/index/settings.rb

@@ -2,7 +2,7 @@ module Chewy
   class Index
 
     # Stores ElasticSearch index settings and resolves `analysis`
-    # hash. At first, you need to store sone analyzers or other
+    # hash. At first, you need to store some analyzers or other
     # analysis options to the corresponding repository:
     #
     #   Chewy.analyzer :title_analyzer, type: 'custom', filter: %w(lowercase icu_folding title_nysiis)

data/lib/chewy/query.rb

@@ -386,7 +386,7 @@ module Chewy
     # added to the search request and combinded according to
     # <tt>boost_mode</tt> and <tt>score_mode</tt>
     #
-    # This probably only makes sense if you specifiy a filter
+    # This probably only makes sense if you specify a filter
     # for the boost factor as well
     #
     #   UsersIndex.boost_factor(23, filter: { term: { foo: :bar} })
@@ -408,7 +408,7 @@ module Chewy
     # added to the search request and combinded according to
     # <tt>boost_mode</tt> and <tt>score_mode</tt>
     #
-    # This probably only makes sense if you specifiy a filter
+    # This probably only makes sense if you specify a filter
     # for the random score as well.
     #
     # If you do not pass in a seed value, Time.now will be used
@@ -511,7 +511,11 @@ module Chewy
     #          }}
     #
     def aggregations params = nil
+      @_named_aggs ||= _build_named_aggs
+      @_fully_qualified_named_aggs ||= _build_fqn_aggs
       if params
+        params = { params => @_named_aggs[params] } if params.is_a?(Symbol)
+        params = { params => _get_fully_qualified_named_agg(params) } if params.is_a?(String) && params =~ /\A\S+#\S+\.\S+\z/
         chain { criteria.update_aggregations params }
       else
         _response['aggregations'] || {}
@@ -519,6 +523,41 @@ module Chewy
     end
     alias :aggs :aggregations
 
+    # In this simplest of implementations each named aggregation must be uniquely named
+    def _build_named_aggs
+      named_aggs = {}
+      @_indexes.each do |index|
+        index.types.each do |type|
+          type._agg_defs.each do |agg_name, prc|
+            named_aggs[agg_name] = prc.call
+          end
+        end
+      end
+      named_aggs
+    end
+
+    def _build_fqn_aggs
+      named_aggs = {}
+      @_indexes.each do |index|
+        named_aggs[index.to_s.downcase] ||= {}
+        index.types.each do |type|
+          named_aggs[index.to_s.downcase][type.to_s.downcase] ||= {}
+          type._agg_defs.each do |agg_name, prc|
+            named_aggs[index.to_s.downcase][type.to_s.downcase][agg_name.to_s.downcase] = prc.call
+          end
+        end
+      end
+      named_aggs
+    end
+
+    def _get_fully_qualified_named_agg(str)
+      parts = str.scan(/\A(\S+)#(\S+)\.(\S+)\z/).first
+      idx = "#{parts[0]}index"
+      type = "#{idx}::#{parts[1]}"
+      agg_name = parts[2]
+      @_fully_qualified_named_aggs[idx][type][agg_name]
+    end
+
     # Sets elasticsearch <tt>suggest</tt> search request param
     #
     #  UsersIndex.suggest(name: {text: 'Joh', term: {field: 'name'}})
@@ -876,7 +915,7 @@ module Chewy
       end
     end
 
-    # Deletes all records matching a query.
+    # Find all records matching a query.
     #
     #   UsersIndex.find(42)
     #   UsersIndex.filter{ age <= 42 }.find(42)
@@ -982,7 +1021,7 @@ module Chewy
 
     def _derive_index index_name
       (@derive_index ||= {})[index_name] ||= _indexes_hash[index_name] ||
-        _indexes_hash[_indexes_hash.keys.sort_by(&:length).reverse.detect { |name| index_name.starts_with?(name) }]
+        _indexes_hash[_indexes_hash.keys.sort_by(&:length).reverse.detect { |name| index_name.start_with?(name) }]
     end
 
     def _indexes_hash

data/lib/chewy/railtie.rb

@@ -10,7 +10,7 @@ module Chewy
       end
 
       def call(env)
-        if env['PATH_INFO'] =~ /^\/assets\//
+        if env['PATH_INFO'].start_with?('/assets/')
           @app.call(env)
         else
           Chewy.strategy(Chewy.request_strategy) { @app.call(env) }
@@ -55,7 +55,7 @@ module Chewy
     end
 
     initializer 'chewy.request_strategy' do |app|
-      app.config.middleware.insert_after(Rack::Runtime, RequestStrategy)
+      app.config.middleware.insert_after(Rails::Rack::Logger, RequestStrategy)
     end
 
     initializer 'chewy.add_app_chewy_path' do |app|

data/lib/chewy/rake_helper.rb

@@ -0,0 +1,62 @@
+module Chewy
+  module RakeHelper
+    class << self
+
+      def subscribe_task_stats!
+        ActiveSupport::Notifications.subscribe('import_objects.chewy') do |name, start, finish, id, payload|
+          duration = (finish - start).round(2)
+          puts "  Imported #{payload[:type]} for #{duration}s, documents total: #{payload[:import].try(:[], :index).to_i}"
+          payload[:errors].each do |action, errors|
+            puts "    #{action.to_s.humanize} errors:"
+            errors.each do |error, documents|
+              puts "      `#{error}`"
+              puts "        on #{documents.count} documents: #{documents}"
+            end
+          end if payload[:errors]
+        end
+      end
+
+      def eager_load_chewy!
+        dirs = Chewy::Railtie.all_engines.map { |engine| engine.paths['app/chewy'] }.compact.map(&:existent).flatten.uniq
+
+        dirs.each do |dir|
+          Dir.glob(File.join(dir, '**/*.rb')).each do |file|
+            require_dependency file
+          end
+        end
+      end
+
+      def normalize_index index
+        "#{index.to_s.gsub(/index\z/i, '').camelize}Index".constantize
+      end
+
+      # Performs zero downtime reindexing of all documents in the specified index.
+      def reset_index index
+        index = normalize_index(index)
+        puts "Resetting #{index}"
+        index.reset! (Time.now.to_f * 1000).round
+      end
+
+      # Performs zero downtime reindexing of all documents across all indices.
+      def reset_all
+        eager_load_chewy!
+        Chewy::Index.descendants.each { |index| reset_index index }
+      end
+
+      def update_index index
+        index = normalize_index(index)
+        puts "Updating #{index}"
+        if index.exists?
+          index.import
+        else
+          puts "Index `#{index.index_name}` does not exists. Use rake chewy:reset[#{index.index_name}] to create and update it."
+        end
+      end
+
+      def update_all
+        eager_load_chewy!
+        Chewy::Index.descendants.each { |index| update_index index }
+      end
+    end
+  end
+end

data/lib/chewy/rspec/update_index.rb

@@ -18,7 +18,7 @@ require 'i18n/core_ext/hash'
 # Combined matcher chain methods:
 #
 #   specify { expect { user1.destroy!; user2.save! } }
-#     .to update_index(UsersIndex:User).and_reindex(user2).and_delete(user1) }
+#     .to update_index(UsersIndex::User).and_reindex(user2).and_delete(user1) }
 #
 RSpec::Matchers.define :update_index do |type_name, options = {}|
 
@@ -43,7 +43,7 @@ RSpec::Matchers.define :update_index do |type_name, options = {}|
   #     .to update_index(UsersIndex::User).and_reindex(user, times: 2) }
   #
   # Specify reindexed attributes. Note that arrays are
-  # compared position-independantly.
+  # compared position-independently.
   #
   #   specify { expect { user.update_attributes!(name: 'Duke') }
   #     .to update_index(UsersIndex.user).and_reindex(user, with: {name: 'Duke'}) }
@@ -241,4 +241,4 @@ RSpec::Matchers.define :update_index do |type_name, options = {}|
     end
     difference.none?
   end
-end
+end

data/lib/chewy/strategy.rb

@@ -15,6 +15,12 @@ begin
 rescue LoadError
 end
 
+begin
+  require 'active_job'
+  require 'chewy/strategy/active_job'
+rescue LoadError
+end
+
 module Chewy
   # This class represents strategies stack with `:base`
   # Strategy on top of it. This causes raising exceptions

data/lib/chewy/strategy/active_job.rb

@@ -0,0 +1,28 @@
+module Chewy
+  class Strategy
+    # The strategy works the same way as atomic, but performs
+    # async index update driven by active_job
+    #
+    #   Chewy.strategy(:active_job) do
+    #     User.all.map(&:save) # Does nothing here
+    #     Post.all.map(&:save) # And here
+    #     # It imports all the changed users and posts right here
+    #   end
+    #
+    class ActiveJob < Atomic
+      class Worker < ::ActiveJob::Base
+        queue_as :chewy
+
+        def perform(type, ids)
+          type.constantize.import!(ids)
+        end
+      end
+
+      def leave
+        @stash.each do |type, ids|
+          Chewy::Strategy::ActiveJob::Worker.perform_later(type.name, ids) unless ids.empty?
+        end
+      end
+    end
+  end
+end

data/lib/chewy/strategy/atomic.rb

@@ -1,6 +1,6 @@
 module Chewy
   class Strategy
-    # This strategy accomulates all the objects prepared for
+    # This strategy accumulates all the objects prepared for
     # indexing and fires index process when strategy is popped
     # from the strategies stack.
     #

data/lib/chewy/strategy/sidekiq.rb

@@ -19,7 +19,9 @@ module Chewy
       end
 
       def leave
-        @stash.all? { |type, ids| Chewy::Strategy::Sidekiq::Worker.perform_async(type.name, ids) }
+        @stash.each do |type, ids|
+          Chewy::Strategy::Sidekiq::Worker.perform_async(type.name, ids) unless ids.empty?
+        end
       end
     end
   end

data/lib/chewy/type.rb

@@ -8,6 +8,7 @@ require 'chewy/type/import'
 require 'chewy/type/adapter/object'
 require 'chewy/type/adapter/active_record'
 require 'chewy/type/adapter/mongoid'
+require 'chewy/type/adapter/sequel'
 
 module Chewy
   class Type
@@ -21,7 +22,7 @@ module Chewy
 
     singleton_class.delegate :index_name, :client, to: :index
 
-    # Chewy index current type blongs to. Defined inside `Chewy.create_type`
+    # Chewy index current type belongs to. Defined inside `Chewy.create_type`
     #
     def self.index
       raise NotImplementedError

data/lib/chewy/type/adapter/active_record.rb

@@ -4,12 +4,19 @@ module Chewy
   class Type
     module Adapter
       class ActiveRecord < Orm
+
+        def self.accepts?(target)
+          defined?(::ActiveRecord::Base) && (
+            target.is_a?(Class) && target < ::ActiveRecord::Base ||
+            target.is_a?(::ActiveRecord::Relation))
+        end
+
       private
 
         def cleanup_default_scope!
           if Chewy.logger && (@default_scope.arel.orders.present? ||
              @default_scope.arel.limit.present? || @default_scope.arel.offset.present?)
-            Chewy.logger.warn('Default type scope order, limit and offest are ignored and will be nullified')
+            Chewy.logger.warn('Default type scope order, limit and offset are ignored and will be nullified')
           end
 
           @default_scope = @default_scope.reorder(nil).limit(nil).offset(nil)
@@ -31,7 +38,7 @@ module Chewy
         end
 
         def pluck_ids(scope)
-          scope.pluck(target.primary_key.to_sym)
+          scope.except(:includes).uniq.pluck(target.primary_key.to_sym)
         end
 
         def scope_where_ids_in(scope, ids)