elasticsearch-model 6.0.0 → 6.1.0

data/spec/support/app.rb

@@ -0,0 +1,21 @@
+require 'active_record'
+
+require 'support/app/question'
+require 'support/app/answer'
+require 'support/app/parent_and_child_searchable'
+require 'support/app/article_with_custom_serialization'
+require 'support/app/import_article'
+require 'support/app/namespaced_book'
+require 'support/app/article_for_pagination'
+require 'support/app/article_with_dynamic_index_name'
+require 'support/app/episode'
+require 'support/app/image'
+require 'support/app/series'
+require 'support/app/mongoid_article'
+require 'support/app/article'
+require 'support/app/searchable'
+require 'support/app/category'
+require 'support/app/author'
+require 'support/app/authorship'
+require 'support/app/comment'
+require 'support/app/post'

data/spec/support/app/answer.rb

@@ -0,0 +1,33 @@
+class Answer < ActiveRecord::Base
+  include Elasticsearch::Model
+
+  belongs_to :question
+
+  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 do
+    indexes :text
+    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_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

data/spec/support/app/article.rb

@@ -0,0 +1,22 @@
+class ::Article < ActiveRecord::Base
+  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'
+      indexes :body, type: 'text'
+      indexes :clicks, type: 'integer'
+      indexes :created_at, type: 'date'
+    end
+  end
+
+  def as_indexed_json(options = {})
+    attributes
+        .symbolize_keys
+        .slice(:title, :body, :clicks, :created_at)
+        .merge(suggest_title: title)
+  end
+end

data/spec/support/app/article_for_pagination.rb

@@ -0,0 +1,12 @@
+class ::ArticleForPagination < ActiveRecord::Base
+  include Elasticsearch::Model
+
+  scope :published, -> { where(published: true) }
+
+  settings index: { number_of_shards: 1, number_of_replicas: 0 } do
+    mapping do
+      indexes :title,      type: 'text', analyzer: 'snowball'
+      indexes :created_at, type: 'date'
+    end
+  end
+end

data/spec/support/app/article_with_custom_serialization.rb

@@ -0,0 +1,13 @@
+class ::ArticleWithCustomSerialization < ActiveRecord::Base
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+
+  mapping do
+    indexes :title
+  end
+
+  def as_indexed_json(options={})
+    # as_json(options.merge root: false).slice('title')
+    { title: self.title }
+  end
+end

data/spec/support/app/article_with_dynamic_index_name.rb

@@ -0,0 +1,15 @@
+class ::ArticleWithDynamicIndexName < ActiveRecord::Base
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+
+  def self.counter=(value)
+    @counter = 0
+  end
+
+  def self.counter
+    (@counter ||= 0) && @counter += 1
+  end
+
+  mapping    { indexes :title }
+  index_name { "articles-#{counter}" }
+end

data/spec/support/app/author.rb

@@ -0,0 +1,9 @@
+class Author < ActiveRecord::Base
+  has_many :authorships
+
+  after_update { self.authorships.each(&:touch) }
+
+  def full_name
+    [first_name, last_name].compact.join(' ')
+  end
+end

data/spec/support/app/authorship.rb

@@ -0,0 +1,4 @@
+class Authorship < ActiveRecord::Base
+  belongs_to :author
+  belongs_to :post, touch: true
+end

data/spec/support/app/category.rb

@@ -0,0 +1,3 @@
+class Category < ActiveRecord::Base
+  has_and_belongs_to_many :posts
+end

data/spec/support/app/comment.rb

@@ -0,0 +1,3 @@
+class Comment < ActiveRecord::Base
+  belongs_to :post, touch: true
+end

data/spec/support/app/episode.rb

@@ -0,0 +1,11 @@
+class Episode < ActiveRecord::Base
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+
+  settings index: {number_of_shards: 1, number_of_replicas: 0} do
+    mapping do
+      indexes :name, type: 'text', analyzer: 'snowball'
+      indexes :created_at, type: 'date'
+    end
+  end
+end

data/spec/support/app/image.rb

@@ -0,0 +1,19 @@
+class Image
+  include Mongoid::Document
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+
+  field :name, type: String
+  attr_accessible :name if respond_to? :attr_accessible
+
+  settings index: {number_of_shards: 1, number_of_replicas: 0} do
+    mapping do
+      indexes :name, type: 'text', analyzer: 'snowball'
+      indexes :created_at, type: 'date'
+    end
+  end
+
+  def as_indexed_json(options={})
+    as_json(except: [:_id])
+  end
+end

data/spec/support/app/import_article.rb

@@ -0,0 +1,12 @@
+class ImportArticle < ActiveRecord::Base
+  include Elasticsearch::Model
+
+  scope :popular, -> { where('views >= 5') }
+
+  mapping do
+    indexes :title,      type: 'text'
+    indexes :views,      type: 'integer'
+    indexes :numeric,    type: 'integer'
+    indexes :created_at, type: 'date'
+  end
+end

data/spec/support/app/mongoid_article.rb

@@ -0,0 +1,21 @@
+class ::MongoidArticle
+  include Mongoid::Document
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+
+  field :id, type: String
+  field :title, type: String
+  field :views, type: Integer
+  attr_accessible :title 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 :created_at, type: 'date'
+    end
+  end
+
+  def as_indexed_json(options={})
+    as_json(except: [:id, :_id])
+  end
+end

data/spec/support/app/namespaced_book.rb

@@ -0,0 +1,10 @@
+module MyNamespace
+  class Book < ActiveRecord::Base
+    include Elasticsearch::Model
+    include Elasticsearch::Model::Callbacks
+
+    document_type 'book'
+
+    mapping { indexes :title }
+  end
+end

data/spec/support/app/parent_and_child_searchable.rb

@@ -0,0 +1,24 @@
+module ParentChildSearchable
+  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
+    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 }
+  end
+
+  extend self
+end

data/spec/support/app/post.rb

@@ -0,0 +1,14 @@
+class Post < ActiveRecord::Base
+  include Searchable
+
+  has_and_belongs_to_many :categories, after_add:    [ lambda { |a,c| a.__elasticsearch__.index_document } ],
+                          after_remove: [ lambda { |a,c| a.__elasticsearch__.index_document } ]
+  has_many                :authorships
+  has_many                :authors, through: :authorships,
+                          after_add: [ lambda { |a,c| a.__elasticsearch__.index_document } ],
+                          after_remove: [ lambda { |a,c| a.__elasticsearch__.index_document } ]
+  has_many                :comments, after_add:    [ lambda { |a,c| a.__elasticsearch__.index_document } ],
+                          after_remove: [ lambda { |a,c| a.__elasticsearch__.index_document } ]
+
+  after_touch() { __elasticsearch__.index_document }
+end

data/spec/support/app/question.rb

@@ -0,0 +1,27 @@
+class Question < ActiveRecord::Base
+  include Elasticsearch::Model
+
+  has_many :answers, dependent: :destroy
+
+  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
+    indexes :text
+    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
+end

data/spec/support/app/searchable.rb

@@ -0,0 +1,48 @@
+module Searchable
+  extend ActiveSupport::Concern
+
+  included do
+    include Elasticsearch::Model
+    include Elasticsearch::Model::Callbacks
+
+    # Set up the mapping
+    #
+    settings index: { number_of_shards: 1, number_of_replicas: 0 } do
+      mapping do
+        indexes :title,      analyzer: 'snowball'
+        indexes :created_at, type: 'date'
+
+        indexes :authors do
+          indexes :first_name
+          indexes :last_name
+            indexes :full_name, type: 'text' do
+            indexes :raw, type: 'keyword'
+          end
+        end
+
+        indexes :categories, type: 'keyword'
+
+        indexes :comments, type: 'nested' do
+          indexes :text
+          indexes :author
+        end
+      end
+    end
+
+    # Customize the JSON serialization for Elasticsearch
+    #
+    def as_indexed_json(options={})
+      {
+          title: title,
+          text:  text,
+          categories: categories.map(&:title),
+          authors:    authors.as_json(methods: [:full_name], only: [:full_name, :first_name, :last_name]),
+          comments:   comments.as_json(only: [:text, :author])
+      }
+    end
+
+    # Update document in the index after touch
+    #
+    after_touch() { __elasticsearch__.index_document }
+  end
+end

data/spec/support/app/series.rb

@@ -0,0 +1,11 @@
+class Series < ActiveRecord::Base
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+
+  settings index: {number_of_shards: 1, number_of_replicas: 0} do
+    mapping do
+      indexes :name, type: 'text', analyzer: 'snowball'
+      indexes :created_at, type: 'date'
+    end
+  end
+end

data/spec/support/model.json

@@ -0,0 +1 @@
+{ "laz": "qux" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -366,6 +366,8 @@ files:
 - lib/elasticsearch/model/response/aggregations.rb
 - lib/elasticsearch/model/response/base.rb
 - lib/elasticsearch/model/response/pagination.rb
+- lib/elasticsearch/model/response/pagination/kaminari.rb
+- lib/elasticsearch/model/response/pagination/will_paginate.rb
 - lib/elasticsearch/model/response/records.rb
 - lib/elasticsearch/model/response/result.rb
 - lib/elasticsearch/model/response/results.rb
@@ -373,45 +375,66 @@ files:
 - lib/elasticsearch/model/searching.rb
 - lib/elasticsearch/model/serializing.rb
 - lib/elasticsearch/model/version.rb
-- test/integration/active_record_associations_parent_child_test.rb
-- test/integration/active_record_associations_test.rb
-- test/integration/active_record_basic_test.rb
-- test/integration/active_record_custom_serialization_test.rb
-- test/integration/active_record_import_test.rb
-- test/integration/active_record_namespaced_model_test.rb
-- test/integration/active_record_pagination_test.rb
-- test/integration/dynamic_index_name_test.rb
-- test/integration/mongoid_basic_test.rb
-- test/integration/multiple_models_test.rb
-- test/support/model.json
-- test/support/model.yml
-- test/test_helper.rb
-- test/unit/adapter_active_record_test.rb
-- test/unit/adapter_default_test.rb
-- test/unit/adapter_mongoid_test.rb
-- test/unit/adapter_multiple_test.rb
-- test/unit/adapter_test.rb
-- test/unit/callbacks_test.rb
-- test/unit/client_test.rb
-- test/unit/hash_wrapper_test.rb
-- test/unit/importing_test.rb
-- test/unit/indexing_test.rb
-- test/unit/module_test.rb
-- test/unit/multimodel_test.rb
-- test/unit/naming_inheritance_test.rb
-- test/unit/naming_test.rb
-- test/unit/proxy_test.rb
-- test/unit/response_aggregations_test.rb
-- test/unit/response_base_test.rb
-- test/unit/response_pagination_kaminari_test.rb
-- test/unit/response_pagination_will_paginate_test.rb
-- test/unit/response_records_test.rb
-- test/unit/response_result_test.rb
-- test/unit/response_results_test.rb
-- test/unit/response_test.rb
-- test/unit/searching_search_request_test.rb
-- test/unit/searching_test.rb
-- test/unit/serializing_test.rb
+- spec/elasticsearch/model/adapter_spec.rb
+- spec/elasticsearch/model/adapters/active_record/associations_spec.rb
+- spec/elasticsearch/model/adapters/active_record/basic_spec.rb
+- spec/elasticsearch/model/adapters/active_record/dynamic_index_name_spec.rb
+- spec/elasticsearch/model/adapters/active_record/import_spec.rb
+- spec/elasticsearch/model/adapters/active_record/multi_model_spec.rb
+- spec/elasticsearch/model/adapters/active_record/namespaced_model_spec.rb
+- spec/elasticsearch/model/adapters/active_record/pagination_spec.rb
+- spec/elasticsearch/model/adapters/active_record/parent_child_spec.rb
+- spec/elasticsearch/model/adapters/active_record/serialization_spec.rb
+- spec/elasticsearch/model/adapters/active_record_spec.rb
+- spec/elasticsearch/model/adapters/default_spec.rb
+- spec/elasticsearch/model/adapters/mongoid/basic_spec.rb
+- spec/elasticsearch/model/adapters/mongoid/multi_model_spec.rb
+- spec/elasticsearch/model/adapters/mongoid_spec.rb
+- spec/elasticsearch/model/adapters/multiple_spec.rb
+- spec/elasticsearch/model/callbacks_spec.rb
+- spec/elasticsearch/model/client_spec.rb
+- spec/elasticsearch/model/hash_wrapper_spec.rb
+- spec/elasticsearch/model/importing_spec.rb
+- spec/elasticsearch/model/indexing_spec.rb
+- spec/elasticsearch/model/module_spec.rb
+- spec/elasticsearch/model/multimodel_spec.rb
+- spec/elasticsearch/model/naming_inheritance_spec.rb
+- spec/elasticsearch/model/naming_spec.rb
+- spec/elasticsearch/model/proxy_spec.rb
+- spec/elasticsearch/model/response/aggregations_spec.rb
+- spec/elasticsearch/model/response/base_spec.rb
+- spec/elasticsearch/model/response/pagination/kaminari_spec.rb
+- spec/elasticsearch/model/response/pagination/will_paginate_spec.rb
+- spec/elasticsearch/model/response/records_spec.rb
+- spec/elasticsearch/model/response/response_spec.rb
+- spec/elasticsearch/model/response/result_spec.rb
+- spec/elasticsearch/model/response/results_spec.rb
+- spec/elasticsearch/model/searching_search_request_spec.rb
+- spec/elasticsearch/model/searching_spec.rb
+- spec/elasticsearch/model/serializing_spec.rb
+- spec/spec_helper.rb
+- spec/support/app.rb
+- spec/support/app/answer.rb
+- spec/support/app/article.rb
+- spec/support/app/article_for_pagination.rb
+- spec/support/app/article_with_custom_serialization.rb
+- spec/support/app/article_with_dynamic_index_name.rb
+- spec/support/app/author.rb
+- spec/support/app/authorship.rb
+- spec/support/app/category.rb
+- spec/support/app/comment.rb
+- spec/support/app/episode.rb
+- spec/support/app/image.rb
+- spec/support/app/import_article.rb
+- spec/support/app/mongoid_article.rb
+- spec/support/app/namespaced_book.rb
+- spec/support/app/parent_and_child_searchable.rb
+- spec/support/app/post.rb
+- spec/support/app/question.rb
+- spec/support/app/searchable.rb
+- spec/support/app/series.rb
+- spec/support/model.json
+- spec/support/model.yml
 homepage: https://github.com/elasticsearch/elasticsearch-rails/
 licenses:
 - Apache 2
@@ -432,48 +455,68 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: ActiveModel/Record integrations for Elasticsearch.
 test_files:
-- test/integration/active_record_associations_parent_child_test.rb
-- test/integration/active_record_associations_test.rb
-- test/integration/active_record_basic_test.rb
-- test/integration/active_record_custom_serialization_test.rb
-- test/integration/active_record_import_test.rb
-- test/integration/active_record_namespaced_model_test.rb
-- test/integration/active_record_pagination_test.rb
-- test/integration/dynamic_index_name_test.rb
-- test/integration/mongoid_basic_test.rb
-- test/integration/multiple_models_test.rb
-- test/support/model.json
-- test/support/model.yml
-- test/test_helper.rb
-- test/unit/adapter_active_record_test.rb
-- test/unit/adapter_default_test.rb
-- test/unit/adapter_mongoid_test.rb
-- test/unit/adapter_multiple_test.rb
-- test/unit/adapter_test.rb
-- test/unit/callbacks_test.rb
-- test/unit/client_test.rb
-- test/unit/hash_wrapper_test.rb
-- test/unit/importing_test.rb
-- test/unit/indexing_test.rb
-- test/unit/module_test.rb
-- test/unit/multimodel_test.rb
-- test/unit/naming_inheritance_test.rb
-- test/unit/naming_test.rb
-- test/unit/proxy_test.rb
-- test/unit/response_aggregations_test.rb
-- test/unit/response_base_test.rb
-- test/unit/response_pagination_kaminari_test.rb
-- test/unit/response_pagination_will_paginate_test.rb
-- test/unit/response_records_test.rb
-- test/unit/response_result_test.rb
-- test/unit/response_results_test.rb
-- test/unit/response_test.rb
-- test/unit/searching_search_request_test.rb
-- test/unit/searching_test.rb
-- test/unit/serializing_test.rb
+- spec/elasticsearch/model/adapter_spec.rb
+- spec/elasticsearch/model/adapters/active_record/associations_spec.rb
+- spec/elasticsearch/model/adapters/active_record/basic_spec.rb
+- spec/elasticsearch/model/adapters/active_record/dynamic_index_name_spec.rb
+- spec/elasticsearch/model/adapters/active_record/import_spec.rb
+- spec/elasticsearch/model/adapters/active_record/multi_model_spec.rb
+- spec/elasticsearch/model/adapters/active_record/namespaced_model_spec.rb
+- spec/elasticsearch/model/adapters/active_record/pagination_spec.rb
+- spec/elasticsearch/model/adapters/active_record/parent_child_spec.rb
+- spec/elasticsearch/model/adapters/active_record/serialization_spec.rb
+- spec/elasticsearch/model/adapters/active_record_spec.rb
+- spec/elasticsearch/model/adapters/default_spec.rb
+- spec/elasticsearch/model/adapters/mongoid/basic_spec.rb
+- spec/elasticsearch/model/adapters/mongoid/multi_model_spec.rb
+- spec/elasticsearch/model/adapters/mongoid_spec.rb
+- spec/elasticsearch/model/adapters/multiple_spec.rb
+- spec/elasticsearch/model/callbacks_spec.rb
+- spec/elasticsearch/model/client_spec.rb
+- spec/elasticsearch/model/hash_wrapper_spec.rb
+- spec/elasticsearch/model/importing_spec.rb
+- spec/elasticsearch/model/indexing_spec.rb
+- spec/elasticsearch/model/module_spec.rb
+- spec/elasticsearch/model/multimodel_spec.rb
+- spec/elasticsearch/model/naming_inheritance_spec.rb
+- spec/elasticsearch/model/naming_spec.rb
+- spec/elasticsearch/model/proxy_spec.rb
+- spec/elasticsearch/model/response/aggregations_spec.rb
+- spec/elasticsearch/model/response/base_spec.rb
+- spec/elasticsearch/model/response/pagination/kaminari_spec.rb
+- spec/elasticsearch/model/response/pagination/will_paginate_spec.rb
+- spec/elasticsearch/model/response/records_spec.rb
+- spec/elasticsearch/model/response/response_spec.rb
+- spec/elasticsearch/model/response/result_spec.rb
+- spec/elasticsearch/model/response/results_spec.rb
+- spec/elasticsearch/model/searching_search_request_spec.rb
+- spec/elasticsearch/model/searching_spec.rb
+- spec/elasticsearch/model/serializing_spec.rb
+- spec/spec_helper.rb
+- spec/support/app.rb
+- spec/support/app/answer.rb
+- spec/support/app/article.rb
+- spec/support/app/article_for_pagination.rb
+- spec/support/app/article_with_custom_serialization.rb
+- spec/support/app/article_with_dynamic_index_name.rb
+- spec/support/app/author.rb
+- spec/support/app/authorship.rb
+- spec/support/app/category.rb
+- spec/support/app/comment.rb
+- spec/support/app/episode.rb
+- spec/support/app/image.rb
+- spec/support/app/import_article.rb
+- spec/support/app/mongoid_article.rb
+- spec/support/app/namespaced_book.rb
+- spec/support/app/parent_and_child_searchable.rb
+- spec/support/app/post.rb
+- spec/support/app/question.rb
+- spec/support/app/searchable.rb
+- spec/support/app/series.rb
+- spec/support/model.json
+- spec/support/model.yml