elasticsearch-model 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f9a1aed30a6f21b7c51f5f73ab01e9f00ea7b3d2d3d6b2203b5ba922e6dd63
-  data.tar.gz: 65bcb7ba51e908ada809d47d9aea04d2c78091182061b2d83488735696c25c93
+  metadata.gz: 726d16096fd6ca31266bab9b42c4f878cba6942eada1649de7fbf946af2575f0
+  data.tar.gz: 8ce1faffcdda9dae38ff2beddab31f0b161853c4fd9919b699cdb5e5a27f2baa
 SHA512:
-  metadata.gz: 81f261b7d86e68d6b23e811a5053bb300982d4536ac3a7026850b098f08237e46a51c847cc2d12736fee7544a3984cae45a0ebef034a6cb38dd41c3bc96c8b14
-  data.tar.gz: e53472c07599acae594fdcdc19405eb4f03cbfe77ee242429d539dc09cce5b03011d3e74f2b777642e0018895ba0e57551f385d37dbb20c6ce62877e8393819f
+  metadata.gz: 63904bd61ec508918ee8a0d6cbe7cd089dc0b6df7c6f4d8ea1fef7538b2aea3a88962724e6a5fc486f5ec10146350e4176655b3fbeec868a66b6b3e00e767307
+  data.tar.gz: 36fccab94cf1f3cdfa599ad0a6d74cecc1b503c80da296e73381f3b3f2130244d57a9b51fabaff5e624e7f0955442e3b0e67d7006b6b94f705fdc4249252ac12

data/README.md

@@ -321,7 +321,7 @@ Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model
 
 #### The Elasticsearch DSL
 
-In most situation, you'll want to pass the search definition
+In most situations, you'll want to pass the search definition
 in the Elasticsearch [domain-specific language](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html) to the client:
 
 ```ruby
@@ -425,7 +425,7 @@ Article.__elasticsearch__.refresh_index!
 ```
 
 By default, index name and document type will be inferred from your class name,
-you can set it explicitely, however:
+you can set it explicitly, however:
 
 ```ruby
 class Article
@@ -534,7 +534,7 @@ class Indexer
     case operation.to_s
       when /index/
         record = Article.find(record_id)
-        Client.index  index: 'articles', type: 'article', id: record.id, body: record.as_indexed_json
+        Client.index  index: 'articles', type: 'article', id: record.id, body: record.__elasticsearch__.as_indexed_json
       when /delete/
         Client.delete index: 'articles', type: 'article', id: record_id
       else raise ArgumentError, "Unknown operation '#{operation}'"
@@ -674,7 +674,7 @@ module DataMapperAdapter
   #
   module Records
     def records
-      klass.all(id: @ids)
+      klass.all(id: ids)
     end
 
     # ...

data/elasticsearch-model.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.3"
 
-  s.add_dependency "elasticsearch",       '~> 5'
+  s.add_dependency "elasticsearch",       '> 1'
   s.add_dependency "activesupport",       '> 3'
   s.add_dependency "hashie"
 
@@ -32,10 +32,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "elasticsearch-extensions"
 
-  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "sqlite3" unless defined?(JRUBY_VERSION)
   s.add_development_dependency "activemodel",   "> 3"
 
-  s.add_development_dependency "oj"
+  s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
   s.add_development_dependency "kaminari"
   s.add_development_dependency "will_paginate"
 
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
   s.add_development_dependency "turn"
   s.add_development_dependency "yard"
-  s.add_development_dependency "ruby-prof"
+  s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
   s.add_development_dependency "pry"
 
   s.add_development_dependency "simplecov"

data/examples/activerecord_custom_analyzer.rb

@@ -0,0 +1,135 @@
+# Custom Analyzer for ActiveRecord integration with Elasticsearch
+# ===============================================================
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'ansi'
+require 'logger'
+
+require 'active_record'
+require 'elasticsearch/model'
+
+ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
+ActiveRecord::Base.establish_connection( adapter: 'sqlite3', database: ":memory:" )
+
+ActiveRecord::Schema.define(version: 1) do
+  create_table :articles do |t|
+    t.string :title
+    t.date    :published_at
+    t.timestamps
+  end
+end
+
+Elasticsearch::Model.client.transport.logger = ActiveSupport::Logger.new(STDOUT)
+Elasticsearch::Model.client.transport.logger.formatter = lambda { |s, d, p, m| "#{m.ansi(:faint)}\n" }
+
+class Article < ActiveRecord::Base
+  include Elasticsearch::Model
+
+  settings index: {
+    number_of_shards: 1,
+    number_of_replicas: 0,
+    analysis: {
+      analyzer: {
+        pattern: {
+          type: 'pattern',
+          pattern: "\\s|_|-|\\.",
+          lowercase: true
+        },
+        trigram: {
+          tokenizer: 'trigram'
+        }
+      },
+      tokenizer: {
+        trigram: {
+          type: 'ngram',
+          min_gram: 3,
+          max_gram: 3,
+          token_chars: ['letter', 'digit']
+        }
+      }
+    } } do
+    mapping do
+      indexes :title, type: 'text', analyzer: 'english' do
+        indexes :keyword, analyzer: 'keyword'
+        indexes :pattern, analyzer: 'pattern'
+        indexes :trigram, analyzer: 'trigram'
+      end
+    end
+  end
+end
+
+# Create example records
+#
+Article.delete_all
+Article.create title: 'Foo'
+Article.create title: 'Foo-Bar'
+Article.create title: 'Foo_Bar_Bazooka'
+Article.create title: 'Foo.Bar'
+
+# Index records
+#
+errors = Article.import force: true, refresh: true, return: 'errors'
+puts "[!] Errors importing records: #{errors.map { |d| d['index']['error'] }.join(', ')}".ansi(:red) && exit(1) unless errors.empty?
+
+puts '', '-'*80
+
+puts "English analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
+     "Tokens: " +
+     Article.__elasticsearch__.client.indices
+      .analyze(index: Article.index_name, body: { field: 'title', text: 'Foo_Bar_1_Bazooka' })['tokens']
+      .map { |d| "[#{d['token']}]" }.join(' '),
+    "\n"
+
+puts "Keyword analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
+     "Tokens: " +
+     Article.__elasticsearch__.client.indices
+      .analyze(index: Article.index_name, body: { field: 'title.keyword', text: 'Foo_Bar_1_Bazooka' })['tokens']
+      .map { |d| "[#{d['token']}]" }.join(' '),
+     "\n"
+
+puts "Pattern analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
+     "Tokens: " +
+     Article.__elasticsearch__.client.indices
+      .analyze(index: Article.index_name, body: { field: 'title.pattern', text: 'Foo_Bar_1_Bazooka' })['tokens']
+      .map { |d| "[#{d['token']}]" }.join(' '),
+     "\n"
+
+puts "Trigram analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
+     "Tokens: " +
+     Article.__elasticsearch__.client.indices
+      .analyze(index: Article.index_name, body: { field: 'title.trigram', text: 'Foo_Bar_1_Bazooka' })['tokens']
+      .map { |d| "[#{d['token']}]" }.join(' '),
+     "\n"
+
+puts '', '-'*80
+
+response = Article.search query: { match: { 'title' => 'foo' } } ;
+
+puts "English search for 'foo'".ansi(:bold),
+     "#{response.response.hits.total} matches: " +
+     response.records.map { |d| d.title }.join(', '),
+     "\n"
+
+puts '', '-'*80
+
+response = Article.search query: { match: { 'title.pattern' => 'foo' } } ;
+
+puts "Pattern search for 'foo'".ansi(:bold),
+     "#{response.response.hits.total} matches: " +
+     response.records.map { |d| d.title }.join(', '),
+     "\n"
+
+puts '', '-'*80
+
+response = Article.search query: { match: { 'title.trigram' => 'zoo' } } ;
+
+puts "Trigram search for 'zoo'".ansi(:bold),
+     "#{response.response.hits.total} matches: " +
+     response.records.map { |d| d.title }.join(', '),
+     "\n"
+
+puts '', '-'*80
+
+
+require 'pry'; binding.pry;

data/examples/activerecord_mapping_completion.rb

@@ -25,9 +25,7 @@ class Article < ActiveRecord::Base
   end
 
   def as_indexed_json(options={})
-    as_json.merge \
-    title_suggest: { input:  title },
-    url: "/articles/#{id}"
+    as_json.merge 'url' => "/articles/#{id}"
   end
 end
 

data/examples/datamapper_article.rb

@@ -50,11 +50,21 @@ module DataMapperAdapter
   #
   module Records
     def records
-      klass.all(id: @ids)
+      klass.all(id: ids)
     end
 
     # ...
   end
+
+  module Callbacks
+    def self.included(model)
+      model.class_eval do
+        after(:create) { __elasticsearch__.index_document  }
+        after(:save) { __elasticsearch__.update_document }
+        after(:destroy) { __elasticsearch__.delete_document }
+      end
+    end
+  end
 end
 
 # Register the adapter

data/gemfiles/3.0.gemfile

@@ -10,4 +10,4 @@ gemspec path: '../'
 gem 'activemodel',  '>= 3.0'
 gem 'activerecord', '~> 3.2'
 gem 'mongoid',      '>= 3.0'
-gem 'sqlite3'
+gem 'sqlite3' unless defined?(JRUBY_VERSION)

data/gemfiles/4.0.gemfile

@@ -9,4 +9,4 @@ gemspec path: '../'
 
 gem 'activemodel',  '~> 4'
 gem 'activerecord', '~> 4'
-gem 'sqlite3'
+gem 'sqlite3' unless defined?(JRUBY_VERSION)

data/gemfiles/5.0.gemfile

@@ -9,4 +9,4 @@ gemspec path: '../'
 
 gem 'activemodel',  '~> 5'
 gem 'activerecord', '~> 5'
-gem 'sqlite3'
+gem 'sqlite3' unless defined?(JRUBY_VERSION)

data/lib/elasticsearch/model/adapters/active_record.rb

@@ -56,7 +56,10 @@ module Elasticsearch
             # Redefine the `to_a` method to the original one
             #
             sql_records.instance_exec do
-              define_singleton_method(:to_a) do
+              ar_records_method_name = :to_a
+              ar_records_method_name = :records if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 5
+
+              define_singleton_method(ar_records_method_name) do
                 if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 4
                   self.load
                 else

data/lib/elasticsearch/model/adapters/mongoid.rb

@@ -63,10 +63,17 @@ module Elasticsearch
           # @see https://github.com/karmi/retire/pull/724
           #
           def __find_in_batches(options={}, &block)
-            options[:batch_size] ||= 1_000
+            batch_size = options[:batch_size] || 1_000
+            query = options[:query]
+            named_scope = options[:scope]
+            preprocess = options[:preprocess]
+
+            scope = all
+            scope = scope.send(named_scope) if named_scope
+            scope = query.is_a?(Proc) ? scope.class_exec(&query) : scope.where(query) if query
   
-            all.no_timeout.each_slice(options[:batch_size]) do |items|
-              yield items
+            scope.no_timeout.each_slice(batch_size) do |items|
+              yield (preprocess ? self.__send__(preprocess, items) : items)
             end
           end
 

data/lib/elasticsearch/model/importing.rb

@@ -130,7 +130,7 @@ module Elasticsearch
             errors +=  response['items'].select { |k, v| k.values.first['error'] }
           end
 
-          self.refresh_index! if refresh
+          self.refresh_index! index: target_index if refresh
 
           case return_value
             when 'errors'

data/lib/elasticsearch/model/indexing.rb

@@ -397,7 +397,7 @@ module Elasticsearch
         # @see http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions:update
         #
         def update_document(options={})
-          if attributes_in_database = self.instance_variable_get(:@__changed_model_attributes)
+          if attributes_in_database = self.instance_variable_get(:@__changed_model_attributes).presence
             attributes = if respond_to?(:as_indexed_json)
               self.as_indexed_json.select { |k,v| attributes_in_database.keys.map(&:to_s).include? k.to_s }
             else

data/lib/elasticsearch/model/naming.rb

@@ -5,6 +5,8 @@ module Elasticsearch
     #
     module Naming
 
+      DEFAULT_DOC_TYPE = '_doc'.freeze
+
       module ClassMethods
 
         # Get or set the name of the index
@@ -90,7 +92,7 @@ module Elasticsearch
           end
 
           def default_document_type
-            self.model_name.element
+            DEFAULT_DOC_TYPE
           end
 
       end

data/lib/elasticsearch/model/response/aggregations.rb

@@ -2,7 +2,7 @@ module Elasticsearch
   module Model
     module Response
 
-      class Aggregations < Hashie::Mash
+      class Aggregations < HashWrapper
         disable_warnings if respond_to?(:disable_warnings)
 
         def initialize(attributes={})

data/lib/elasticsearch/model/response/base.rb

@@ -4,7 +4,7 @@ module Elasticsearch
       # Common funtionality for classes in the {Elasticsearch::Model::Response} module
       #
       module Base
-        attr_reader :klass, :response
+        attr_reader :klass, :response, :raw_response
 
         # @param klass    [Class] The name of the model class
         # @param response [Hash]  The full response returned from Elasticsearch client
@@ -12,7 +12,8 @@ module Elasticsearch
         #
         def initialize(klass, response, options={})
           @klass     = klass
-          @response  = response
+          @raw_response = response
+          @response = response
         end
 
         # @abstract Implement this method in specific class

data/lib/elasticsearch/model/response/suggestions.rb

@@ -2,7 +2,7 @@ module Elasticsearch
   module Model
     module Response
 
-      class Suggestions < Hashie::Mash
+      class Suggestions < HashWrapper
         disable_warnings if respond_to?(:disable_warnings)
 
         def terms

data/lib/elasticsearch/model/response.rb

@@ -10,8 +10,7 @@ module Elasticsearch
       # Implements Enumerable and forwards its methods to the {#results} object.
       #
       class Response
-        attr_reader :klass, :search, :response,
-                    :took, :timed_out, :shards
+        attr_reader :klass, :search
 
         include Enumerable
 
@@ -27,9 +26,7 @@ module Elasticsearch
         # @return [Hash]
         #
         def response
-          @response ||= begin
-            HashWrapper.new(search.execute!)
-          end
+          @response ||= HashWrapper.new(search.execute!)
         end
 
         # Returns the collection of "hits" from Elasticsearch
@@ -51,31 +48,35 @@ module Elasticsearch
         # Returns the "took" time
         #
         def took
-          response['took']
+          raw_response['took']
         end
 
         # Returns whether the response timed out
         #
         def timed_out
-          response['timed_out']
+          raw_response['timed_out']
         end
 
         # Returns the statistics on shards
         #
         def shards
-          HashWrapper.new(response['_shards'])
+          @shards ||= HashWrapper.new(raw_response['_shards'])
         end
 
         # Returns a Hashie::Mash of the aggregations
         #
         def aggregations
-          Aggregations.new(response['aggregations'])
+          @aggregations ||= Aggregations.new(raw_response['aggregations'])
         end
 
         # Returns a Hashie::Mash of the suggestions
         #
         def suggestions
-          Suggestions.new(response['suggest'])
+          @suggestions ||= Suggestions.new(raw_response['suggest'])
+        end
+
+        def raw_response
+          @raw_response ||= search.execute!
         end
       end
     end

data/lib/elasticsearch/model/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Model
-    VERSION = "5.1.0"
+    VERSION = '6.0.0'
   end
 end

data/test/integration/active_record_associations_parent_child_test.rb

@@ -11,7 +11,11 @@ class Question < ActiveRecord::Base
 
   has_many :answers, dependent: :destroy
 
-  index_name 'questions_and_answers'
+  JOIN_TYPE = 'question'.freeze
+  JOIN_METADATA = { join_field: JOIN_TYPE}.freeze
+
+  index_name 'questions_and_answers'.freeze
+  document_type 'doc'.freeze
 
   mapping do
     indexes :title
@@ -19,6 +23,12 @@ class Question < ActiveRecord::Base
     indexes :author
   end
 
+  def as_indexed_json(options={})
+    # This line is necessary for differences between ActiveModel::Serializers::JSON#as_json versions
+    json = as_json(options)[JOIN_TYPE] || as_json(options)
+    json.merge(JOIN_METADATA)
+  end
+
   after_commit lambda { __elasticsearch__.index_document  },  on: :create
   after_commit lambda { __elasticsearch__.update_document },  on: :update
   after_commit lambda { __elasticsearch__.delete_document },  on: :destroy
@@ -29,32 +39,55 @@ class Answer < ActiveRecord::Base
 
   belongs_to :question
 
-  index_name 'questions_and_answers'
+  JOIN_TYPE = 'answer'.freeze
+
+  index_name 'questions_and_answers'.freeze
+  document_type 'doc'.freeze
+
+  before_create :randomize_id
+
+  def randomize_id
+    begin
+      self.id = SecureRandom.random_number(1_000_000)
+    end while Answer.where(id: self.id).exists?
+  end
 
-  mapping _parent: { type: 'question' }, _routing: { required: true } do
+  mapping do
     indexes :text
     indexes :author
   end
 
-  after_commit lambda { __elasticsearch__.index_document(parent: question_id)  },  on: :create
-  after_commit lambda { __elasticsearch__.update_document(parent: question_id) },  on: :update
-  after_commit lambda { __elasticsearch__.delete_document(parent: question_id) },  on: :destroy
+  def as_indexed_json(options={})
+    # This line is necessary for differences between ActiveModel::Serializers::JSON#as_json versions
+    json = as_json(options)[JOIN_TYPE] || as_json(options)
+    json.merge(join_field: { name: JOIN_TYPE, parent: question_id })
+  end
+
+  after_commit lambda { __elasticsearch__.index_document(routing: (question_id || 1))  },  on: :create
+  after_commit lambda { __elasticsearch__.update_document(routing: (question_id || 1)) },  on: :update
+  after_commit lambda {__elasticsearch__.delete_document(routing: (question_id || 1)) },  on: :destroy
 end
 
 module ParentChildSearchable
-  INDEX_NAME = 'questions_and_answers'
+  INDEX_NAME = 'questions_and_answers'.freeze
+  JOIN = 'join'.freeze
 
   def create_index!(options={})
     client = Question.__elasticsearch__.client
     client.indices.delete index: INDEX_NAME rescue nil if options[:force]
 
     settings = Question.settings.to_hash.merge Answer.settings.to_hash
-    mappings = Question.mappings.to_hash.merge Answer.mappings.to_hash
+    mapping_properties = { join_field: { type: JOIN,
+                                         relations: { Question::JOIN_TYPE => Answer::JOIN_TYPE } } }
+
+    merged_properties = mapping_properties.merge(Question.mappings.to_hash[:doc][:properties]).merge(
+        Answer.mappings.to_hash[:doc][:properties])
+    mappings = { doc: { properties: merged_properties }}
 
     client.indices.create index: INDEX_NAME,
                           body: {
-                            settings: settings.to_hash,
-                            mappings: mappings.to_hash }
+                              settings: settings.to_hash,
+                              mappings: mappings }
   end
 
   extend self
@@ -100,34 +133,34 @@ module Elasticsearch
 
         should "find questions by matching answers" do
           response = Question.search(
-                       { query: {
-                            has_child: {
-                              type: 'answer',
-                              query: {
-                                match: {
-                                  author: 'john'
-                                }
-                              }
-                            }
-                         }
-                       })
+              { query: {
+                  has_child: {
+                      type: 'answer',
+                      query: {
+                          match: {
+                              author: 'john'
+                          }
+                      }
+                  }
+              }
+              })
 
           assert_equal 'Second Question', response.records.first.title
         end
 
         should "find answers for matching questions" do
           response = Answer.search(
-                       { query: {
-                            has_parent: {
-                              parent_type: 'question',
-                              query: {
-                                match: {
-                                  author: 'john'
-                                }
-                              }
-                            }
-                         }
-                       })
+              { query: {
+                  has_parent: {
+                      parent_type: 'question',
+                      query: {
+                          match: {
+                              author: 'john'
+                          }
+                      }
+                  }
+              }
+              })
 
           assert_same_elements ['Adam', 'Ryan'], response.records.map(&:author)
         end
@@ -136,12 +169,20 @@ module Elasticsearch
           Question.where(title: 'First Question').each(&:destroy)
           Question.__elasticsearch__.refresh_index!
 
-          response = Answer.search query: { match_all: {} }
+          response = Answer.search(
+              { query: {
+                  has_parent: {
+                      parent_type: 'question',
+                      query: {
+                          match_all: {}
+                      }
+                  }
+              }
+              })
 
           assert_equal 1, response.results.total
         end
       end
-
     end
   end
 end

data/test/integration/active_record_basic_test.rb

@@ -16,6 +16,8 @@ module Elasticsearch
         include Elasticsearch::Model
         include Elasticsearch::Model::Callbacks
 
+        document_type 'article'
+
         settings index: { number_of_shards: 1, number_of_replicas: 0 } do
           mapping do
             indexes :title,         type: 'text', analyzer: 'snowball'
@@ -221,8 +223,10 @@ module Elasticsearch
 
           if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 4
             assert_equal 'Testing Coding', response.records.order(title: :desc).first.title
+            assert_equal 'Testing Coding', response.records.order(title: :desc)[0].title
           else
             assert_equal 'Testing Coding', response.records.order('title DESC').first.title
+            assert_equal 'Testing Coding', response.records.order('title DESC')[0].title
           end
         end
 

data/test/integration/active_record_custom_serialization_test.rb

@@ -41,7 +41,7 @@ module Elasticsearch
 
           a = ArticleWithCustomSerialization.__elasticsearch__.client.get \
                 index: 'article_with_custom_serializations',
-                type:  'article_with_custom_serialization',
+                type:  '_doc',
                 id:    '1'
 
           assert_equal( { 'title' => 'Test' }, a['_source'] )
@@ -55,7 +55,7 @@ module Elasticsearch
 
           a = ArticleWithCustomSerialization.__elasticsearch__.client.get \
                 index: 'article_with_custom_serializations',
-                type:  'article_with_custom_serialization',
+                type:  '_doc',
                 id:    '1'
 
           assert_equal( { 'title' => 'UPDATED' }, a['_source'] )

data/test/integration/active_record_import_test.rb

@@ -10,21 +10,22 @@ module Elasticsearch
   module Model
     class ActiveRecordImportIntegrationTest < Elasticsearch::Test::IntegrationTestCase
 
-      class ::ImportArticle < ActiveRecord::Base
-        include Elasticsearch::Model
+      context "ActiveRecord importing" do
+        setup do
+          Object.send(:remove_const, :ImportArticle) if defined?(ImportArticle)
+          class ::ImportArticle < ActiveRecord::Base
+            include Elasticsearch::Model
 
-        scope :popular, -> { where('views >= 50') }
+            scope :popular, -> { where('views >= 50') }
 
-        mapping do
-          indexes :title,      type: 'text'
-          indexes :views,      type: 'integer'
-          indexes :numeric,    type: 'integer'
-          indexes :created_at, type: 'date'
-        end
-      end
+            mapping do
+              indexes :title,      type: 'text'
+              indexes :views,      type: 'integer'
+              indexes :numeric,    type: 'integer'
+              indexes :created_at, type: 'date'
+            end
+          end
 
-      context "ActiveRecord importing" do
-        setup do
           ActiveRecord::Schema.define(:version => 1) do
             create_table :import_articles do |t|
               t.string   :title
@@ -110,6 +111,58 @@ module Elasticsearch
         end
       end
 
+      context "ActiveRecord importing when the model has a default scope" do
+
+        setup do
+          Object.send(:remove_const, :ImportArticle) if defined?(ImportArticle)
+          class ::ImportArticle < ActiveRecord::Base
+            include Elasticsearch::Model
+
+            default_scope { where('views >= 8') }
+
+            mapping do
+              indexes :title,      type: 'text'
+              indexes :views,      type: 'integer'
+              indexes :numeric,    type: 'integer'
+              indexes :created_at, type: 'date'
+            end
+          end
+
+          ActiveRecord::Schema.define(:version => 1) do
+            create_table :import_articles do |t|
+              t.string   :title
+              t.integer  :views
+              t.string   :numeric # For the sake of invalid data sent to Elasticsearch
+              t.datetime :created_at, :default => 'NOW()'
+            end
+          end
+
+          ImportArticle.delete_all
+          ImportArticle.__elasticsearch__.delete_index! force: true
+          ImportArticle.__elasticsearch__.create_index! force: true
+          ImportArticle.__elasticsearch__.client.cluster.health wait_for_status: 'yellow'
+
+          10.times { |i| ImportArticle.create! title: "Test #{i}", views: i }
+        end
+
+        should "import only documents from the default scope" do
+          assert_equal 2, ImportArticle.count
+
+          assert_equal 0, ImportArticle.import
+
+          ImportArticle.__elasticsearch__.refresh_index!
+          assert_equal 2, ImportArticle.search('*').results.total
+        end
+
+        should "import only documents from a specific query combined with the default scope" do
+          assert_equal 2, ImportArticle.count
+
+          assert_equal 0, ImportArticle.import(query: -> { where("title = 'Test 9'") })
+
+          ImportArticle.__elasticsearch__.refresh_index!
+          assert_equal 1, ImportArticle.search('*').results.total
+        end
+      end
     end
   end
 end

data/test/integration/active_record_namespaced_model_test.rb

@@ -22,6 +22,8 @@ module Elasticsearch
               include Elasticsearch::Model
               include Elasticsearch::Model::Callbacks
 
+              document_type 'article'
+
               mapping { indexes :title }
             end
           end

data/test/integration/mongoid_basic_test.rb

@@ -167,6 +167,70 @@ if MongoDB.available?
               assert response.results.any?, "Search has not returned results: #{response.to_a}"
             end
           end
+
+          context "importing when the model has a default scope" do
+            class ::MongoidArticleWithDefaultScope
+              include Mongoid::Document
+              include Elasticsearch::Model
+
+              default_scope -> { where(status: 'active') }
+
+              field :id, type: String
+              field :title, type: String
+              field :status, type: String, default: 'active'
+
+              attr_accessible :title if respond_to? :attr_accessible
+              attr_accessible :status if respond_to? :attr_accessible
+
+              settings index: { number_of_shards: 1, number_of_replicas: 0 } do
+                mapping do
+                  indexes :title,      type: 'text', analyzer: 'snowball'
+                  indexes :status,     type: 'text'
+                  indexes :created_at, type: 'date'
+                end
+              end
+
+              def as_indexed_json(options={})
+                as_json(except: [:id, :_id])
+              end
+            end
+
+            setup do
+              Elasticsearch::Model::Adapter.register \
+                Elasticsearch::Model::Adapter::Mongoid,
+                lambda { |klass| !!defined?(::Mongoid::Document) && klass.respond_to?(:ancestors) && klass.ancestors.include?(::Mongoid::Document) }
+
+              MongoidArticleWithDefaultScope.__elasticsearch__.create_index! force: true
+
+              MongoidArticleWithDefaultScope.delete_all
+
+              MongoidArticleWithDefaultScope.create! title: 'Test'
+              MongoidArticleWithDefaultScope.create! title: 'Testing Coding'
+              MongoidArticleWithDefaultScope.create! title: 'Coding'
+              MongoidArticleWithDefaultScope.create! title: 'Test legacy code', status: 'removed'
+
+              MongoidArticleWithDefaultScope.__elasticsearch__.refresh_index!
+              MongoidArticleWithDefaultScope.__elasticsearch__.client.cluster.health wait_for_status: 'yellow'
+            end
+
+            should "import only documents from the default scope" do
+              assert_equal 3, MongoidArticleWithDefaultScope.count
+
+              assert_equal 0, MongoidArticleWithDefaultScope.import
+
+              MongoidArticleWithDefaultScope.__elasticsearch__.refresh_index!
+              assert_equal 3, MongoidArticleWithDefaultScope.search('*').results.total
+            end
+
+            should "import only documents from a specific query combined with the default scope" do
+              assert_equal 3, MongoidArticleWithDefaultScope.count
+
+              assert_equal 0, MongoidArticleWithDefaultScope.import(query: -> { where(title: /^Test/) })
+
+              MongoidArticleWithDefaultScope.__elasticsearch__.refresh_index!
+              assert_equal 2, MongoidArticleWithDefaultScope.search('*').results.total
+            end
+          end
         end
 
       end

data/test/test_helper.rb

@@ -23,7 +23,7 @@ require 'shoulda-context'
 require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
 
 require 'ansi'
-require 'oj'
+require 'oj' unless defined?(JRUBY_VERSION)
 
 require 'active_model'
 

data/test/unit/adapter_mongoid_test.rb

@@ -98,7 +98,64 @@ class Elasticsearch::Model::AdapterMongoidTest < Test::Unit::TestCase
           assert_equal @transform.call(model), { index: { _id: "1", data: {} } }
         end
       end
-    end
 
+      should "limit the relation to a specific scope" do
+        relation = mock()
+        relation.stubs(:no_timeout).returns(relation)
+        relation.expects(:published).returns(relation)
+        relation.expects(:each_slice).returns([])
+        DummyClassForMongoid.expects(:all).returns(relation)
+
+        DummyClassForMongoid.__send__ :extend, Elasticsearch::Model::Adapter::Mongoid::Importing
+        DummyClassForMongoid.__find_in_batches(scope: :published) do; end
+      end
+
+      context "when limit the relation with proc" do
+        setup do
+          @query = Proc.new { where(color: "red") }
+        end
+        should "query with a specific criteria" do
+          relation = mock()
+          relation.stubs(:no_timeout).returns(relation)
+          relation.expects(:class_exec).returns(relation)
+          relation.expects(:each_slice).returns([])
+          DummyClassForMongoid.expects(:all).returns(relation)
+
+          DummyClassForMongoid.__find_in_batches(query: @query) do; end
+        end
+      end
+
+      context "when limit the relation with hash" do
+        setup do
+          @query = { color: "red" }
+        end
+        should "query with a specific criteria" do
+          relation = mock()
+          relation.stubs(:no_timeout).returns(relation)
+          relation.expects(:where).with(@query).returns(relation)
+          relation.expects(:each_slice).returns([])
+          DummyClassForMongoid.expects(:all).returns(relation)
+
+          DummyClassForMongoid.__find_in_batches(query: @query) do; end
+        end
+      end
+
+      should "preprocess the batch if option provided" do
+        class << DummyClassForMongoid
+          # Updates/transforms the batch while fetching it from the database
+          # (eg. with information from an external system)
+          #
+          def update_batch(batch)
+            batch.collect { |b| b.to_s + '!' }
+          end
+        end
+
+        DummyClassForMongoid.expects(:__find_in_batches).returns( [:a, :b] )
+
+        DummyClassForMongoid.__find_in_batches(preprocess: :update_batch) do |batch|
+          assert_same_elements ["a!", "b!"], batch
+        end
+      end
+    end
   end
 end

data/test/unit/importing_test.rb

@@ -146,6 +146,27 @@ class Elasticsearch::Model::ImportingTest < Test::Unit::TestCase
       end
     end
 
+    context "with the refresh option" do
+      should "refresh the index" do
+        DummyImportingModel.expects(:__find_in_batches).with do |options|
+          assert_equal 'bar', options[:foo]
+          assert_nil   options[:refresh]
+          true
+        end
+
+        DummyImportingModel.expects(:refresh_index!).with do |options|
+          assert_equal 'foo', options[:index]
+          true
+        end
+
+        DummyImportingModel.expects(:index_name).returns('foo')
+        DummyImportingModel.expects(:document_type).returns('foo')
+        DummyImportingModel.stubs(:index_exists?).returns(true)
+
+        DummyImportingModel.import refresh: true, foo: 'bar'
+      end
+    end
+
     should "allow passing a different index / type" do
       Elasticsearch::Model::Adapter.expects(:from_class)
                                    .with(DummyImportingModel)

data/test/unit/indexing_test.rb

@@ -149,7 +149,7 @@ class Elasticsearch::Model::IndexingTest < Test::Unit::TestCase
       should "update and return the index mappings" do
         DummyIndexingModel.mappings foo: 'boo'
         DummyIndexingModel.mappings bar: 'bam'
-        assert_equal( { dummy_indexing_model: { foo: "boo", bar: "bam", properties: {} } },
+        assert_equal( { _doc: { foo: "boo", bar: "bam", properties: {} } },
                       DummyIndexingModel.mappings.to_hash )
       end
 
@@ -176,6 +176,19 @@ class Elasticsearch::Model::IndexingTest < Test::Unit::TestCase
         end
       end
 
+      class ::DummyIndexingModelWithNoChanges
+        extend  Elasticsearch::Model::Indexing::ClassMethods
+        include Elasticsearch::Model::Indexing::InstanceMethods
+
+        def self.before_save(&block)
+          (@callbacks ||= {})[block.hash] = block
+        end
+
+        def changes_to_save
+          {}
+        end
+      end
+
       class ::DummyIndexingModelWithCallbacksAndCustomAsIndexedJson
         extend  Elasticsearch::Model::Indexing::ClassMethods
         include Elasticsearch::Model::Indexing::InstanceMethods
@@ -393,6 +406,26 @@ class Elasticsearch::Model::IndexingTest < Test::Unit::TestCase
         instance.update_document
       end
 
+      should "index instead of update when nothing was changed" do
+        client   = mock('client')
+        instance = ::DummyIndexingModelWithNoChanges.new
+
+        # Set the fake `changes` hash
+        instance.instance_variable_set(:@__changed_model_attributes, {})
+        # Overload as_indexed_json for running index
+        instance.expects(:as_indexed_json).returns({ 'foo' => 'BAR' })
+
+        client.expects(:index)
+        client.expects(:update).never
+
+        instance.expects(:client).returns(client)
+        instance.expects(:index_name).returns('foo')
+        instance.expects(:document_type).returns('bar')
+        instance.expects(:id).returns('1')
+
+        instance.update_document({})
+      end
+
       should "update only the specific attributes" do
         client   = mock('client')
         instance = ::DummyIndexingModelWithCallbacks.new
@@ -544,7 +577,7 @@ class Elasticsearch::Model::IndexingTest < Test::Unit::TestCase
         indices.expects(:create).with do |payload|
           assert_equal 'dummy_indexing_model_for_recreates', payload[:index]
           assert_equal 1,         payload[:body][:settings][:index][:number_of_shards]
-          assert_equal 'keyword', payload[:body][:mappings][:dummy_indexing_model_for_recreate][:properties][:foo][:analyzer]
+          assert_equal 'keyword', payload[:body][:mappings][:_doc][:properties][:foo][:analyzer]
           true
         end.returns({})
 

data/test/unit/naming_inheritance_test.rb

@@ -69,8 +69,8 @@ class Elasticsearch::Model::NamingInheritanceTest < Test::Unit::TestCase
     end
 
     should "return the default document_type" do
-      assert_equal "test_base", TestBase.document_type
-      assert_equal "test_base", TestBase.new.document_type
+      assert_equal "_doc", TestBase.document_type
+      assert_equal "_doc", TestBase.new.document_type
     end
 
     should "return the explicit document_type" do

data/test/unit/naming_test.rb

@@ -29,8 +29,8 @@ class Elasticsearch::Model::NamingTest < Test::Unit::TestCase
     end
 
     should "return the default document_type" do
-      assert_equal 'dummy_naming_model', DummyNamingModel.document_type
-      assert_equal 'dummy_naming_model', DummyNamingModel.new.document_type
+      assert_equal '_doc', DummyNamingModel.document_type
+      assert_equal '_doc', DummyNamingModel.new.document_type
     end
 
     should "set and return the index_name" do

data/test/unit/response_results_test.rb

@@ -27,5 +27,8 @@ class Elasticsearch::Model::ResultsTest < Test::Unit::TestCase
       assert_equal 'bar', @results.first.foo
     end
 
+    should "provide access to the raw response" do
+      assert_equal RESPONSE, @response.raw_response
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -336,6 +336,7 @@ files:
 - elasticsearch-model.gemspec
 - examples/activerecord_article.rb
 - examples/activerecord_associations.rb
+- examples/activerecord_custom_analyzer.rb
 - examples/activerecord_mapping_completion.rb
 - examples/activerecord_mapping_edge_ngram.rb
 - examples/couchbase_article.rb
@@ -432,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: ActiveModel/Record integrations for Elasticsearch.