opensearch-api 1.0.0 → 2.2.0

data/spec/opensearch/api/actions/indices/get_field_mapping_spec.rb

@@ -56,15 +56,4 @@ describe 'client.cluster#get_field_mapping' do
       expect(client_double.indices.get_field_mapping(index: 'foo', field: 'bam')).to eq({})
     end
   end
-
-  context 'when a type is specified' do
-
-    let(:url) do
-      'foo/_mapping/bar/field/bam'
-    end
-
-    it 'performs the request' do
-      expect(client_double.indices.get_field_mapping(index: 'foo', type: 'bar', field: 'bam')).to eq({})
-    end
-  end
 end

data/spec/opensearch/api/actions/indices/get_mapping_spec.rb

@@ -57,36 +57,25 @@ describe 'client.cluster#get_mapping' do
     end
   end
 
-  context 'when an index and type are specified' do
+  context 'when multiple indices are specified' do
 
     let(:url) do
-      'foo/_mapping/bar'
+      'foo,bar/_mapping'
     end
 
     it 'performs the request' do
-      expect(client_double.indices.get_mapping(index: 'foo', type: 'bar')).to eq({})
-    end
-  end
-
-  context 'when multiple indices and types are specified' do
-
-    let(:url) do
-      'foo,bar/_mapping/bam,baz'
-    end
-
-    it 'performs the request' do
-      expect(client_double.indices.get_mapping(index: ['foo', 'bar'], type: ['bam', 'baz'])).to eq({})
+      expect(client_double.indices.get_mapping(index: ['foo', 'bar'])).to eq({})
     end
   end
 
   context 'when the path must be URL-escaped' do
 
     let(:url) do
-      'foo%5Ebar/_mapping/bar%2Fbam'
+      'foo%5Ebar/_mapping'
     end
 
     it 'performs the request' do
-      expect(client_double.indices.get_mapping(index: 'foo^bar', type: 'bar/bam')).to eq({})
+      expect(client_double.indices.get_mapping(index: 'foo^bar')).to eq({})
     end
   end
 end

data/spec/opensearch/api/actions/indices/put_mapping_spec.rb

@@ -39,7 +39,7 @@ describe 'client.cluster#put_mapping' do
   end
 
   let(:url) do
-    'foo/bar/_mappings'
+    'foo/_mappings'
   end
 
   let(:body) do
@@ -47,20 +47,7 @@ describe 'client.cluster#put_mapping' do
   end
 
   it 'performs the request' do
-    expect(client_double.indices.put_mapping(index: 'foo', type: 'bar', body: {})).to eq({})
-  end
-
-  context 'when there is no type specified' do
-
-    let(:client) do
-      Class.new { include OpenSearch::API }.new
-    end
-
-    it 'raises an exception' do
-      expect {
-        client.indices.put_mapping(type: 'foo')
-      }.to raise_exception(ArgumentError)
-    end
+    expect(client_double.indices.put_mapping(index: 'foo', body: {})).to eq({})
   end
 
   context 'when there is no body specified' do
@@ -71,7 +58,7 @@ describe 'client.cluster#put_mapping' do
 
     it 'raises an exception' do
       expect {
-        client.indices.put_mapping(index: 'foo', type: 'bar')
+        client.indices.put_mapping(index: 'foo')
       }.to raise_exception(ArgumentError)
     end
   end
@@ -83,29 +70,29 @@ describe 'client.cluster#put_mapping' do
     end
 
     it 'performs the request' do
-      expect(client_double.indices.put_mapping(index: 'foo', type: 'bar', body: { filter: 'foo' })).to eq({})
+      expect(client_double.indices.put_mapping(index: 'foo', body: { filter: 'foo' })).to eq({})
     end
   end
 
   context 'when multiple indices are specified' do
 
     let(:url) do
-      'foo,bar/bam/_mappings'
+      'foo,bar/_mappings'
     end
 
     it 'performs the request' do
-      expect(client_double.indices.put_mapping(index: ['foo','bar'], type: 'bam', body: {})).to eq({})
+      expect(client_double.indices.put_mapping(index: ['foo','bar'], body: {})).to eq({})
     end
   end
 
   context 'when the path needs to be URL-escaped' do
 
     let(:url) do
-      'foo%5Ebar/bar%2Fbam/_mappings'
+      'foo%5Ebar/_mappings'
     end
 
     it 'performs the request' do
-      expect(client_double.indices.put_mapping(index: 'foo^bar', type: 'bar/bam', body: {})).to eq({})
+      expect(client_double.indices.put_mapping(index: 'foo^bar', body: {})).to eq({})
     end
   end
 end

data/spec/opensearch/api/actions/indices/validate_query_spec.rb

@@ -64,16 +64,6 @@ describe 'client.cluster#validate_query' do
     end
   end
 
-  context 'when a type and index are specified' do
-    let(:url) do
-      'foo/bar/_validate/query'
-    end
-
-    it 'performs the request' do
-      expect(client_double.indices.validate_query(index: 'foo', type: 'bar')).to eq({})
-    end
-  end
-
   context 'when multiple indicies are specified as a list' do
     let(:url) do
       'foo,bar/_validate/query'

data/spec/opensearch/api/actions/mget_spec.rb

@@ -64,21 +64,6 @@ describe 'client#mget' do
     end
   end
 
-  context 'when a type is specified' do
-
-    let(:url) do
-      'foo/bar/_mget'
-    end
-
-    let(:body) do
-      { ids: [ '1', '2' ]}
-    end
-
-    it 'performs the request' do
-      expect(client_double.mget(index: 'foo', type: 'bar', body: { :ids => [ '1', '2'] })).to eq({})
-    end
-  end
-
   context 'when url parameters are provided' do
 
     let(:params) do
@@ -97,7 +82,7 @@ describe 'client#mget' do
   context 'when the request needs to be URL-escaped' do
 
     let(:url) do
-      'foo%5Ebar/bar%2Fbam/_mget'
+      'foo%5Ebar/_mget'
     end
 
     let(:body) do
@@ -105,7 +90,7 @@ describe 'client#mget' do
     end
 
     it 'performs the request' do
-      expect(client_double.mget(index: 'foo^bar', type: 'bar/bam', body: { :ids => [ '1', '2'] })).to eq({})
+      expect(client_double.mget(index: 'foo^bar', body: { :ids => [ '1', '2'] })).to eq({})
     end
   end
 end

data/spec/opensearch/api/actions/mtermvectors_spec.rb

@@ -30,7 +30,7 @@ describe 'client#mtermvectors' do
   let(:expected_args) do
     [
       method,
-      'my-index/my-type/_mtermvectors',
+      'my-index/_mtermvectors',
       {},
       body,
       {}
@@ -43,13 +43,13 @@ describe 'client#mtermvectors' do
   end
 
   it 'performs the request' do
-    expect(client_double.mtermvectors(index: 'my-index', type: 'my-type', body: { ids: [1, 2, 3] })).to eq({})
+    expect(client_double.mtermvectors(index: 'my-index', body: { ids: [1, 2, 3] })).to eq({})
   end
 
   context 'when a list of ids is passed instead of a body' do
     let(:method) { 'GET' }
     it 'performs the request' do
-      expect(client_double.mtermvectors(index: 'my-index', type: 'my-type', ids: [1, 2, 3])).to eq({})
+      expect(client_double.mtermvectors(index: 'my-index', ids: [1, 2, 3])).to eq({})
     end
   end
 end

data/spec/opensearch/api/actions/search_spec.rb

@@ -47,11 +47,11 @@ describe 'client#search' do
   end
 
   let(:url) do
-    '_all/foo/_search'
+    '_search'
   end
 
   it 'has a default value for index' do
-    expect(client_double.search(type: 'foo'))
+    expect(client_double.search())
   end
 
   context 'when a request definition is specified' do
@@ -80,14 +80,14 @@ describe 'client#search' do
     end
   end
 
-  context 'when an index and type are specified' do
+  context 'when an index is specified' do
 
     let(:url) do
-      'foo/bar/_search'
+      'foo/_search'
     end
 
     it 'performs the request' do
-      expect(client_double.search(index: 'foo', type: 'bar'))
+      expect(client_double.search(index: 'foo'))
     end
   end
 
@@ -102,17 +102,6 @@ describe 'client#search' do
     end
   end
 
-  context 'when multiple indices and types are specified' do
-
-    let(:url) do
-      'foo,bar/lam,bam/_search'
-    end
-
-    it 'performs the request' do
-      expect(client_double.search(index: ['foo', 'bar'], type: ['lam', 'bam']))
-    end
-  end
-
   context 'when there are URL params' do
 
     let(:url) do

data/spec/opensearch/api/actions/termvectors_spec.rb

@@ -38,7 +38,7 @@ describe 'client#termvectors' do
   end
 
   let(:url) do
-    'foo/bar/123/_termvectors'
+    'foo/_termvectors/123'
   end
 
   let(:params) do
@@ -55,21 +55,21 @@ describe 'client#termvectors' do
 
   it 'requires the :index argument' do
     expect {
-      client.termvectors(type: 'bar', id: '1')
+      client.termvectors(id: '1')
     }.to raise_exception(ArgumentError)
   end
 
   it 'performs the request' do
-    expect(client_double.termvectors(index: 'foo', type: 'bar', id: '123', body: {})).to eq({})
+    expect(client_double.termvectors(index: 'foo', id: '123', body: {})).to eq({})
   end
 
   context 'when the older api name \'termvector\' is used' do
     let(:url) do
-      'foo/bar/123/_termvector'
+      'foo/_termvector/123'
     end
 
     it 'performs the request' do
-      expect(client_double.termvector(index: 'foo', type: 'bar', id: '123', body: {})).to eq({})
+      expect(client_double.termvector(index: 'foo', id: '123', body: {})).to eq({})
     end
   end
 end

data/spec/opensearch/api/actions/update_document_spec.rb

@@ -43,7 +43,7 @@ describe 'client#update' do
   end
 
   let(:url) do
-    'foo/bar/1/_update'
+    'foo/_update/1'
   end
 
   let(:client) do
@@ -56,24 +56,24 @@ describe 'client#update' do
 
   it 'requires the :index argument' do
     expect {
-      client.update(type: 'bar', id: '1')
+      client.update(id: '1')
     }.to raise_exception(ArgumentError)
   end
 
   it 'requires the :id argument' do
     expect {
-      client.update(index: 'foo', type: 'bar')
+      client.update(index: 'foo')
     }.to raise_exception(ArgumentError)
   end
 
   it 'performs the request' do
-    expect(client_double.update(index: 'foo', type: 'bar', id: '1', body: { doc: {} })).to eq({})
+    expect(client_double.update(index: 'foo', id: '1', body: { doc: {} })).to eq({})
   end
 
   context 'when URL parameters are provided' do
 
     let(:url) do
-      'foo/bar/1/_update'
+      'foo/_update/1'
     end
 
     let(:body) do
@@ -81,7 +81,7 @@ describe 'client#update' do
     end
 
     it 'performs the request' do
-      expect(client_double.update(index: 'foo', type: 'bar', id: '1', body: {}))
+      expect(client_double.update(index: 'foo', id: '1', body: {}))
     end
   end
 
@@ -89,7 +89,7 @@ describe 'client#update' do
 
     it 'raises an ArgumentError' do
       expect {
-        client.update(index: 'foo', type: 'bar', id: '1', body: { doc: {} }, qwertypoiuy: 'asdflkjhg')
+        client.update(index: 'foo', id: '1', body: { doc: {} }, qwertypoiuy: 'asdflkjhg')
       }.to raise_exception(ArgumentError)
     end
   end
@@ -97,7 +97,7 @@ describe 'client#update' do
   context 'when the request needs to be URL-escaped' do
 
     let(:url) do
-      'foo%5Ebar/bar%2Fbam/1/_update'
+      'foo%5Ebar/_update/1'
     end
 
     let(:body) do
@@ -105,7 +105,7 @@ describe 'client#update' do
     end
 
     it 'escapes the parts' do
-      expect(client_double.update(index: 'foo^bar', type: 'bar/bam', id: '1', body: {}))
+      expect(client_double.update(index: 'foo^bar', id: '1', body: {}))
     end
   end
 
@@ -117,14 +117,14 @@ describe 'client#update' do
 
     it 'raises it to the user' do
       expect {
-        client.update(index: 'foo', type: 'bar', id: 'XXX', body: {})
+        client.update(index: 'foo', id: 'XXX', body: {})
       }.to raise_exception(NotFound)
     end
 
     context 'when the :ignore parameter is specified' do
 
       it 'does not raise the error to the user' do
-        expect(client.update(index: 'foo', type: 'bar', id: 'XXX', body: {}, ignore: 404)).to eq(false)
+        expect(client.update(index: 'foo', id: 'XXX', body: {}, ignore: 404)).to eq(false)
       end
     end
   end

data/spec/opensearch/api/utils_spec.rb

@@ -48,17 +48,10 @@ describe OpenSearch::API::Utils do
       expect(utils.__escape('*')).to eq('*')
     end
 
-    it 'users CGI.escape by default' do
+    it 'uses CGI.escape by default' do
       expect(CGI).to receive(:escape).and_call_original
       expect(utils.__escape('foo bar')).to eq('foo+bar')
     end
-
-    it 'uses the escape_utils gem when available', unless: defined?(JRUBY_VERSION) do
-      require 'escape_utils'
-      expect(CGI).not_to receive(:escape)
-      expect(EscapeUtils).to receive(:escape_url).and_call_original
-      expect(utils.__escape('foo bar')).to eq('foo+bar')
-    end
   end
 
   describe '#__listify' do
@@ -116,19 +109,19 @@ describe OpenSearch::API::Utils do
 
       let(:result) do
         utils.__bulkify [
-          { :index =>  { :_index => 'myindexA', :_type => 'mytype', :_id => '1', :data => { :title => 'Test' } } },
-          { :update => { :_index => 'myindexB', :_type => 'mytype', :_id => '2', :data => { :doc => { :title => 'Update' } } } },
-          { :delete => { :_index => 'myindexC', :_type => 'mytypeC', :_id => '3' } }
+          { :index =>  { :_index => 'myindexA', :_id => '1', :data => { :title => 'Test' } } },
+          { :update => { :_index => 'myindexB', :_id => '2', :data => { :doc => { :title => 'Update' } } } },
+          { :delete => { :_index => 'myindexC', :_id => '3' } }
         ]
       end
 
       let(:expected_string) do
         <<-PAYLOAD.gsub(/^\s+/, '')
-                {"index":{"_index":"myindexA","_type":"mytype","_id":"1"}}
+                {"index":{"_index":"myindexA","_id":"1"}}
                 {"title":"Test"}
-                {"update":{"_index":"myindexB","_type":"mytype","_id":"2"}}
+                {"update":{"_index":"myindexB","_id":"2"}}
                 {"doc":{"title":"Update"}}
-                {"delete":{"_index":"myindexC","_type":"mytypeC","_id":"3"}}
+                {"delete":{"_index":"myindexC","_id":"3"}}
         PAYLOAD
       end