chewy 0.6.2 → 0.7.0

data/chewy.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.0.0'
-  spec.add_development_dependency 'rspec-its', '~> 1.0.1'
+  spec.add_development_dependency 'appraisal'
+  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 'database_cleaner', '~> 1.3.0'
   spec.add_development_dependency 'elasticsearch-extensions'
   spec.add_development_dependency 'rubysl', '~> 2.0' if RUBY_ENGINE == 'rbx'
 

data/gemfiles/rails.3.2.activerecord.gemfile

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

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

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

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

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

data/gemfiles/rails.4.0.activerecord.gemfile

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

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

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

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

@@ -0,0 +1,14 @@
+# 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.gemfile

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

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

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

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

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 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.1.activerecord.gemfile

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

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

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

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

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

data/gemfiles/rails.4.1.mongoid.gemfile

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

data/gemfiles/rails.4.1.mongoid.kaminari.gemfile

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

data/gemfiles/rails.4.1.mongoid.will_paginate.gemfile

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

data/gemfiles/rails.4.2.activerecord.gemfile

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

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

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

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

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

data/gemfiles/rails.4.2.mongoid.gemfile

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

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

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

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

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

data/lib/chewy.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'active_support/log_subscriber'
 require 'active_support/deprecation'
 require 'active_support/core_ext'
 require 'active_support/concern'
@@ -12,7 +13,10 @@ require 'elasticsearch'
 require 'chewy/version'
 require 'chewy/errors'
 require 'chewy/config'
+require 'chewy/repository'
 require 'chewy/runtime'
+require 'chewy/log_subscriber'
+require 'chewy/strategy'
 require 'chewy/index'
 require 'chewy/type'
 require 'chewy/fields/base'
@@ -103,6 +107,12 @@ module Chewy
       type
     end
 
+    # Main elasticsearch-ruby client instance
+    #
+    def client
+      Thread.current[:chewy_client] ||= ::Elasticsearch::Client.new configuration
+    end
+
     # Sends wait_for_status request to ElasticSearch with status
     # defined in configuration.
     #
@@ -121,9 +131,64 @@ module Chewy
     end
     alias_method :delete_all, :massacre
 
+    # Strategies are designed to allow nesting, so it is possible
+    # to redefine it for nested contexts.
+    #
+    #   Chewy.strategy(:atomic) do
+    #     city1.do_update!
+    #     Chewy.strategy(:urgent) do
+    #       city2.do_update!
+    #       city3.do_update!
+    #       # there will be 2 update index requests for city2 and city3
+    #     end
+    #     city4..do_update!
+    #     # city1 and city4 will be grouped in one index update request
+    #   end
+    #
+    # It is possible to nest strategies without blocks:
+    #
+    #   Chewy.strategy(:urgent)
+    #   city1.do_update! # index updated
+    #   Chewy.strategy(:bypass)
+    #   city2.do_update! # update bypassed
+    #   Chewy.strategy.pop
+    #   city3.do_update! # index updated again
+    #
+    def strategy name = nil, &block
+      Thread.current[:chewy_strategy] ||= Chewy::Strategy.new
+      if name
+        if block
+          Thread.current[:chewy_strategy].wrap name, &block
+        else
+          Thread.current[:chewy_strategy].push name
+        end
+      else
+        Thread.current[:chewy_strategy]
+      end
+    end
+
+    def urgent_update= value
+      ActiveSupport::Deprecation.warn('`Chewy.urgent_update = value` is deprecated and will be removed soon, use `Chewy.strategy(:urgent)` block instead')
+      if value
+        strategy(:urgent)
+      else
+        strategy.pop
+      end
+    end
+
+    def atomic &block
+      ActiveSupport::Deprecation.warn('`Chewy.atomic` block is deprecated and will be removed soon, use `Chewy.strategy(:atomic)` block instead')
+      strategy(:atomic, &block)
+    end
+
     def config
       Chewy::Config.instance
     end
     delegate *Chewy::Config.delegated, to: :config
+
+    def repository
+      Chewy::Repository.instance
+    end
+    delegate *Chewy::Repository.delegated, to: :repository
   end
 end

data/lib/chewy/config.rb

@@ -2,20 +2,7 @@ module Chewy
   class Config
     include Singleton
 
-    attr_reader :analyzers, :tokenizers, :filters, :char_filters
-    attr_accessor :configuration,
-      # Just sets up logger to current configuration
-      #
-      #   Chewy.logger = Rails.logger
-      #
-      :logger,
-
-      # Urgent update default value. False by default. Urgent
-      # updates are useful for testing, so don't use it in the
-      # application code. Prefer `Chewy.atomic` block for cumulative
-      # index updates.
-      #
-      :urgent_update,
+    attr_accessor :settings, :transport_logger, :transport_tracer, :logger,
 
       # Default query compilation mode. `:must` by default.
       # See Chewy::Query#query_mode for details
@@ -30,68 +17,52 @@ module Chewy
       # Default post_filters compilation mode. `nil` by default.
       # See Chewy::Query#post_filter_mode for details
       #
-      :post_filter_mode
+      :post_filter_mode,
 
-    def self.delegated
-      public_instance_methods - self.superclass.public_instance_methods - Singleton.public_instance_methods
-    end
+      # The first trategy in stack. `:base` by default.
+      # If you neet to return to the previous chewy behavior -
+      # just set it to `:bypass`
+      #
+      :root_strategy,
 
-    def self.repository name
-      plural_name = name.to_s.pluralize
+      # The first trategy in stack. `:base` by default.
+      # If you neet to return to the previous chewy behavior -
+      # just set it to `:bypass`
+      #
+      :request_strategy,
 
-      class_eval <<-METHOD, __FILE__, __LINE__ + 1
-        def #{name}(name, options = nil)
-          options ? #{plural_name}[name.to_sym] = options : #{plural_name}[name.to_sym]
-        end
-      METHOD
+      # Use after_commit callbacks for RDBMS instead of
+      # after_save and after_destroy. True by default. Useful
+      # in tests with transactional fixtures or transactional
+      # DatabaseCleaner strategy.
+      #
+      :use_after_commit_callbacks
+
+    def self.delegated
+      public_instance_methods - self.superclass.public_instance_methods - Singleton.public_instance_methods
     end
 
     def initialize
-      @configuration = {}
-      @urgent_update = false
+      @settings = {}
       @query_mode = :must
       @filter_mode = :and
-      @analyzers = {}
-      @tokenizers = {}
-      @filters = {}
-      @char_filters = {}
+      @root_strategy = :base
+      @request_strategy = :atomic
+      @use_after_commit_callbacks = true
     end
 
-    # Analysers repository:
-    #
-    #   Chewy.analyzer :my_analyzer2, {
-    #     type: custom,
-    #     tokenizer: 'my_tokenizer1',
-    #     filter : ['my_token_filter1', 'my_token_filter2']
-    #     char_filter : ['my_html']
-    #   }
-    #   Chewy.analyzer(:my_analyzer2) # => {type: 'custom', tokenizer: ...}
-    #
-    repository :analyzer
-
-    # Tokenizers repository:
-    #
-    #   Chewy.tokenizer :my_tokenizer1, {type: standard, max_token_length: 900}
-    #   Chewy.tokenizer(:my_tokenizer1) # => {type: standard, max_token_length: 900}
-    #
-    repository :tokenizer
-
-    # Token filters repository:
-    #
-    #   Chewy.filter :my_token_filter1, {type: stop, stopwords: [stop1, stop2, stop3, stop4]}
-    #   Chewy.filter(:my_token_filter1) # => {type: stop, stopwords: [stop1, stop2, stop3, stop4]}
-    #
-    repository :filter
+    def transport_logger= logger
+      Chewy.client.transport.logger = logger
+      @transport_logger = logger
+    end
 
-    # Char filters repository:
-    #
-    #   Chewy.char_filter :my_html, {type: html_strip, escaped_tags: [xxx, yyy], read_ahead: 1024}
-    #   Chewy.char_filter(:my_html) # => {type: html_strip, escaped_tags: [xxx, yyy], read_ahead: 1024}
-    #
-    repository :char_filter
+    def transport_tracer= tracer
+      Chewy.client.transport.tracer = tracer
+      @transport_tracer = tracer
+    end
 
     # Chewy core configurations. There is two ways to set it up:
-    # use `Chewy.configuration=` method or, for Rails application,
+    # use `Chewy.settings=` method or, for Rails application,
     # create `config/chewy.yml` file. Btw, `config/chewy.yml` supports
     # ERB the same way as ActiveRecord's config.
     #
@@ -134,45 +105,25 @@ module Chewy
     #            number_of_replicas: 0
     #
     def configuration
-      options = @configuration.deep_symbolize_keys.merge(yaml_options)
-      options.merge!(logger: logger) if logger
-      options
-    end
-
-    def client
-      Thread.current[:chewy_client] ||= ::Elasticsearch::Client.new configuration
-    end
-
-    def atomic?
-      stash.any?
-    end
-
-    def atomic
-      stash.push({})
-      yield
-    ensure
-      stash.pop.each { |type, ids| type.import(ids) }
+      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
+      end
     end
 
-    def stash *args
-      if args.any?
-        type, ids = *args
-        raise ArgumentError.new('Only Chewy::Type accepted as the first argument') unless type < Chewy::Type
-        stash.last[type] ||= []
-        stash.last[type] |= ids
-      else
-        Thread.current[:chewy_cache] ||= []
-      end
+    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
 
   private
 
-    def yaml_options
-      @yaml_options ||= begin
+    def yaml_settings
+      @yaml_settings ||= begin
         if defined?(Rails)
           file = Rails.root.join(*%w(config chewy.yml))
 
-          if File.exists?(file)
+          if File.exist?(file)
             yaml = ERB.new(File.read(file)).result
             hash = YAML.load(yaml)
             hash[Rails.env].try(:deep_symbolize_keys) if hash