elasticsearch-persistence 7.2.1 → 8.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da08635ca213d32288a7bf6eafadd4e5c90495ffa647938ed0932c815f1b36f4
-  data.tar.gz: 64eecce8b4e1990692812a07f7668a73cecb0e0c6e7d0b10122abb544f85b9af
+  metadata.gz: 52529282eff2e19449adc41cf88e72665a81eb448335bea3422e5e1e7581eee4
+  data.tar.gz: 28497c53094e055fced862f88d14f3e927ff36ffdccb26434dd6788a1d3dc40a
 SHA512:
-  metadata.gz: e2a90150247fb70ca0398d517d9b8276b11fc6b69d1906b0862f62b6171cfd7ed99f9b598633faf531f6ebfbf89d8128dbc2333bd743e20fb99c28882f3703ec
-  data.tar.gz: cc74ca2a8ee2cc7e2e3ab3717089258bcc6096fda78412c5af8a6f1441c3ae682a2f93bb154ffe15751b115724894944736f2b08c3121b9de72a6d9c1e7f9378
+  metadata.gz: 5bad96a3f1cfd9718c5421b235d085b1b40f7ddb5086a7e4e1202388383ea6a6818e005e3521d3cac8a498cc5509e2e4ce1c3195e28763eb1dd8eef12c7899f5
+  data.tar.gz: e97d49e8010f0f9e4bf184cb7fb4e76244247bb04893ab3cb60e164fa51527909a24eb417566ec5c561fb9665debe62b2c5cce16f8a50955355b6f4bf21b78ec

data/Gemfile

@@ -25,6 +25,7 @@ gem 'elasticsearch-model',
     require: false
 
 group :development, :testing do
+  gem 'debug' unless defined?(JRUBY_VERSION)
   gem 'pry-nav'
   gem 'rspec'
 end

data/README.md

@@ -6,7 +6,7 @@ Persistence layer for Ruby domain objects in Elasticsearch, using the Repository
 
 This library is compatible with Ruby 2.4 and higher.
 
-The library version numbers follow the Elasticsearch major versions. The `main` branch is compatible with the latest Elasticsearch stack stable release.
+The version numbers follow the Elasticsearch major versions. Currently the `main` branch is compatible with version `7.x` of the Elasticsearch stack. **We haven't tested and updated the code for Elasticsearch `8.0` yet**.
 
 | Rubygem       |   | Elasticsearch |
 |:-------------:|:-:| :-----------: |
@@ -14,6 +14,7 @@ The library version numbers follow the Elasticsearch major versions. The `main`
 | 2.x           | → | 2.x           |
 | 5.x           | → | 5.x           |
 | 6.x           | → | 6.x           |
+| 7.x           | → | 7.x           |
 | main          | → | 7.x           |
 
 ## Installation
@@ -236,7 +237,7 @@ You can also override the default configuration with options passed to the initi
 
 ```ruby
 client = Elasticsearch::Client.new(url: 'http://localhost:9250', log: true)
-client.transport.transport.logger.formatter = proc { |s, d, p, m| "\e[2m# #{m}\n\e[0m" }
+client.transport.logger.formatter = proc { |s, d, p, m| "\e[2m# #{m}\n\e[0m" }
 repository = NoteRepository.new(client: client, index_name: 'notes_development')
 
 repository.create_index!(force: true)
@@ -267,7 +268,7 @@ The repository uses the standard Elasticsearch [client](https://github.com/elast
 ```ruby
 client = Elasticsearch::Client.new(url: 'http://search.server.org')
 repository = NoteRepository.new(client: client)
-repository.client.transport.transport.logger = Logger.new(STDERR)
+repository.client.transport.logger = Logger.new(STDERR)
 repository.client
 # => Elasticsearch::Client
 

data/Rakefile

@@ -15,11 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
-desc "Run unit tests"
-task :default => 'test:unit'
-task :test    => 'test:unit'
+desc 'Run unit tests'
+task default: 'test:unit'
+task test: 'test:unit'
 
 # ----- Test tasks ------------------------------------------------------------
 
@@ -27,14 +27,15 @@ require 'rake/testtask'
 require 'rspec/core/rake_task'
 
 namespace :test do
-
   RSpec::Core::RakeTask.new(:spec)
 
   Rake::TestTask.new(:all) do |test|
     test.verbose = false
     test.warning = false
-    test.deps = [ :spec ]
+    test.deps = [:spec]
   end
+
+  task unit: :spec
 end
 
 namespace :bundle do
@@ -65,6 +66,6 @@ if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
       cane.style_measure = 120
     end
   rescue LoadError
-    warn "cane not available, quality task not provided."
+    warn 'cane not available, quality task not provided.'
   end
 end

data/elasticsearch-persistence.gemspec

@@ -16,52 +16,49 @@
 # under the License.
 
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'elasticsearch/persistence/version'
 
 Gem::Specification.new do |s|
-  s.name          = "elasticsearch-persistence"
+  s.name          = 'elasticsearch-persistence'
   s.version       = Elasticsearch::Persistence::VERSION
-  s.authors       = ["Karel Minarik"]
-  s.email         = ["karel.minarik@elasticsearch.org"]
-  s.description   = "Persistence layer for Ruby models and Elasticsearch."
-  s.summary       = "Persistence layer for Ruby models and Elasticsearch."
-  s.homepage      = "https://github.com/elasticsearch/elasticsearch-rails/"
-  s.license       = "Apache 2"
+  s.authors       = ['Elastic Client Library Maintainers']
+  s.email         = ['client-libs@elastic.co']
+  s.description   = 'Persistence layer for Ruby models and Elasticsearch.'
+  s.summary       = 'Persistence layer for Ruby models and Elasticsearch.'
+  s.homepage      = 'https://github.com/elasticsearch/elasticsearch-rails/'
+  s.license       = 'Apache 2'
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
-  s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
-  s.rdoc_options      = [ "--charset=UTF-8" ]
-
-  s.required_ruby_version = ">= 1.9.3"
-
-  s.add_dependency "elasticsearch",       '~> 7'
-  s.add_dependency "elasticsearch-model", '7.2.1'
-  s.add_dependency "activesupport",       '> 4'
-  s.add_dependency "activemodel",         '> 4'
-  s.add_dependency "hashie"
-
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rake", "~> 12"
+  s.require_paths = ['lib']
 
-  s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
+  s.extra_rdoc_files  = ['README.md', 'LICENSE.txt']
+  s.rdoc_options      = ['--charset=UTF-8']
 
-  s.add_development_dependency "rails", '> 4'
+  s.required_ruby_version = '>= 3'
 
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "shoulda-context"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "turn"
-  s.add_development_dependency "yard"
-  s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
-  s.add_development_dependency "pry"
+  s.add_dependency 'activemodel',         '> 4'
+  s.add_dependency 'activesupport',       '> 4'
+  s.add_dependency 'elasticsearch',       '~> 8'
+  s.add_dependency 'elasticsearch-model', '8.0.0.pre'
+  s.add_dependency 'hashie'
 
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "cane"
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'cane'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'oj' unless defined?(JRUBY_VERSION)
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rails', '> 4'
+  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'ruby-prof' unless defined?(JRUBY_VERSION)
+  s.add_development_dependency 'shoulda-context'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'turn'
+  s.add_development_dependency 'yard'
 end

data/examples/notes/application.rb

@@ -75,7 +75,6 @@ class NoteRepository
   client Elasticsearch::Client.new url: ENV['ELASTICSEARCH_URL'], log: true
 
   index_name :notes
-  document_type  :note
 
   mapping do
     indexes :text,       analyzer: 'snowball'

data/examples/notes/test.rb

@@ -90,7 +90,7 @@ class Elasticsearch::Persistence::ExampleApplicationTest < Test::Unit::TestCase
       app.settings.repository.client = Elasticsearch::Client.new \
         hosts: [{ host: 'localhost', port: ENV.fetch('TEST_CLUSTER_PORT', 9250)}],
         log: true
-      app.settings.repository.client.transport.transport.logger.formatter = proc { |s, d, p, m| "\e[2m#{m}\n\e[0m" }
+      app.settings.repository.client.transport.logger.formatter = proc { |s, d, p, m| "\e[2m#{m}\n\e[0m" }
       app.settings.repository.create_index! force: true
       app.settings.repository.client.cluster.health wait_for_status: 'yellow'
     end

data/lib/elasticsearch/persistence/repository/dsl.rb

@@ -23,7 +23,6 @@ module Elasticsearch
       #
       # @since 6.0.0
       module DSL
-
         def self.included(base)
           base.send(:extend, Elasticsearch::Model::Indexing::ClassMethods)
           base.send(:extend, ClassMethods)
@@ -34,19 +33,6 @@ module Elasticsearch
         #
         # @since 6.0.0
         module ClassMethods
-
-          # Get or set the class-level document type setting.
-          #
-          # @example
-          #   MyRepository.document_type
-          #
-          # @return [ String, Symbol ] _type The repository's document type.
-          #
-          # @since 6.0.0
-          def document_type(_type = nil)
-            @document_type ||= _type
-          end
-
           # Get or set the class-level index name setting.
           #
           # @example

data/lib/elasticsearch/persistence/repository/find.rb

@@ -64,7 +64,6 @@ module Elasticsearch
         #
         def exists?(id, options={})
           request = { index: index_name, id: id }
-          request[:type] = document_type if document_type
           client.exists(request.merge(options))
         end
 
@@ -84,10 +83,9 @@ module Elasticsearch
         #
         def __find_one(id, options={})
           request = { index: index_name, id: id }
-          request[:type] = document_type if document_type
           document = client.get(request.merge(options))
           deserialize(document)
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+        rescue Elastic::Transport::Transport::Errors::NotFound => e
           raise DocumentNotFound, e.message, caller
         end
 
@@ -95,7 +93,6 @@ module Elasticsearch
         #
         def __find_many(ids, options={})
           request = { index: index_name, body: { ids: ids } }
-          request[:type] = document_type if document_type
           documents = client.mget(request.merge(options))
           documents[DOCS].map do |document|
             deserialize(document) if document[FOUND]

data/lib/elasticsearch/persistence/repository/search.rb

@@ -60,8 +60,7 @@ module Elasticsearch
         # @return [Elasticsearch::Persistence::Repository::Response::Results]
         #
         def search(query_or_definition, options={})
-          request = { index: index_name,
-                      type: document_type }
+          request = { index: index_name }
           if query_or_definition.respond_to?(:to_hash)
             request[:body] = query_or_definition.to_hash
           elsif query_or_definition.is_a?(String)
@@ -98,8 +97,7 @@ module Elasticsearch
         #
         def count(query_or_definition=nil, options={})
           query_or_definition ||= { query: { match_all: {} } }
-          request = { index: index_name,
-                      type: document_type }
+          request = { index: index_name }
 
           if query_or_definition.respond_to?(:to_hash)
             request[:body] = query_or_definition.to_hash

data/lib/elasticsearch/persistence/repository/store.rb

@@ -27,7 +27,7 @@ module Elasticsearch
         #
         # @example
         #     repository.save(myobject)
-        #     => {"_index"=>"...", "_type"=>"...", "_id"=>"...", "_version"=>1, "created"=>true}
+        #     => {"_index"=>"...", "_id"=>"...", "_version"=>1, "created"=>true}
         #
         # @param [ Object ] document The document to save into Elasticsearch.
         # @param [ Hash ] options The save request options.
@@ -40,7 +40,6 @@ module Elasticsearch
           request = { index: index_name,
                       id: id,
                       body: serialized }
-          request[:type] = document_type if document_type
           client.index(request.merge(options))
         end
 
@@ -49,12 +48,12 @@ module Elasticsearch
         # @example Update the document with partial data
         #
         #     repository.update id: 1, title: 'UPDATED',  tags: []
-        #     # => {"_index"=>"...", "_type"=>"...", "_id"=>"1", "_version"=>2}
+        #     # => {"_index"=>"...", "_id"=>"1", "_version"=>2}
         #
         # @example Update the document with a script
         #
         #     repository.update 1, script: 'ctx._source.views += 1'
-        #     # => {"_index"=>"...", "_type"=>"...", "_id"=>"1", "_version"=>3}
+        #     # => {"_index"=>"...", "_id"=>"1", "_version"=>3}
         #
         # @param [ Object ] document_or_id The document to update or the id of the document to update.
         # @param [ Hash ] options The update request options.
@@ -65,7 +64,6 @@ module Elasticsearch
           if document_or_id.is_a?(String) || document_or_id.is_a?(Integer)
             id = document_or_id
             body = options
-            type = document_type
           else
             document = serialize(document_or_id)
             id = __extract_id_from_document(document)
@@ -74,9 +72,8 @@ module Elasticsearch
             else
               body = { doc: document }.merge(options)
             end
-            type = document.delete(:type) || document_type
           end
-          client.update(index: index_name, id: id, type: type, body: body)
+          client.update(index: index_name, id: id, body: body)
         end
 
         # Remove the serialized object or document with specified ID from Elasticsearch
@@ -84,7 +81,7 @@ module Elasticsearch
         # @example Remove the document with ID 1
         #
         #     repository.delete(1)
-        #     # => {"_index"=>"...", "_type"=>"...", "_id"=>"1", "_version"=>4}
+        #     # => {"_index"=>"...", "_id"=>"1", "_version"=>4}
         #
         # @param [ Object ] document_or_id The document to delete or the id of the document to delete.
         # @param [ Hash ] options The delete request options.
@@ -98,7 +95,7 @@ module Elasticsearch
             serialized = serialize(document_or_id)
             id = __get_id_from_document(serialized)
           end
-          client.delete({ index: index_name, type: document_type, id: id }.merge(options))
+          client.delete({ index: index_name, id: id }.merge(options))
         end
       end
     end

data/lib/elasticsearch/persistence/repository.rb

@@ -58,7 +58,6 @@ module Elasticsearch
         # @param [ Proc ] block A block to evaluate on the new repository instance.
         #
         # @option options [ Symbol, String ] :index_name The name of the index.
-        # @option options [ Symbol, String ] :document_type The type of documents persisted in this repository.
         # @option options [ Symbol, String ] :client The client used to handle requests to and from Elasticsearch.
         # @option options [ Symbol, String ] :klass The class used to instantiate an object when documents are
         #   deserialized. The default is nil, in which case the raw document will be returned as a Hash.
@@ -95,7 +94,6 @@ module Elasticsearch
       # @param [ Hash ] options The options to use.
       #
       # @option options [ Symbol, String ] :index_name The name of the index.
-      # @option options [ Symbol, String ] :document_type The type of documents persisted in this repository.
       # @option options [ Symbol, String ] :client The client used to handle requests to and from Elasticsearch.
       # @option options [ Symbol, String ] :klass The class used to instantiate an object when documents are
       #   deserialized. The default is nil, in which case the raw document will be returned as a Hash.
@@ -121,19 +119,6 @@ module Elasticsearch
                       Elasticsearch::Client.new
       end
 
-      # Get the document type used by the repository object.
-      #
-      # @example
-      #   repository.document_type
-      #
-      # @return [ String, Symbol ] The repository's document type.
-      #
-      # @since 6.0.0
-      def document_type
-        @document_type ||= @options[:document_type] ||
-                             __get_class_value(:document_type)
-      end
-
       # Get the index name used by the repository.
       #
       # @example
@@ -180,7 +165,6 @@ module Elasticsearch
       def mapping(*args)
         @memoized_mapping ||= @options[:mapping] || (begin
           if _mapping = __get_class_value(:mapping)
-            _mapping.instance_variable_set(:@type, document_type)
             _mapping
           end
         end) || (super && @mapping)
@@ -229,7 +213,7 @@ module Elasticsearch
       #
       # @since 6.0.0
       def inspect
-        "#<#{self.class}:0x#{object_id} index_name=#{index_name} document_type=#{document_type} klass=#{klass}>"
+        "#<#{self.class}:0x#{object_id} index_name=#{index_name} klass=#{klass}>"
       end
 
       private

data/lib/elasticsearch/persistence/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Persistence
-    VERSION = '7.2.1'
+    VERSION = '8.0.0.pre'.freeze
   end
 end

data/spec/repository/find_spec.rb

@@ -18,7 +18,6 @@
 require 'spec_helper'
 
 describe Elasticsearch::Persistence::Repository::Find do
-
   after do
     begin; repository.delete_index!; rescue; end
   end
@@ -28,9 +27,7 @@ describe Elasticsearch::Persistence::Repository::Find do
   end
 
   describe '#exists?' do
-
     context 'when the document exists' do
-
       let(:id) do
         repository.save(a: 1)['_id']
       end
@@ -41,30 +38,15 @@ describe Elasticsearch::Persistence::Repository::Find do
     end
 
     context 'when the document does not exist' do
-
       it 'returns false' do
         expect(repository.exists?('1')).to be(false)
       end
     end
-
-    context 'when options are provided' do
-
-      let(:id) do
-        repository.save(a: 1)['_id']
-      end
-
-      it 'applies the options' do
-        expect(repository.exists?(id, type: 'other_type')).to be(false)
-      end
-    end
   end
 
   describe '#find' do
-
     context 'when options are not provided' do
-
       context 'when a single id is provided' do
-
         let!(:id) do
           repository.save(a: 1)['_id']
         end
@@ -75,7 +57,6 @@ describe Elasticsearch::Persistence::Repository::Find do
       end
 
       context 'when an array of ids is provided' do
-
         let!(:ids) do
           3.times.collect do |i|
             repository.save(a: i)['_id']
@@ -83,28 +64,30 @@ describe Elasticsearch::Persistence::Repository::Find do
         end
 
         it 'retrieves the documents' do
-          expect(repository.find(ids)).to eq([{ 'a' =>0 },
-                                              { 'a' => 1 },
-                                              { 'a' => 2 }])
+          expect(repository.find(ids)).to eq([
+                                               { 'a' =>0 },
+                                               { 'a' => 1 },
+                                               { 'a' => 2 }
+                                             ])
         end
 
         context 'when some documents are found and some are not' do
-
           before do
             ids[1] = 22
             ids
           end
 
           it 'returns nil in the result list for the documents not found' do
-            expect(repository.find(ids)).to eq([{ 'a' =>0 },
+            expect(repository.find(ids)).to eq([
+                                                 { 'a' =>0 },
                                                  nil,
-                                                 { 'a' => 2 }])
+                                                 { 'a' => 2 }
+                                               ])
           end
         end
       end
 
       context 'when multiple ids are provided' do
-
         let!(:ids) do
           3.times.collect do |i|
             repository.save(a: i)['_id']
@@ -112,14 +95,15 @@ describe Elasticsearch::Persistence::Repository::Find do
         end
 
         it 'retrieves the documents' do
-          expect(repository.find(*ids)).to eq([{ 'a' =>0 },
-                                              { 'a' => 1 },
-                                              { 'a' => 2 }])
+          expect(repository.find(*ids)).to eq([
+                                                { 'a' =>0 },
+                                                { 'a' => 1 },
+                                                { 'a' => 2 }
+                                              ])
         end
       end
 
       context 'when the document cannot be found' do
-
         before do
           begin; repository.create_index!; rescue; end
         end
@@ -131,66 +115,5 @@ describe Elasticsearch::Persistence::Repository::Find do
         end
       end
     end
-
-    context 'when options are provided' do
-
-      context 'when a single id is passed' do
-
-        let!(:id) do
-          repository.save(a: 1)['_id']
-        end
-
-        it 'applies the options' do
-          expect {
-            repository.find(id, type: 'none')
-          }.to raise_exception(Elasticsearch::Persistence::Repository::DocumentNotFound)
-        end
-      end
-
-      context 'when an array of ids is passed' do
-
-        let!(:ids) do
-          3.times.collect do |i|
-            repository.save(a: i)['_id']
-          end
-        end
-
-        it 'applies the options' do
-          expect(repository.find(ids, type: 'none')).to eq([nil, nil, nil])
-        end
-      end
-
-      context 'when multiple ids are passed' do
-
-        let!(:ids) do
-          3.times.collect do |i|
-            repository.save(a: i)['_id']
-          end
-        end
-
-        it 'applies the options' do
-          expect(repository.find(*ids, type: 'none')).to eq([nil, nil, nil])
-        end
-      end
-    end
-
-    context 'when a document_type is defined on the class' do
-
-      let(:repository) do
-        MyTestRepository.new(document_type:'other_type', client: DEFAULT_CLIENT, index_name: 'test')
-      end
-
-      let!(:ids) do
-        3.times.collect do |i|
-          repository.save(a: i)['_id']
-        end
-      end
-
-      it 'uses the document type in the query' do
-        expect(repository.find(ids)).to eq([{ 'a' =>0 },
-                                            { 'a' => 1 },
-                                            { 'a' => 2 }])
-      end
-    end
   end
 end

data/spec/repository/response/results_spec.rb

@@ -43,23 +43,24 @@ describe Elasticsearch::Persistence::Repository::Response::Results do
     { "took" => 2,
       "timed_out" => false,
       "_shards" => {"total" => 5, "successful" => 5, "failed" => 0},
-      "hits" =>
-               { "total" => 2,
-                 "max_score" => 0.19,
-                 "hits" =>
-                           [{"_index" => "my_index",
-                             "_type" => "note",
-                             "_id" => "1",
-                             "_score" => 0.19,
-                             "_source" => {"id" => 1, "title" => "Test 1"}},
-
-                            {"_index" => "my_index",
-                             "_type" => "note",
-                             "_id" => "2",
-                             "_score" => 0.19,
-                             "_source" => {"id" => 2, "title" => "Test 2"}}
-                            ]
-               }
+      "hits" => {
+        "total" => 2,
+        "max_score" => 0.19,
+        "hits" => [
+          {
+            "_index" => "my_index",
+            "_id" => "1",
+            "_score" => 0.19,
+            "_source" => {"id" => 1, "title" => "Test 1"}
+          },
+          {
+            "_index" => "my_index",
+            "_id" => "2",
+            "_score" => 0.19,
+            "_source" => {"id" => 2, "title" => "Test 2"}
+          }
+        ]
+      }
     }
   end