elasticsearch-persistence 7.2.1 → 8.0.0

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
 

data/spec/repository/search_spec.rb

@@ -18,180 +18,54 @@
 require 'spec_helper'
 
 describe Elasticsearch::Persistence::Repository::Search do
-
   after do
     begin; repository.delete_index!; rescue; end
   end
 
-  describe '#search' do
+  let(:repository) do
+    DEFAULT_REPOSITORY
+  end
 
-    let(:repository) do
-      DEFAULT_REPOSITORY
+  describe '#search' do
+    before do
+      repository.save({ name: 'user' }, refresh: true)
     end
 
-    context 'when the repository does not have a type set' do
-
-      before do
-        repository.save({ name: 'user' }, refresh: true)
-      end
-
-      context 'when a query definition is provided as a hash' do
-
-        it 'uses the default document type' do
-          expect(repository.search({ query: { match: { name: 'user' } } }).first).to eq('name' => 'user')
-        end
-      end
-
-      context 'when a query definition is provided as a string' do
-
-        it 'uses the default document type' do
-          expect(repository.search('user').first).to eq('name' => 'user')
-        end
-      end
-
-      context 'when the query definition is neither a String nor a Hash' do
-
-        it 'raises an ArgumentError' do
-          expect {
-            repository.search(1)
-          }.to raise_exception(ArgumentError)
-        end
-      end
-
-      context 'when options are provided' do
-
-        context 'when a query definition is provided as a hash' do
-
-          it 'uses the default document type' do
-            expect(repository.search({ query: { match: { name: 'user' } } }, type: 'other').first).to be_nil
-          end
-        end
-
-        context 'when a query definition is provided as a string' do
-
-          it 'uses the default document type' do
-            expect(repository.search('user', type: 'other').first).to be_nil
-          end
-        end
-
-        context 'when the query definition is neither a String nor a Hash' do
-
-          it 'raises an ArgumentError' do
-            expect {
-              repository.search(1)
-            }.to raise_exception(ArgumentError)
-          end
-        end
+    context 'when a query definition is provided as a hash' do
+      it 'searches' do
+        expect(repository.search({ query: { match: { name: 'user' } } }).first).to eq('name' => 'user')
       end
     end
 
-    context 'when the repository does have a type set' do
-
-      let(:repository) do
-        MyTestRepository.new(document_type: 'other_note')
-      end
-
-      before do
-        repository.save({ name: 'user' }, refresh: true)
+    context 'when a query definition is provided as a string' do
+      it 'searches' do
+        expect(repository.search('user').first).to eq('name' => 'user')
       end
+    end
 
-      context 'when options are provided' do
-
-        context 'when a query definition is provided as a hash' do
-
-          it 'uses the options' do
-            expect(repository.search({ query: { match: { name: 'user' } } }, type: 'other').first).to be_nil
-          end
-        end
-
-        context 'when a query definition is provided as a string' do
-
-          it 'uses the options' do
-            expect(repository.search('user', type: 'other').first).to be_nil
-          end
-        end
-
-        context 'when the query definition is neither a String nor a Hash' do
-
-          it 'raises an ArgumentError' do
-            expect {
-              repository.search(1)
-            }.to raise_exception(ArgumentError)
-          end
-        end
+    context 'when the query definition is neither a String nor a Hash' do
+      it 'raises an ArgumentError' do
+        expect {
+          repository.search(1)
+        }.to raise_exception(ArgumentError)
       end
     end
   end
 
   describe '#count' do
-
-    context 'when the repository does not have a type set' do
-
-      let(:repository) do
-        DEFAULT_REPOSITORY
-      end
-
-      before do
-        repository.save({ name: 'user' }, refresh: true)
-      end
-
-      context 'when a query definition is provided as a hash' do
-
-        it 'uses the default document type' do
-          expect(repository.count({ query: { match: { name: 'user' } } })).to eq(1)
-        end
-      end
-
-      context 'when a query definition is provided as a string' do
-
-        it 'uses the default document type' do
-          expect(repository.count('user')).to eq(1)
-        end
-      end
-
-      context 'when options are provided' do
-
-        context 'when a query definition is provided as a hash' do
-
-          it 'uses the options' do
-            expect(repository.count({ query: { match: { name: 'user' } } }, type: 'other')).to eq(0)
-          end
-        end
-
-        context 'when a query definition is provided as a string' do
-
-          it 'uses the options' do
-            expect(repository.count('user', type: 'other')).to eq(0)
-          end
-        end
-      end
+    before do
+      repository.save({ name: 'usuario' }, refresh: true)
     end
 
-    context 'when the repository does have a type set' do
-
-      let(:repository) do
-        MyTestRepository.new(document_type: 'other_note')
+    context 'when a query definition is provided as a hash' do
+      it 'uses the default document type' do
+        expect(repository.count({ query: { match: { name: 'usuario' } } })).to eq(1)
       end
+    end
 
-      before do
-        repository.save({ name: 'user' }, refresh: true)
-      end
-
-      context 'when options are provided' do
-
-        context 'when a query definition is provided as a hash' do
-
-          it 'uses the options' do
-            expect(repository.count({ query: { match: { name: 'user' } } }, type: 'other')).to eq(0)
-          end
-        end
-
-        context 'when a query definition is provided as a string' do
-
-          it 'uses the options' do
-            expect(repository.count('user', type: 'other')).to eq(0)
-          end
-        end
+    context 'when a query definition is provided as a string' do
+      it 'uses the default document type' do
+        expect(repository.count('usuario')).to eq(1)
       end
     end
   end

data/spec/repository/store_spec.rb

@@ -18,7 +18,6 @@
 require 'spec_helper'
 
 describe Elasticsearch::Persistence::Repository::Store do
-
   let(:repository) do
     DEFAULT_REPOSITORY
   end
@@ -28,7 +27,6 @@ describe Elasticsearch::Persistence::Repository::Store do
   end
 
   describe '#save' do
-
     let(:document) do
       { a: 1 }
     end
@@ -42,7 +40,6 @@ describe Elasticsearch::Persistence::Repository::Store do
     end
 
     context 'when the repository defines a custom serialize method' do
-
       before do
         class OtherNoteRepository
           include Elasticsearch::Persistence::Repository
@@ -70,24 +67,9 @@ describe Elasticsearch::Persistence::Repository::Store do
         expect(repository.find(response['_id'])).to eq('b' => 1)
       end
     end
-
-    context 'when options are provided' do
-
-      let!(:response) do
-        repository.save(document, type: 'other_note')
-      end
-
-      it 'saves the document using the options' do
-        expect {
-          repository.find(response['_id'])
-        }.to raise_exception(Elasticsearch::Persistence::Repository::DocumentNotFound)
-        expect(repository.find(response['_id'], type: 'other_note')).to eq('a' => 1)
-      end
-    end
   end
 
   describe '#update' do
-
     before(:all) do
       class Note
         def to_hash
@@ -103,15 +85,12 @@ describe Elasticsearch::Persistence::Repository::Store do
     end
 
     context 'when the document exists' do
-
       let!(:id) do
         repository.save(Note.new)['_id']
       end
 
       context 'when an id is provided' do
-
         context 'when a doc is specified in the options' do
-
           before do
             repository.update(id, doc: { text: 'testing_2' })
           end
@@ -122,7 +101,6 @@ describe Elasticsearch::Persistence::Repository::Store do
         end
 
         context 'when a script is specified in the options' do
-
           before do
             repository.update(id, script: { inline: 'ctx._source.views += 1' })
           end
@@ -133,7 +111,6 @@ describe Elasticsearch::Persistence::Repository::Store do
         end
 
         context 'when params are specified in the options' do
-
           before do
             repository.update(id, script: { inline: 'ctx._source.views += params.count',
                                             params: { count: 2 } })
@@ -145,7 +122,6 @@ describe Elasticsearch::Persistence::Repository::Store do
         end
 
         context 'when upsert is specified in the options' do
-
           before do
             repository.update(id, script: { inline: 'ctx._source.views += 1' },
                                   upsert: { text: 'testing_2' })
@@ -157,7 +133,6 @@ describe Elasticsearch::Persistence::Repository::Store do
         end
 
         context 'when doc_as_upsert is specified in the options' do
-
           before do
             repository.update(id, doc: { text: 'testing_2' },
                                   doc_as_upsert: true)
@@ -170,9 +145,7 @@ describe Elasticsearch::Persistence::Repository::Store do
       end
 
       context 'when a document is provided as the query criteria' do
-
         context 'when no options are provided' do
-
           before do
             repository.update(id: id, text: 'testing_2')
           end
@@ -183,9 +156,7 @@ describe Elasticsearch::Persistence::Repository::Store do
         end
 
         context 'when options are provided' do
-
           context 'when a doc is specified in the options' do
-
             before do
               repository.update({ id: id, text: 'testing' }, doc: { text: 'testing_2' })
             end
@@ -196,10 +167,11 @@ describe Elasticsearch::Persistence::Repository::Store do
           end
 
           context 'when a script is specified in the options' do
-
             before do
-              repository.update({ id: id, text: 'testing' },
-                                script: { inline: 'ctx._source.views += 1' })
+              repository.update(
+                { id: id, text: 'testing' },
+                script: { inline: 'ctx._source.views += 1' }
+              )
             end
 
             it 'updates using the id and script from the options' do
@@ -208,7 +180,6 @@ describe Elasticsearch::Persistence::Repository::Store do
           end
 
           context 'when params are specified in the options' do
-
             before do
               repository.update({ id: id, text: 'testing' },
                                 script: { inline: 'ctx._source.views += params.count',
@@ -221,7 +192,6 @@ describe Elasticsearch::Persistence::Repository::Store do
           end
 
           context 'when upsert is specified in the options' do
-
             before do
               repository.update({ id: id, text: 'testing_2' },
                                 doc_as_upsert: true)
@@ -236,17 +206,14 @@ describe Elasticsearch::Persistence::Repository::Store do
     end
 
     context 'when the document does not exist' do
-
       context 'when an id is provided 'do
-
         it 'raises an exception' do
           expect {
             repository.update(1, doc: { text: 'testing_2' })
-          }.to raise_exception(Elasticsearch::Transport::Transport::Errors::NotFound)
+          }.to raise_exception(Elastic::Transport::Transport::Errors::NotFound)
         end
 
         context 'when upsert is provided' do
-
           before do
             repository.update(1, doc: { text: 'testing' }, doc_as_upsert: true)
           end
@@ -258,15 +225,13 @@ describe Elasticsearch::Persistence::Repository::Store do
       end
 
       context 'when a document is provided' do
-
         it 'raises an exception' do
           expect {
             repository.update(id: 1, text: 'testing_2')
-          }.to raise_exception(Elasticsearch::Transport::Transport::Errors::NotFound)
+          }.to raise_exception(Elastic::Transport::Transport::Errors::NotFound)
         end
 
         context 'when upsert is provided' do
-
           before do
             repository.update({ id: 1, text: 'testing' }, doc_as_upsert: true)
           end
@@ -280,7 +245,6 @@ describe Elasticsearch::Persistence::Repository::Store do
   end
 
   describe '#delete' do
-
     before(:all) do
       class Note
         def to_hash
@@ -296,13 +260,11 @@ describe Elasticsearch::Persistence::Repository::Store do
     end
 
     context 'when the document exists' do
-
       let!(:id) do
         repository.save(Note.new)['_id']
       end
 
       context 'an id is provided' do
-
         before do
           repository.delete(id)
         end
@@ -315,7 +277,6 @@ describe Elasticsearch::Persistence::Repository::Store do
       end
 
       context 'when a document is provided' do
-
         before do
           repository.delete(id: id, text: 'testing')
         end
@@ -329,15 +290,14 @@ describe Elasticsearch::Persistence::Repository::Store do
     end
 
     context 'when the document does not exist' do
-
       before do
-        repository.create_index!(include_type_name: true)
+        repository.create_index!
       end
 
       it 'raises an exception' do
         expect {
           repository.delete(1)
-        }.to raise_exception(Elasticsearch::Transport::Transport::Errors::NotFound)
+        }.to raise_exception(Elastic::Transport::Transport::Errors::NotFound)
       end
     end
   end