chewy 0.8.3 → 0.8.4

data/gemfiles/{rails.4.1.mongoid.gemfile → rails.4.1.mongoid.4.0.0.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4.0.0"
+gem "mongoid", "> 4.0.0"
 gem "activesupport", "~> 4.1.0"
 gem "resque", :require => false
 gem "sidekiq", :require => false

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

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4.0.0"
+gem "mongoid", "> 4.0.0"
 gem "activesupport", "~> 4.1.0"
 gem "kaminari", "0.16.3", :require => false
 

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

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4.0.0"
+gem "mongoid", "> 4.0.0"
 gem "activesupport", "~> 4.1.0"
 gem "will_paginate", :require => false
 

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

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

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

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

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

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

data/gemfiles/{rails.4.2.mongoid.kaminari.gemfile → rails.4.2.mongoid.4.0.0.kaminari.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 "kaminari", "0.16.3", :require => false
 

data/gemfiles/{rails.4.2.mongoid.will_paginate.gemfile → rails.4.2.mongoid.4.0.0.will_paginate.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 "will_paginate", :require => false
 

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

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

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

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+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"
+end
+
+gemspec :path => "../"

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

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

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

data/gemfiles/rails.5.0.0.beta3.activerecord.kaminari.gemfile

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

data/gemfiles/rails.5.0.0.beta3.activerecord.will_paginate.gemfile

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

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

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sequel", "~> 4.28.0"
+gem "sequel", "~> 4.31.0"
 gem "activesupport", "~> 4.2.0"
 
 group :test do

data/lib/chewy.rb

@@ -8,6 +8,7 @@ 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/numeric/bytes'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/inclusion'
 require 'active_support/core_ext/string/inflections'
@@ -122,7 +123,12 @@ module Chewy
     # Main elasticsearch-ruby client instance
     #
     def client
-      Thread.current[:chewy_client] ||= ::Elasticsearch::Client.new configuration
+      Thread.current[:chewy_client] ||= begin
+        client_configuration = configuration.deep_dup
+        client_configuration.delete(:prefix) # used by Chewy, not relevant to Elasticsearch::Client
+        block = client_configuration[:transport_options].try(:delete, :proc)
+        ::Elasticsearch::Client.new(client_configuration, &block)
+      end
     end
 
     # Sends wait_for_status request to ElasticSearch with status

data/lib/chewy/errors.rb

@@ -36,4 +36,10 @@ Please wrap your code with `Chewy.strategy(:strategy_name) block.`
       super message
     end
   end
+
+  class RemovedFeature < Error
+  end
+
+  class PluginMissing < Error
+  end
 end

data/lib/chewy/fields/base.rb

@@ -11,19 +11,19 @@ module Chewy
       end
 
       def multi_field?
-        children.any? && !object_field?
+        children.present? && !object_field?
       end
 
       def object_field?
-        (children.any? && options[:type].blank?) || ['object', 'nested'].include?(options[:type].to_s)
+        (children.present? && options[:type].blank?) || ['object', 'nested'].include?(options[:type].to_s)
       end
 
       def mappings_hash
-        mapping = children.any? ? {
+        mapping = children.present? ? {
           (multi_field? ? :fields : :properties) => children.map(&:mappings_hash).inject(:merge)
         } : {}
         mapping.reverse_merge!(options)
-        mapping.reverse_merge!(type: (children.any? ? 'object' : 'string'))
+        mapping.reverse_merge!(type: (children.present? ? 'object' : 'string'))
         {name => mapping}
       end
 
@@ -39,16 +39,20 @@ module Chewy
             value.call(*objects.first(value.arity))
           end
         elsif object.is_a?(Hash)
-          object[name] || object[name.to_s]
+          if object.has_key?(name)
+            object[name]
+          else
+            object[name.to_s]
+          end
         else
           object.send(name)
         end
 
         result = if result.respond_to?(:to_ary)
-          result.to_ary.map { |result| compose_children(result, *objects) }
+          result.to_ary.map { |item| compose_children(item, *objects) }
         else
           compose_children(result, *objects)
-        end if children.any? && !multi_field?
+        end if children.present? && !multi_field?
 
         {name => result.as_json(root: false)}
       end
@@ -56,7 +60,7 @@ module Chewy
     private
 
       def compose_children(value, *parent_objects)
-        children.map { |field| field.compose(value, *parent_objects) if value }.compact.inject(:merge)
+        children.map { |field| field.compose(value, *parent_objects) }.compact.inject(:merge) if value
       end
     end
   end

data/lib/chewy/fields/root.rb

@@ -21,7 +21,7 @@ module Chewy
         mappings = super
         mappings[name].delete(:type)
 
-        if dynamic_templates.any?
+        if dynamic_templates.present?
           mappings[name][:dynamic_templates] ||= []
           mappings[name][:dynamic_templates].concat dynamic_templates
         end

data/lib/chewy/index.rb

@@ -30,18 +30,24 @@ module Chewy
     #
     def self.index_name(suggest = nil)
       if suggest
-        @index_name = build_index_name(suggest, prefix: Chewy.configuration[:prefix])
+        @index_name = build_index_name(suggest, prefix: default_prefix)
       else
         @index_name ||= begin
           build_index_name(
             name.sub(/Index\Z/, '').demodulize.underscore,
-            prefix: Chewy.configuration[:prefix]
+            prefix: default_prefix
           ) if name
         end
       end
       @index_name or raise UndefinedIndex
     end
 
+    # Prefix to use
+    #
+    def self.default_prefix
+      Chewy.configuration[:prefix]
+    end
+
     # Defines type for the index. Arguments depends on adapter used. For
     # ActiveRecord you can pass model or scope and options
     #
@@ -80,11 +86,14 @@ module Chewy
       type_class = Chewy.create_type(self, target, options, &block)
       self.type_hash = type_hash.merge(type_class.type_name => type_class)
 
-      class_eval <<-METHOD, __FILE__, __LINE__ + 1
-        def self.#{type_class.type_name}
-          type_hash['#{type_class.type_name}']
-        end
-      METHOD
+      unless respond_to?(type_class.type_name)
+        class_eval <<-METHOD, __FILE__, __LINE__ + 1
+          def self.#{type_class.type_name}
+            ActiveSupport::Deprecation.warn("`#{self}.#{type_class.type_name}` accessor is deprecated and will be removed soon. Use `#{type_class}` directly instead.")
+            type_hash['#{type_class.type_name}']
+          end
+        METHOD
+      end
     end
 
     # Types method has double usage.
@@ -99,7 +108,7 @@ module Chewy
     #   UsersIndex.types(:admin, :manager).filters { name =~ 'ro' } # the same as the first example
     #
     def self.types *args
-      if args.any?
+      if args.present?
         all.types *args
       else
         type_hash.values

data/lib/chewy/index/actions.rb

@@ -24,8 +24,8 @@ module Chewy
         # method creates index with suffix and makes unsuffixed alias
         # for it.
         #
-        #   UsersIndex.create '01-2013' # creates index `uses_01-2013` and alias `users` for it
-        #   UsersIndex.create '01-2013', alias: false # creates index `uses_01-2013` only and no alias
+        #   UsersIndex.create '01-2013' # creates index `users_01-2013` and alias `users` for it
+        #   UsersIndex.create '01-2013', alias: false # creates index `users_01-2013` only and no alias
         #
         # Suffixed index names might be used for zero-downtime mapping change, for example.
         # Description: (http://www.elasticsearch.org/blog/changing-mapping-with-zero-downtime/).
@@ -161,7 +161,7 @@ module Chewy
         #   UsersIndex.reset! Time.now.to_i
         #
         def reset! suffix = nil
-          if suffix.present? && (indexes = self.indexes).any?
+          if suffix.present? && (indexes = self.indexes).present?
             create! suffix, alias: false
             result = import suffix: suffix
             client.indices.update_aliases body: {actions: [
@@ -170,7 +170,7 @@ module Chewy
               end,
               {add: {index: build_index_name(suffix: suffix), alias: index_name}}
             ]}
-            client.indices.delete index: indexes if indexes.any?
+            client.indices.delete index: indexes if indexes.present?
             result
           else
             purge! suffix

data/lib/chewy/query.rb

@@ -18,16 +18,6 @@ module Chewy
     include Loading
     include Pagination
 
-    RESULT_MERGER = lambda do |key, old_value, new_value|
-      if old_value.is_a?(Hash) && new_value.is_a?(Hash)
-        old_value.merge(new_value, &RESULT_MERGER)
-      elsif new_value.is_a?(Array) && new_value.count > 1
-        new_value
-      else
-        old_value.is_a?(Array) ? new_value : new_value.first
-      end
-    end
-
     delegate :each, :count, :size, to: :_collection
     alias_method :to_ary, :to_a
 
@@ -353,6 +343,7 @@ module Chewy
     # Returns empty hash if no facets was requested or resulted.
     #
     def facets params = nil
+      raise RemovedFeature, 'removed in elasticsearch 2.0' if Runtime.version >= '2.0'
       if params
         chain { criteria.update_facets params }
       else
@@ -906,6 +897,10 @@ module Chewy
     #   UsersIndex::User.filter{ age <= 42 }.delete_all
     #
     def delete_all
+      if Runtime.version > '2.0'
+        plugins = Chewy.client.nodes.info(plugins: true)["nodes"].values.map { |item| item["plugins"] }.flatten
+        raise PluginMissing, "install delete-by-query plugin" unless plugins.find { |item| item["name"] == 'delete-by-query' }
+      end
       request = chain { criteria.update_options simple: true }.send(:_request)
       ActiveSupport::Notifications.instrument 'delete_query.chewy',
         request: request, indexes: _indexes, types: _types,
@@ -992,7 +987,7 @@ module Chewy
           begin
             Chewy.client.search(_request)
           rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
-            raise e if e.message !~ /IndexMissingException/
+            raise e if e.message !~ /IndexMissingException/ && e.message !~ /index_not_found_exception/
             {}
           end
       end
@@ -1000,8 +995,8 @@ module Chewy
 
     def _results
       @_results ||= (criteria.none? || _response == {} ? [] : _response['hits']['hits']).map do |hit|
-        attributes = (hit['_source'] || {}).merge(hit['highlight'] || {}, &RESULT_MERGER)
-        attributes.reverse_merge!(id: hit['_id'])
+        attributes = (hit['_source'] || {})
+          .reverse_merge(id: hit['_id'])
           .merge!(_score: hit['_score'])
           .merge!(_explanation: hit['_explanation'])