elasticsearch-persistence 7.2.1 → 8.0.0.pre

data/spec/repository_spec.rb

@@ -18,9 +18,7 @@
 require 'spec_helper'
 
 describe Elasticsearch::Persistence::Repository do
-
   describe '#create' do
-
     before(:all) do
       class RepositoryWithoutDSL
         include Elasticsearch::Persistence::Repository
@@ -37,21 +35,9 @@ describe Elasticsearch::Persistence::Repository do
       expect(RepositoryWithoutDSL.create).to be_a(RepositoryWithoutDSL)
     end
 
-    context 'when options are provided' do
-
-      let(:repository) do
-        RepositoryWithoutDSL.create(document_type: 'note')
-      end
-
-      it 'sets the options on the instance' do
-        expect(repository.document_type).to eq('note')
-      end
-    end
-
     context 'when a block is passed' do
-
       let(:repository) do
-        RepositoryWithoutDSL.create(document_type: 'note') do
+        RepositoryWithoutDSL.create do
           mapping dynamic: 'strict' do
             indexes :foo
           end
@@ -59,13 +45,12 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       it 'executes the block on the instance' do
-        expect(repository.mapping.to_hash).to eq(note: { dynamic: 'strict', properties: { foo: { type: 'text' } } })
+        expect(repository.mapping.to_hash).to eq({ dynamic: 'strict', properties: { foo: { type: 'text' } } })
       end
 
       context 'when options are provided in the args and set in the block' do
-
         let(:repository) do
-          RepositoryWithoutDSL.create(mapping: double('mapping', to_hash: {}), document_type: 'note') do
+          RepositoryWithoutDSL.create(mapping: double('mapping', to_hash: {})) do
             mapping dynamic: 'strict' do
               indexes :foo
             end
@@ -80,7 +65,6 @@ describe Elasticsearch::Persistence::Repository do
   end
 
   describe '#initialize' do
-
     before(:all) do
       class RepositoryWithoutDSL
         include Elasticsearch::Persistence::Repository
@@ -98,7 +82,6 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     context 'when options are not provided' do
-
       let(:repository) do
         RepositoryWithoutDSL.new
       end
@@ -118,23 +101,18 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     context 'when options are provided' do
-
       let(:client) do
         Elasticsearch::Client.new
       end
 
       let(:repository) do
-        RepositoryWithoutDSL.new(client: client, document_type: 'user', index_name: 'users', klass: Array)
+        RepositoryWithoutDSL.new(client: client, index_name: 'users', klass: Array)
       end
 
       it 'sets the client' do
         expect(repository.client).to be(client)
       end
 
-      it 'sets document type' do
-        expect(repository.document_type).to eq('user')
-      end
-
       it 'sets index name' do
         expect(repository.index_name).to eq('users')
       end
@@ -146,13 +124,11 @@ describe Elasticsearch::Persistence::Repository do
   end
 
   context 'when the DSL module is included' do
-
     before(:all) do
       class RepositoryWithDSL
         include Elasticsearch::Persistence::Repository
         include Elasticsearch::Persistence::Repository::DSL
 
-        document_type 'note'
         index_name 'notes_repo'
         klass Hash
         client DEFAULT_CLIENT
@@ -179,7 +155,6 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     context '#client' do
-
       it 'allows the value to be set only once on the class' do
         RepositoryWithDSL.client(double('client', class: 'other_client'))
         expect(RepositoryWithDSL.client).to be(DEFAULT_CLIENT)
@@ -199,7 +174,6 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     context '#klass' do
-
       it 'allows the value to be set only once on the class' do
         RepositoryWithDSL.klass(Array)
         expect(RepositoryWithDSL.klass).to eq(Hash)
@@ -229,28 +203,7 @@ describe Elasticsearch::Persistence::Repository do
       end
     end
 
-    context '#document_type' do
-
-      it 'allows the value to be set only once on the class' do
-        RepositoryWithDSL.document_type('other_note')
-        expect(RepositoryWithDSL.document_type).to eq('note')
-      end
-
-      it 'sets the value at the class level' do
-        expect(RepositoryWithDSL.document_type).to eq('note')
-      end
-
-      it 'sets the value as the default at the instance level' do
-        expect(RepositoryWithDSL.new.document_type).to eq('note')
-      end
-
-      it 'allows the value to be overridden with options on the instance' do
-        expect(RepositoryWithDSL.new(document_type: 'other_note').document_type).to eq('other_note')
-      end
-    end
-
     context '#index_name' do
-
       it 'allows the value to be set only once on the class' do
         RepositoryWithDSL.index_name('other_name')
         expect(RepositoryWithDSL.index_name).to eq('notes_repo')
@@ -270,16 +223,14 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     describe '#create_index!' do
-
       context 'when the method is called on an instance' do
-
         let(:repository) do
           RepositoryWithDSL.new
         end
 
         before do
           begin; repository.delete_index!; rescue; end
-          repository.create_index!(include_type_name: true)
+          repository.create_index!
         end
 
         it 'creates the index' do
@@ -288,7 +239,6 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       context 'when the method is called on the class' do
-
         it 'raises a NotImplementedError' do
           expect {
             RepositoryWithDSL.create_index!
@@ -298,9 +248,7 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     describe '#delete_index!' do
-
       context 'when the method is called on an instance' do
-
         let(:repository) do
           RepositoryWithDSL.new
         end
@@ -316,7 +264,6 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       context 'when the method is called on the class' do
-
         it 'raises a NotImplementedError' do
           expect {
             RepositoryWithDSL.delete_index!
@@ -326,15 +273,13 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     describe '#refresh_index!' do
-
       context 'when the method is called on an instance' do
-
         let(:repository) do
           RepositoryWithDSL.new
         end
 
         before do
-          repository.create_index!(include_type_name: true)
+          repository.create_index!
         end
 
         it 'refreshes the index' do
@@ -343,7 +288,6 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       context 'when the method is called on the class' do
-
         it 'raises a NotImplementedError' do
           expect {
             RepositoryWithDSL.refresh_index!
@@ -353,15 +297,13 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     describe '#index_exists?' do
-
       context 'when the method is called on an instance' do
-
         let(:repository) do
           RepositoryWithDSL.new
         end
 
         before do
-          repository.create_index!(include_type_name: true)
+          repository.create_index!
         end
 
         it 'determines if the index exists' do
@@ -377,7 +319,6 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       context 'when the method is called on the class' do
-
         it 'raises a NotImplementedError' do
           expect {
             RepositoryWithDSL.index_exists?
@@ -387,13 +328,15 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     describe '#mapping' do
-
       let(:expected_mapping) do
-        { note: { dynamic: 'strict',
-                  properties: { foo: { type: 'object',
-                                       properties: { bar: { type: 'text' } } },
-                                baz: { type: 'text' } }
-                }
+        {
+          dynamic: 'strict',
+          properties: {
+            foo: {
+              type: 'object',
+              properties: { bar: { type: 'text' } } },
+            baz: { type: 'text' }
+          }
         }
       end
 
@@ -410,24 +353,25 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       context 'when the instance has a different document type' do
-
         let(:expected_mapping) do
-          { other_note: { dynamic: 'strict',
-                          properties: { foo: { type: 'object',
-                                               properties: { bar: { type: 'text' } } },
-                                        baz: { type: 'text' } }
-                        }
+          {
+            other_note:
+              {
+                dynamic: 'strict',
+                properties: {
+                  foo: {
+                    type: 'object',
+                    properties: { bar: { type: 'text' } }
+                  },
+                  baz: { type: 'text' }
+                }
+              }
           }
         end
-
-        it 'updates the mapping to use the document type' do
-          expect(RepositoryWithDSL.new(document_type: 'other_note').mapping.to_hash).to eq(expected_mapping)
-        end
       end
     end
 
     describe '#settings' do
-
       it 'sets the value at the class level' do
         expect(RepositoryWithDSL.settings.to_hash).to eq(number_of_shards: 1, number_of_replicas: 0)
       end
@@ -443,7 +387,6 @@ describe Elasticsearch::Persistence::Repository do
   end
 
   context 'when the DSL module is not included' do
-
     before(:all) do
       class RepositoryWithoutDSL
         include Elasticsearch::Persistence::Repository
@@ -490,21 +433,8 @@ describe Elasticsearch::Persistence::Repository do
       end
     end
 
-    context '#document_type' do
-
-      it 'does not define the method at the class level' do
-        expect {
-          RepositoryWithoutDSL.document_type
-        }.to raise_exception(NoMethodError)
-      end
-
-      it 'allows the value to be overridden with options on the instance' do
-        expect(RepositoryWithoutDSL.new(document_type: 'notes').document_type).to eq('notes')
-      end
-    end
 
     context '#index_name' do
-
       it 'does not define the method at the class level' do
         expect {
           RepositoryWithoutDSL.index_name
@@ -521,7 +451,6 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     describe '#create_index!' do
-
       let(:repository) do
         RepositoryWithoutDSL.new(client: DEFAULT_CLIENT)
       end
@@ -540,37 +469,9 @@ describe Elasticsearch::Persistence::Repository do
         repository.create_index!
         expect(repository.index_exists?).to eq(true)
       end
-
-      context 'when the repository has a document type defined' do
-
-        let(:repository) do
-          RepositoryWithoutDSL.new(client: DEFAULT_CLIENT, document_type: 'mytype')
-        end
-
-        context 'when the server is version >= 7.0', if: server_version > '7.0' do
-
-          context 'when the include_type_name option is specified' do
-
-            it 'creates an index' do
-              repository.create_index!(include_type_name: true)
-              expect(repository.index_exists?).to eq(true)
-            end
-          end
-
-          context 'when the include_type_name option is not specified' do
-
-            it 'raises an error' do
-              expect {
-                repository.create_index!
-              }.to raise_exception(Elasticsearch::Transport::Transport::Errors::BadRequest)
-            end
-          end
-        end
-      end
     end
 
     describe '#delete_index!' do
-
       let(:repository) do
         RepositoryWithoutDSL.new(client: DEFAULT_CLIENT)
       end
@@ -582,14 +483,13 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       it 'deletes an index' do
-        repository.create_index!(include_type_name: true)
+        repository.create_index!
         repository.delete_index!
         expect(repository.index_exists?).to eq(false)
       end
     end
 
     describe '#refresh_index!' do
-
       let(:repository) do
         RepositoryWithoutDSL.new(client: DEFAULT_CLIENT)
       end
@@ -605,7 +505,7 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       it 'refreshes an index' do
-        repository.create_index!(include_type_name: true)
+        repository.create_index!
         expect(repository.refresh_index!['_shards']).to be_a(Hash)
       end
     end
@@ -627,7 +527,7 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       it 'returns whether the index exists' do
-        repository.create_index!(include_type_name: true)
+        repository.create_index!
         expect(repository.index_exists?).to be(true)
       end
     end
@@ -651,16 +551,20 @@ describe Elasticsearch::Persistence::Repository do
       context 'when a block is passed to the create method' do
 
         let(:expected_mapping) do
-          { note: { dynamic: 'strict',
-                    properties: { foo: { type: 'object',
-                                         properties: { bar: { type: 'text' } } },
-                                  baz: { type: 'text' } }
+          {
+            dynamic: 'strict',
+            properties: {
+              foo: {
+                type: 'object',
+                properties: { bar: { type: 'text' } }
+              },
+              baz: { type: 'text' }
             }
           }
         end
 
         let(:repository) do
-          RepositoryWithoutDSL.create(document_type: 'note') do
+          RepositoryWithoutDSL.create do
             mapping dynamic: 'strict' do
               indexes :foo do
                 indexes :bar
@@ -695,7 +599,6 @@ describe Elasticsearch::Persistence::Repository do
     end
 
     describe '#settings' do
-
       it 'does not define the method at the class level' do
         expect {
           RepositoryWithoutDSL.settings
@@ -711,9 +614,8 @@ describe Elasticsearch::Persistence::Repository do
       end
 
       context 'when a block is passed to the #create method' do
-
         let(:repository) do
-          RepositoryWithoutDSL.create(document_type: 'note') do
+          RepositoryWithoutDSL.create do
             settings number_of_shards: 1, number_of_replicas: 0
           end
         end
@@ -723,18 +625,21 @@ describe Elasticsearch::Persistence::Repository do
         end
 
         context 'when a mapping is set in the block as well' do
-
           let(:expected_mapping) do
-            { note: { dynamic: 'strict',
-                      properties: { foo: { type: 'object',
-                                           properties: { bar: { type: 'text' } } },
-                                    baz: { type: 'text' } }
-                    }
+            {
+              dynamic: 'strict',
+              properties: {
+                foo: {
+                  type: 'object',
+                  properties: { bar: { type: 'text' } }
+                },
+                baz: { type: 'text' }
+              }
             }
           end
 
           let(:repository) do
-            RepositoryWithoutDSL.create(document_type: 'note') do
+            RepositoryWithoutDSL.create do
               settings number_of_shards: 1, number_of_replicas: 0 do
                 mapping dynamic: 'strict' do
                   indexes :foo do

data/spec/spec_helper.rb

@@ -36,7 +36,8 @@ end
 #
 # @since 6.0.0
 DEFAULT_CLIENT = Elasticsearch::Client.new(host: ELASTICSEARCH_URL,
-                                           tracer: (ENV['QUIET'] ? nil : ::Logger.new(STDERR)))
+                                           tracer: (ENV['QUIET'] ? nil : ::Logger.new(STDERR)),
+                                           transport_options: { :ssl => { verify: false } })
 
 class MyTestRepository
   include Elasticsearch::Persistence::Repository
@@ -47,7 +48,7 @@ end
 # The default repository to be used by tests.
 #
 # @since 6.0.0
-DEFAULT_REPOSITORY = MyTestRepository.new(index_name: 'my_test_repository', document_type: 'test')
+DEFAULT_REPOSITORY = MyTestRepository.new(index_name: 'my_test_repository')
 
 # Get the Elasticsearch server version.
 #