elasticsearch-model 5.1.0 → 6.1.1

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/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: 5.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -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
@@ -346,6 +347,7 @@ files:
 - gemfiles/3.0.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/6.0.gemfile
 - lib/elasticsearch/model.rb
 - lib/elasticsearch/model/adapter.rb
 - lib/elasticsearch/model/adapters/active_record.rb
@@ -365,6 +367,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
@@ -372,45 +376,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
@@ -424,55 +449,75 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 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

data/test/integration/active_record_associations_parent_child_test.rb

@@ -1,147 +0,0 @@
-require 'test_helper'
-require 'active_record'
-
-# Needed for ActiveRecord 3.x ?
-ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
-
-::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
-
-class Question < ActiveRecord::Base
-  include Elasticsearch::Model
-
-  has_many :answers, dependent: :destroy
-
-  index_name 'questions_and_answers'
-
-  mapping do
-    indexes :title
-    indexes :text
-    indexes :author
-  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
-
-class Answer < ActiveRecord::Base
-  include Elasticsearch::Model
-
-  belongs_to :question
-
-  index_name 'questions_and_answers'
-
-  mapping _parent: { type: 'question' }, _routing: { required: true } 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
-end
-
-module ParentChildSearchable
-  INDEX_NAME = 'questions_and_answers'
-
-  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
-
-    client.indices.create index: INDEX_NAME,
-                          body: {
-                            settings: settings.to_hash,
-                            mappings: mappings.to_hash }
-  end
-
-  extend self
-end
-
-module Elasticsearch
-  module Model
-    class ActiveRecordAssociationsParentChildIntegrationTest < Elasticsearch::Test::IntegrationTestCase
-
-      context "ActiveRecord associations with parent/child modelling" do
-        setup do
-          ActiveRecord::Schema.define(version: 1) do
-            create_table :questions do |t|
-              t.string     :title
-              t.text       :text
-              t.string     :author
-              t.timestamps null: false
-            end
-
-            create_table :answers do |t|
-              t.text       :text
-              t.string     :author
-              t.references :question
-              t.timestamps null: false
-            end
-
-            add_index(:answers, :question_id) unless index_exists?(:answers, :question_id)
-          end
-
-          Question.delete_all
-          ParentChildSearchable.create_index! force: true
-
-          q_1 = Question.create! title: 'First Question',  author: 'John'
-          q_2 = Question.create! title: 'Second Question', author: 'Jody'
-
-          q_1.answers.create! text: 'Lorem Ipsum', author: 'Adam'
-          q_1.answers.create! text: 'Dolor Sit',   author: 'Ryan'
-
-          q_2.answers.create! text: 'Amet Et', author: 'John'
-
-          Question.__elasticsearch__.refresh_index!
-        end
-
-        should "find questions by matching answers" do
-          response = Question.search(
-                       { 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'
-                                }
-                              }
-                            }
-                         }
-                       })
-
-          assert_same_elements ['Adam', 'Ryan'], response.records.map(&:author)
-        end
-
-        should "delete answers when the question is deleted" do
-          Question.where(title: 'First Question').each(&:destroy)
-          Question.__elasticsearch__.refresh_index!
-
-          response = Answer.search query: { match_all: {} }
-
-          assert_equal 1, response.results.total
-        end
-      end
-
-    end
-  end
-end