elasticsearch-api 6.8.0 → 7.10.0

data/spec/elasticsearch/api/actions/delete_by_query_spec.rb

@@ -1,13 +1,31 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#delete_by_query' do
 
   let(:expected_args) do
     [
-        'POST',
-        'foo/_delete_by_query',
-        {},
-        { term: {} }
+      'POST',
+      'foo/_delete_by_query',
+      {},
+      { term: {} },
+      {}
     ]
   end
 
@@ -28,7 +46,8 @@ describe 'client#delete_by_query' do
         'POST',
         'foo/tweet,post/_delete_by_query',
         {},
-        { term: {} }
+        { term: {} },
+        {}
       ]
     end
 
@@ -38,18 +57,24 @@ describe 'client#delete_by_query' do
   end
 
   context 'when a query is provided' do
-
     let(:expected_args) do
       [
         'POST',
         'foo/_delete_by_query',
         { q: 'foo:bar' },
-        nil
+        { query: 'query' },
+        {}
       ]
     end
 
     it 'performs the request' do
-      expect(client_double.delete_by_query(index: 'foo', q: 'foo:bar')).to eq({})
+      expect(
+        client_double.delete_by_query(
+          index: 'foo',
+          q: 'foo:bar',
+          body: { query: 'query' }
+        )
+      ).to eq({})
     end
   end
 end

data/spec/elasticsearch/api/actions/delete_document_spec.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#delete' do
@@ -7,7 +24,8 @@ describe 'client#delete' do
         'DELETE',
         'foo/bar/1',
         params,
-        nil
+        nil,
+        {}
     ]
   end
 
@@ -25,12 +43,6 @@ describe 'client#delete' do
     }.to raise_exception(ArgumentError)
   end
 
-  it 'requires the :type argument' do
-    expect {
-      client.delete(index: 'foo', id: '1')
-    }.to raise_exception(ArgumentError)
-  end
-
   it 'requires the :id argument' do
     expect {
       client.delete(index: 'foo', type: 'bar')
@@ -68,7 +80,8 @@ describe 'client#delete' do
           'DELETE',
           'foo%5Ebar/bar%2Fbam/1',
           params,
-          nil
+          nil,
+          {}
       ]
     end
 

data/spec/elasticsearch/api/actions/delete_script_spec.rb

@@ -1,20 +1,23 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#delete_script' do
-
-  let(:expected_args) do
-    [
-        'DELETE',
-        '_scripts/groovy/foo',
-        {},
-        nil
-    ]
-  end
-
-  it 'performs the request' do
-    expect(client_double.delete_script(lang: 'groovy', id: 'foo')).to eq({})
-  end
-
   context 'when lang parameter is not provided' do
 
     let(:expected_args) do
@@ -22,7 +25,8 @@ describe 'client#delete_script' do
           'DELETE',
           '_scripts/foo',
           {},
-          nil
+          nil,
+          {}
       ]
     end
 

data/spec/elasticsearch/api/actions/exists_document_spec.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#exists' do
@@ -7,7 +24,8 @@ describe 'client#exists' do
         'HEAD',
         url,
         params,
-        nil
+        nil,
+        {}
     ]
   end
 
@@ -38,7 +56,7 @@ describe 'client#exists' do
   context 'when the type parameter is not provided' do
 
     let(:url) do
-      'foo/_all/1'
+      'foo/_doc/1'
     end
 
     it 'performs the request' do

data/spec/elasticsearch/api/actions/explain_document_spec.rb

@@ -1,16 +1,35 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#explain' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body
+      method,
+      url,
+      params,
+      body,
+      {}
     ]
   end
 
+  let(:method) { 'POST' }
+
   let(:params) do
     {}
   end
@@ -38,19 +57,13 @@ describe 'client#explain' do
       client.explain(index: 'foo', type: 'bar')
     }.to raise_exception(ArgumentError)
   end
-
-  it 'requires the :type argument' do
-    expect {
-      client.explain(index: 'foo', id: '1')
-    }.to raise_exception(ArgumentError)
-  end
-
+  
   it 'performs the request' do
     expect(client_double.explain(index: 'foo', type: 'bar', id: 1, body: {})).to eq({})
   end
 
   context 'when a query is provided' do
-
+    let(:method) { 'GET' }
     let(:params) do
       { q: 'abc123' }
     end
@@ -65,7 +78,6 @@ describe 'client#explain' do
   end
 
   context 'when a query definition is provided' do
-
     let(:body) do
       { query: { match: {} } }
     end
@@ -76,7 +88,6 @@ describe 'client#explain' do
   end
 
   context 'when the request needs to be URL-escaped' do
-
     let(:url) do
       'foo%5Ebar/bar%2Fbam/1/_explain'
     end

data/spec/elasticsearch/api/actions/field_caps_spec.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#field_caps' do
@@ -7,7 +24,8 @@ describe 'client#field_caps' do
         'GET',
         'foo/_field_caps',
         { fields: 'bar' },
-        nil
+        nil,
+        {}
     ]
   end
 

data/spec/elasticsearch/api/actions/get_document_source_spec.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#get_source' do
@@ -7,7 +24,8 @@ describe 'client#get_source' do
         'GET',
         url,
         params,
-        nil
+        nil,
+        {}
     ]
   end
 
@@ -38,7 +56,7 @@ describe 'client#get_source' do
   context 'when the type parameter is not provided' do
 
     let(:url) do
-      'foo/_all/1/_source'
+      'foo/_source/1'
     end
 
     it 'performs the request' do
@@ -74,8 +92,10 @@ describe 'client#get_source' do
       expect(client).to receive(:perform_request).and_raise(NotFound)
     end
 
-    it 'returns false' do
-      expect(client.get_source(index: 'foo', id: '1')).to eq(false)
+    it 'raises the error' do
+      expect {
+        client.get_source(index: 'foo', id: '1')
+      }.to raise_exception(NotFound)
     end
   end
 end

data/spec/elasticsearch/api/actions/get_document_spec.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#get' do
@@ -7,7 +24,8 @@ describe 'client#get' do
         'GET',
         url,
         params,
-        nil
+        nil,
+        {}
     ]
   end
 
@@ -38,7 +56,7 @@ describe 'client#get' do
   context 'when the type parameter is not provided' do
 
     let(:url) do
-      'foo/_all/1'
+      'foo/_doc/1'
     end
 
     it 'performs the request' do

data/spec/elasticsearch/api/actions/get_script_spec.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#get_script' do
@@ -7,7 +24,8 @@ describe 'client#get_script' do
         'GET',
         url,
         params,
-        nil
+        nil,
+        {}
     ]
   end
 
@@ -15,25 +33,18 @@ describe 'client#get_script' do
     { }
   end
 
-  context 'when the `lang` parameter is specificed' do
-
-    let(:url) do
-      '_scripts/groovy/foo'
-    end
-
-    it 'performs the request' do
-      expect(client_double.get_script(lang: 'groovy', id: 'foo')).to eq({})
-    end
+  let(:url) do
+    '_scripts/foo'
   end
 
-  context 'when the `lang` parameter is not specificed' do
+  context 'when the `lang` parameter is specificed' do
 
-    let(:url) do
-      '_scripts/foo'
+    let(:params) do
+      { master_timeout: '1s' }
     end
 
     it 'performs the request' do
-      expect(client_double.get_script(id: 'foo')).to eq({})
+      expect(client_double.get_script(master_timeout: '1s', id: 'foo')).to eq({})
     end
   end
 end

data/spec/elasticsearch/api/actions/hashie_spec.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 require 'hashie'
 

data/spec/elasticsearch/api/actions/index_document_spec.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe 'client#index' do
@@ -7,7 +24,8 @@ describe 'client#index' do
         request_type,
         url,
         params,
-        body
+        body,
+        {}
     ]
   end
 
@@ -24,7 +42,7 @@ describe 'client#index' do
   end
 
   let(:body) do
-    { :foo => 'bar' }
+    { foo: 'bar' }
   end
 
   let(:client) do
@@ -37,14 +55,8 @@ describe 'client#index' do
     }.to raise_exception(ArgumentError)
   end
 
-  it 'requires the :type argument' do
-    expect {
-      client.index(index: 'foo')
-    }.to raise_exception(ArgumentError)
-  end
-
   it 'performs the request' do
-    expect(client_double.index(index: 'foo', type: 'bar', body: { foo: 'bar' })).to eq({})
+    expect(client_double.index(index: 'foo', type: 'bar', body: body)).to eq({})
   end
 
   context 'when a specific id is provided' do
@@ -58,7 +70,7 @@ describe 'client#index' do
     end
 
     it 'performs the request' do
-      expect(client_double.index(index: 'foo', type: 'bar', id: '1', body: { foo: 'bar' })).to eq({})
+      expect(client_double.index(index: 'foo', type: 'bar', id: '1', body: body)).to eq({})
     end
   end
 
@@ -76,12 +88,8 @@ describe 'client#index' do
       { op_type: 'create' }
     end
 
-    let(:body) do
-      nil
-    end
-
     it 'passes the URL params' do
-      expect(client_double.index(index: 'foo', type: 'bar', op_type: 'create')).to eq({})
+      expect(client_double.index(index: 'foo', type: 'bar', op_type: 'create', body: body)).to eq({})
     end
 
     context 'when a specific id is provided' do
@@ -99,13 +107,12 @@ describe 'client#index' do
       end
 
       it 'passes the URL params' do
-        expect(client_double.index(index: 'foo', type: 'bar', id: '1', op_type: 'create')).to eq({})
+        expect(client_double.index(index: 'foo', type: 'bar', id: '1', op_type: 'create', body: body)).to eq({})
       end
     end
   end
 
   context 'when the request needs to be URL-escaped' do
-
     let(:request_type) do
       'PUT'
     end
@@ -114,12 +121,8 @@ describe 'client#index' do
       'foo/bar%2Fbam/123'
     end
 
-    let(:body) do
-      nil
-    end
-
     it 'URL-escapes the parts' do
-      expect(client_double.index(index: 'foo', type: 'bar/bam', id: '123')).to eq({})
+      expect(client_double.index(index: 'foo', type: 'bar/bam', id: '123', body: body)).to eq({})
     end
   end
 

data/spec/elasticsearch/api/actions/indices/add_block_spec.rb

@@ -0,0 +1,63 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'spec_helper'
+
+describe 'client.indices#add_block' do
+  let(:expected_args) do
+    [
+      'PUT',
+      url,
+      {},
+      nil,
+      {}
+    ]
+  end
+  let(:url) { "#{index}/_block/#{block}"}
+  let(:index) { 'test_index' }
+  let(:block) { 'test_block' }
+
+  it 'performs the request' do
+    expect(
+      client_double.indices.add_block(index: index, block: block)
+    ).to eq({})
+  end
+
+  context 'when an index is not specified' do
+    let(:client) do
+      Class.new { include Elasticsearch::API }.new
+    end
+
+    it 'raises an argument error' do
+      expect do
+        client.indices.add_block(block: block)
+      end.to raise_exception(ArgumentError)
+    end
+  end
+
+  context 'when a block is not specified' do
+    let(:client) do
+      Class.new { include Elasticsearch::API }.new
+    end
+
+    it 'raises an argument error' do
+      expect do
+        client.indices.add_block(index: index)
+      end.to raise_exception(ArgumentError)
+    end
+  end
+end