faulty 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c98e42a6c19d8832dc0267abba5498f0203922bd98cb3bb1b9c28643c9a9f3f
-  data.tar.gz: 7b68f35acfa54c10ec411d26eb45319eb47bf6d688d447adaead117f1ec098ab
+  metadata.gz: 2eda80b5d7aba5948835addf9b8cf418aba0e8ba48453361678a15229ea4481a
+  data.tar.gz: 53a27be99ae42c157be28df1e887033b86a53ccd232b05bc290bf511ac4e9d0c
 SHA512:
-  metadata.gz: 2677b6450704cbabd6b9c9e3c5d68bad7b762810f27f0b0a9171bca825051c9668aff54aadb58b73884a266f5c0fdfaa46f57d56bc0a6d93824bb1d02c4c08fd
-  data.tar.gz: ef98388e2d161b8995310de758b11ddc960a2b0b4c05605ba9cf7e30334c36bb8590578259c0e0158516254fb56d9bc1bb5cb2f42cea88c8224c176301535898
+  metadata.gz: 766ab386706d842f4f02faa572d931b702b532071baa221f5c77c1330e3086cab1f2126f548c255254fe3d4f85ca9666698116b808c0b0e29c507ee5f6680c5c
+  data.tar.gz: c5f04aa84ad450ae186c57236d80bb872c4977e60930a0f99e876bf497aa2473c2753d2307634b1cfe0dc332ce1d3c88382281ce2158c13cf140e432afaeb97e

data/CHANGELOG.md

@@ -9,6 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [Unreleased]
 -------------------
 
+[0.10.0] - 2023-04-05
+---------------------
+
+### Added
+
+* Support the opensearch-ruby gem #65 justinhoward
+
+### Changed
+
+* Split CI tasks into their own jobs #64 justinhoward
+
 [0.9.0] - 2022-08-18
 ---------------------
 
@@ -289,7 +300,8 @@ of AutoWire.
 
 Initial public release
 
-[Unreleased]: https://github.com/ParentSquare/faulty/compare/v0.9.0...HEAD
+[Unreleased]: https://github.com/ParentSquare/faulty/compare/v0.10.0...HEAD
+[0.10.0]: https://github.com/ParentSquare/faulty/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/ParentSquare/faulty/compare/v0.8.7...v0.9.0
 [0.8.7]: https://github.com/ParentSquare/faulty/compare/v0.8.6...v0.8.7
 [0.8.6]: https://github.com/ParentSquare/faulty/compare/v0.8.5...v0.8.6

data/lib/faulty/patch/elasticsearch.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'elasticsearch'
-
 class Faulty
   module Patch
     # Patch Elasticsearch to run requests in a circuit
@@ -40,15 +38,23 @@ class Faulty
       module SnifferTimeoutError; end
       module ServerError; end
 
+      PATCHED_MODULE = if Gem.loaded_specs['opensearch-ruby']
+        require 'opensearch'
+        ::OpenSearch
+      else
+        require 'elasticsearch'
+        ::Elasticsearch
+      end
+
       # We will freeze this after adding the dynamic error classes
       MAPPED_ERRORS = { # rubocop:disable Style/MutableConstant
-        ::Elasticsearch::Transport::Transport::Error => Error,
-        ::Elasticsearch::Transport::Transport::SnifferTimeoutError => SnifferTimeoutError,
-        ::Elasticsearch::Transport::Transport::ServerError => ServerError
+        PATCHED_MODULE::Transport::Transport::Error => Error,
+        PATCHED_MODULE::Transport::Transport::SnifferTimeoutError => SnifferTimeoutError,
+        PATCHED_MODULE::Transport::Transport::ServerError => ServerError
       }
 
       module Errors
-        ::Elasticsearch::Transport::Transport::ERRORS.each do |_code, klass|
+        PATCHED_MODULE::Transport::Transport::ERRORS.each do |_code, klass|
           MAPPED_ERRORS[klass] = const_set(klass.name.split('::').last, Module.new)
         end
       end
@@ -66,14 +72,14 @@ class Faulty
       def initialize(arguments = {}, &block)
         super
 
-        errors = [::Elasticsearch::Transport::Transport::Error]
+        errors = [PATCHED_MODULE::Transport::Transport::Error]
         errors.concat(@transport.host_unreachable_exceptions)
 
         @faulty_circuit = Patch.circuit_from_hash(
           'elasticsearch',
           arguments[:faulty],
           errors: errors,
-          exclude: ::Elasticsearch::Transport::Transport::Errors::NotFound,
+          exclude: PATCHED_MODULE::Transport::Transport::Errors::NotFound,
           patched_error_mapper: ERROR_MAPPER
         )
       end
@@ -86,10 +92,20 @@ class Faulty
   end
 end
 
-module Elasticsearch
-  module Transport
-    class Client
-      prepend(Faulty::Patch::Elasticsearch)
+if Gem.loaded_specs['opensearch-ruby']
+  module OpenSearch
+    module Transport
+      class Client
+        prepend(Faulty::Patch::Elasticsearch)
+      end
+    end
+  end
+else
+  module Elasticsearch
+    module Transport
+      class Client
+        prepend(Faulty::Patch::Elasticsearch)
+      end
     end
   end
 end

data/lib/faulty/version.rb

@@ -3,6 +3,6 @@
 class Faulty
   # The current Faulty version
   def self.version
-    Gem::Version.new('0.9.0')
+    Gem::Version.new('0.10.0')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faulty
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Justin Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -150,7 +150,7 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   changelog_uri: https://github.com/ParentSquare/faulty/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/faulty/0.9.0
+  documentation_uri: https://www.rubydoc.info/gems/faulty/0.10.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Fault-tolerance tools for ruby based on circuit-breakers