elasticsearch-api 7.16.1 → 7.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2424d274828887601f8ad67605b8f46f2d9cd69ab3f9a7750605b6e1ef2424
-  data.tar.gz: 78d25e75a029d32ba699b5899757e6444920cc6ee7219e948378b886fbdf86f9
+  metadata.gz: 2c30590e2629d036e98030e2ad56ab10506b416302e7dfc36a607b896a8493e7
+  data.tar.gz: 95dbb9003133b3bb3067f266f4817a5913aa010aa1ef81beb23a943ffea6dc58
 SHA512:
-  metadata.gz: c43a43586bdc3c7ecabee29fc8f99a5abdd41201a94b4941679a12381b3f6630f7eada28126caffaf425d23623eb22dd13e4e535e60884580f2d6e0e0c93b912
-  data.tar.gz: f9d9aea59e6fc6df3f10f3b4abdcbfcdf6999451f468c0be15f0586e48879a885a381ff0d4983e0966698e55fab930e5a70e1e0b69a62d766b3eec71a04911cc
+  metadata.gz: 5d9efbd6779e057fb1b71cc92967aee52ff5e099e604cadd8bc96cad08bcee6c98d93b7605b29989ffda8db38b028daa55405f58ba049f220e45e69a94cb6942
+  data.tar.gz: c0729f9e7fa8a405194ea93d3dac8bccaf12f7014a2ee1be828bdbcb7553b5928628bf0edfab30e0e86be815c8252c86c94904d0ecb723eb171a23c98c0655ad

data/elasticsearch-api.gemspec

@@ -62,10 +62,17 @@ Gem::Specification.new do |s|
   # Gems for testing integrations
   s.add_development_dependency 'jsonify'
   s.add_development_dependency 'hashie'
+  # Temporary support for Ruby 2.6, since it's EOL March 2022:
+  if RUBY_VERSION < '2.7.0'
+    s.add_development_dependency 'jbuilder', '< 7.0.0'
+  else
+    s.add_development_dependency 'activesupport'
+    s.add_development_dependency 'jbuilder'
+  end
 
   s.add_development_dependency 'cane'
   s.add_development_dependency 'escape_utils' unless defined? JRUBY_VERSION
-  s.add_development_dependency 'jbuilder'
+
   s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'test-unit', '~> 2'

data/lib/elasticsearch/api/utils.rb

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+require 'erb'
 
 module Elasticsearch
   module API
@@ -29,7 +30,7 @@ module Elasticsearch
       # @api private
       def __escape(string)
         return string if string == '*'
-        defined?(EscapeUtils) ? EscapeUtils.escape_url(string.to_s) : CGI.escape(string.to_s)
+        ERB::Util.url_encode(string.to_s)
       end
 
       # Create a "list" of values from arguments, ignoring nil values and encoding special characters.

data/lib/elasticsearch/api/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module API
-    VERSION = '7.16.1'.freeze
+    VERSION = '7.16.3'.freeze
   end
 end

data/spec/elasticsearch/api/utils_spec.rb

@@ -30,7 +30,7 @@ describe Elasticsearch::API::Utils do
     end
 
     it 'encodes special characters' do
-      expect(utils.__escape('foo bar')).to eq('foo+bar')
+      expect(utils.__escape('foo bar')).to eq('foo%20bar')
       expect(utils.__escape('foo/bar')).to eq('foo%2Fbar')
       expect(utils.__escape('foo^bar')).to eq('foo%5Ebar')
     end
@@ -38,18 +38,6 @@ describe Elasticsearch::API::Utils do
     it 'does not encode asterisks' do
       expect(utils.__escape('*')).to eq('*')
     end
-
-    it 'users 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
@@ -77,7 +65,7 @@ describe Elasticsearch::API::Utils do
     context 'when the escape option is set to false' do
 
       it 'does not escape the characters' do
-        expect(utils.__listify(['foo', 'bar^bam'], :escape => false)).to eq('foo,bar^bam')
+        expect(utils.__listify(['foo', 'bar^bam'], escape: false)).to eq('foo,bar^bam')
       end
     end
   end
@@ -107,19 +95,19 @@ describe Elasticsearch::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
 
@@ -379,7 +367,7 @@ describe Elasticsearch::API::Utils do
       end
 
       let(:unsupported_params) do
-        [ { :foo => { :explanation => 'NOT_SUPPORTED'} }, :moo ]
+        [ { foo: { explanation: 'NOT_SUPPORTED'} }, :moo ]
       end
 
 

data/spec/spec_helper.rb

@@ -25,6 +25,10 @@ else
   require 'pry-byebug'
 end
 require 'ansi'
+require 'yaml'
+require 'active_support/isolated_execution_state' unless RUBY_VERSION < '2.7.0'
+require 'jbuilder'
+require 'jsonify'
 require 'elasticsearch'
 require 'elasticsearch-api'
 require 'elasticsearch-transport'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 7.16.1
+  version: 7.16.3
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: escape_utils
+  name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +249,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: cane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: escape_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -705,7 +719,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Ruby API for Elasticsearch.