opensearch-ruby 4.0.0.pre.beta.4 → 4.0.0.pre.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 042f372ee8559ded88873a96cba1bb5f635867e12f51e79dfc15d226df27249b
-  data.tar.gz: 04fe73ce9dc643661f0834776736ec0a50cb816b4c25fa350a4d7e5947513301
+  metadata.gz: 3872c0c4466fe1c37a1732bf74624264530deb5da6e9a5abeb5343ca8b940ffb
+  data.tar.gz: 9c92adf323965443993e90da36d64b3200b717303c7dac47a0e20179e025af9d
 SHA512:
-  metadata.gz: d03ac4de4e5cace0d3896a9441e6a0d86f5da3b56cf87e9e101e1a9de472ce6c0e23d2e9ae63a4227eb975d349a410ac14c091c98a8fc2da2e17e303a6c08778
-  data.tar.gz: 5a98a0b9bab00c0783485cd7885de1a7abc79e8ef8bb3e6daf22c927d2761cf96ce37346a5576f96a750c720f6e392a34a5cf72c13f3e8c6f478051458c18b91
+  metadata.gz: f998b61dc76a8f5ff77be3dd75f5a52088cebc3f81a0ce7f011f90485d37a7a48b7701bf745b1d8487070b870131639cc5ac5ca3faa1e702efbd0532edc60f8f
+  data.tar.gz: cdbd89cb59925c945b065e3bf20dca9ca37fb51488b12f89b507b1ab2268e4f604d052a0f9d7c2a180b4d3ad55046741c1f4259dc2fdb3fffcf450467027300e

data/README.md

@@ -59,14 +59,12 @@ If you don't use Bundler, you may need to require the library explicitly (like `
 
 Currently these libraries will be automatically detected and used:
 - [Patron](https://github.com/toland/patron) through [faraday-patron](https://github.com/lostisland/faraday-patron)
-- [Typhoeus](https://github.com/typhoeus/typhoeus) through [faraday-typhoeus](https://github.com/dleavitt/faraday-typhoeus) for Faraday 2 or higher, or Faraday's built-in adapter for Faraday 1.
+- [Typhoeus](https://github.com/typhoeus/typhoeus) through [faraday-typhoeus](https://github.com/dleavitt/faraday-typhoeus)
 - [HTTPClient](https://rubygems.org/gems/httpclient) through [faraday-httpclient](https://github.com/lostisland/faraday-httpclient)
 - [Net::HTTP::Persistent](https://rubygems.org/gems/net-http-persistent) through [faraday-net_http_persistent](https://github.com/lostisland/faraday-net_http_persistent)
 
 **Note on [Typhoeus](https://github.com/typhoeus/typhoeus)**: You need to use v1.4.0 or up since older versions are not compatible with Faraday 1.0 or higher.
 
-**Note on [Faraday](https://rubygems.org/gems/faraday)**: If you use Faraday 2.0 or higher, if the adapter is in a separate gem, you will likely need to declare that gem as well. Only the Net::HTTP adapter gem is included by default. Faraday 1.x includes most common adapter gems already.
-
 ## DSL Features
 
 The `opensearch-dsl` library provides a Ruby API for the `OpenSearch Query DSL`.

data/lib/opensearch/api.rb

@@ -19,7 +19,7 @@ module OpenSearch
       'filter_path'     # Used to reduce the response. This parameter takes a comma-separated list of filters. It supports using wildcards to match any field or part of a field’s name. You can also exclude fields with "-".
     ]).freeze
 
-    DEFAULT_SERIALIZER = MultiJson
+    DEFAULT_SERIALIZER = Transport::Transport::Serializer::JSON.new
 
     def self.serializer
       settings[:serializer] || DEFAULT_SERIALIZER

data/lib/opensearch/transport/client.rb

@@ -366,10 +366,8 @@ module OpenSearch
       #
       def __auto_detect_adapter
         # Get the Faraday adapter list without initializing it.
-        adapter = if Faraday::Adapter.respond_to?(:registered_middleware) # Faraday 2.x
+        adapter = if Faraday::Adapter.respond_to?(:registered_middleware)
                     ->(name) { Faraday::Adapter.registered_middleware[name] }
-                  elsif Faraday::Adapter.respond_to?(:fetch_middleware) # Faraday 1.x
-                    ->(name) { Faraday::Adapter.fetch_middleware(name) }
                   else
                     {} # fallback behavior that should never happen
                   end

data/lib/opensearch/transport/transport/base.rb

@@ -37,7 +37,7 @@ module OpenSearch
         DEFAULT_RELOAD_AFTER     = 10_000 # Requests
         DEFAULT_RESURRECT_AFTER  = 60     # Seconds
         DEFAULT_MAX_RETRIES      = 3      # Requests
-        DEFAULT_SERIALIZER_CLASS = Serializer::MultiJson
+        DEFAULT_SERIALIZER_CLASS = Serializer::JSON
         SANITIZED_PASSWORD       = '*' * rand(1..14)
 
         attr_reader   :hosts, :options, :connections, :counter, :last_request_at, :protocol

data/lib/opensearch/transport/transport/serializer/{multi_json.rb → json.rb}

@@ -38,21 +38,25 @@ module OpenSearch
           end
         end
 
-        # A default JSON serializer (using [MultiJSON](http://rubygems.org/gems/multi_json))
+        # A default JSON serializer (using [json](http://rubygems.org/gems/json))
         #
-        class MultiJson
+        class JSON
           include Base
 
           # De-serialize a Hash from JSON string
           #
           def load(string, options = {})
-            ::MultiJson.load(string, options)
+            ::JSON.parse(string, options)
           end
 
           # Serialize a Hash to JSON string
           #
           def dump(object, options = {})
-            ::MultiJson.dump(object, options)
+            if options.delete(:pretty)
+              ::JSON.pretty_generate(object, options)
+            else
+              ::JSON.generate(object, options)
+            end
           end
         end
       end

data/lib/opensearch/transport.rb

@@ -27,11 +27,11 @@
 require 'uri'
 require 'time'
 require 'timeout'
-require 'multi_json'
+require 'json'
 require 'faraday'
 
 require 'opensearch/transport/transport/loggable'
-require 'opensearch/transport/transport/serializer/multi_json'
+require 'opensearch/transport/transport/serializer/json'
 require 'opensearch/transport/transport/sniffer'
 require 'opensearch/transport/transport/response'
 require 'opensearch/transport/transport/errors'

data/lib/opensearch/version.rb

@@ -25,5 +25,5 @@
 # under the License.
 
 module OpenSearch
-  VERSION = '4.0.0-beta.4'.freeze
+  VERSION = '4.0.0-beta.5'.freeze
 end

data/opensearch-ruby.gemspec

@@ -64,7 +64,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 3.0'
 
-  s.add_dependency 'faraday', '>= 1.0', '< 3'
+  s.add_dependency 'faraday', '~> 2.0'
   s.add_dependency "logger"
-  s.add_dependency 'multi_json', '>= 1.0'
 end

data/spec/spec_helper.rb

@@ -48,7 +48,7 @@ if defined?(JRUBY_VERSION)
   require 'pry-nav'
 else
   require 'faraday/patron'
-  require 'faraday/typhoeus' if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2')
+  require 'faraday/typhoeus'
   require 'opensearch/transport/transport/http/curb'
   require 'curb'
 end

data/test/transport/integration/transport_test.rb

@@ -37,7 +37,7 @@ class OpenSearch::Transport::ClientIntegrationTest < Minitest::Test
       # Require the library so autodetection finds it.
       require 'typhoeus'
       # Require the adapter so autodetection finds it.
-      require 'faraday/typhoeus' if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2')
+      require 'faraday/typhoeus'
 
       transport = OpenSearch::Transport::Transport::HTTP::Faraday.new \
         :hosts => [ { host: @host, port: @port } ] do |f|

data/test/transport/unit/serializer_test.rb

@@ -30,11 +30,11 @@ class OpenSearch::Transport::Transport::SerializerTest < Minitest::Test
 
   context "Serializer" do
 
-    should "use MultiJson by default" do
-      ::MultiJson.expects(:load)
-      ::MultiJson.expects(:dump)
-      OpenSearch::Transport::Transport::Serializer::MultiJson.new.load('{}')
-      OpenSearch::Transport::Transport::Serializer::MultiJson.new.dump({})
+    should "use JSON by default" do
+      ::JSON.expects(:parse)
+      ::JSON.expects(:generate)
+      OpenSearch::Transport::Transport::Serializer::JSON.new.load('{}')
+      OpenSearch::Transport::Transport::Serializer::JSON.new.dump({})
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opensearch-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.beta.4
+  version: 4.0.0.pre.beta.5
 platform: ruby
 authors:
 - Elastic
@@ -31,28 +31,22 @@ cert_chain:
   m0rB25J1sO2yjlalRdBoV5p7OKaWG4CGMr+q6vCC2za7yrtZiYOOv+KpWmheTwds
   P1nbdIL2eAXGfNU3cbtYisS1sSYi7VSkS52pVk8Jgtw=
   -----END CERTIFICATE-----
-date: 2025-04-18 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +61,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: |
   OpenSearch Ruby is a Ruby client for OpenSearch. You can use the client to
   execute OpenSearch API commands, and build OpenSearch queries and aggregations
@@ -649,7 +629,7 @@ files:
 - lib/opensearch/transport/transport/http/manticore.rb
 - lib/opensearch/transport/transport/loggable.rb
 - lib/opensearch/transport/transport/response.rb
-- lib/opensearch/transport/transport/serializer/multi_json.rb
+- lib/opensearch/transport/transport/serializer/json.rb
 - lib/opensearch/transport/transport/sniffer.rb
 - lib/opensearch/version.rb
 - opensearch-ruby.gemspec

metadata.gz.sig

@@ -1,3 +1,3 @@
-���'Õ��� 鍅�T��"�آ��6�pF�u���.Jg��a�X�0��N�1B��x4|à�q��T�F�����(�L����ㆍ*�'#λ���4&��,RmC{��
-�����@�ԗ�I�*�H���d����%f�m�����J�vy2O��&��rR�y�A��X=́8h�
-à=���z�Ҵ���*>c�@��}p���{
+p��_%&X��f�\���{��J<�1J�v`
+^Ƥ���󟰙Q^�AuOz��Mȥ���J=�g�n3Y[��([�W@�L�߁��N�9=��)�EF�(��qh������[H�(�d_���
+#4ܻ����" Hɥ��Þ�I��]n丞�e/|f	�?.�PA#��1.�x#1�#K�7��{���+6��L.JOb2�ܣ�
v�������@���k�O�/(@��(;�������);t��)��!n�w��u�