ruby upgrade and deep merge fix

.github/workflows/label-checker.yml

@@ -17,5 +17,5 @@ jobs:
       - uses: docker://agilepathway/pull-request-label-checker:latest
         with:
           # At least one of the labels listed below must be present on the PR for the check to pass
-          any_of: breaking change,enhancement,bugfix,version bump,release,chore,documentation,security
+          any_of: breaking change,enhancement,bugfix,version bump,release,chore,documentation,security,dependencies
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rspec.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby_version: ['2.7.5', '3.0.5', '3.1.4', '3.2.2', '3.3.8', '3.4.4']
+        ruby_version: ['3.0.5', '3.1.4', '3.2.2', '3.3.8', '3.4.4', '3.4.7']
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby_version: ['2.7.5', '3.0.5', '3.1.4', '3.2.2', '3.3.8', '3.4.4']
+        ruby_version: ['3.0.5', '3.1.4', '3.2.2', '3.3.8', '3.4.4', '3.4.7']
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.ruby-version

@@ -1 +1 @@
-3.2.1
+3.4.7

lib/event_source.rb

@@ -11,6 +11,7 @@
 require 'dry-struct'
 require 'oj'
 require 'active_support/all' # TODO: Remove ActiveSupport dependency
+require "event_source/helpers"
 
 require 'event_source/version'
 require 'event_source/ruby_versions'

lib/event_source/configure/config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'deep_merge'
+require "event_source/helpers"
 
 module EventSource
   module Configure

lib/event_source/configure/servers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'deep_merge'
+require "event_source/helpers"
 
 module EventSource
   module Configure

lib/event_source/helpers.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module EventSource
+  # The `EventSource::Helpers` module serves as a namespace for helper methods used across the EventSource gem.
+  # These methods provide utility functions that are used by the other modules and classes in the gem.
+  module Helpers
+    def self.rails_7_1_or_higher?
+      defined?(Rails) && Rails.gem_version >= Gem::Version.new('7.1.0')
+    end
+
+    def self.deep_merge_to_hash(target_hash, value)
+      if rails_7_1_or_higher?
+        target_hash.deeper_merge!(value)
+      else
+        target_hash.deep_merge!(value)
+      end
+    end
+  end
+end
+
+if EventSource::Helpers.rails_7_1_or_higher?
+  require 'deep_merge/rails_compat'
+else
+  require 'deep_merge'
+end

lib/event_source/protocols/http/faraday_queue_proxy.rb

@@ -49,7 +49,6 @@ def actions
         # @param [Object] subscriber_klass Subscriber class
         # @return [Queue] Queue instance
         def subscribe(subscriber_klass, _options)
-          unique_key = [app_name, formatted_exchange_name].join(delimiter)
           subscription_key = [app_name, formatted_exchange_name].join(delimiter)
           subscriber_suffix = subscriber_klass.name.downcase.gsub('::', '_')
           unique_key = subscription_key + "_#{subscriber_suffix}"

spec/event_source/channel_spec.rb

@@ -96,7 +96,7 @@
     context '.cancel_consumers' do
       before do
         subject.subscribe_operations.values.each do |sub_op|
-          subscriber_klass = double('SubscriberKlass')
+          subscriber_klass = double('SubscriberKlass', name: "SubscriberKlass")
           sub_op.subscribe(subscriber_klass)
         end
       end

spec/event_source/connection_manager_spec.rb

@@ -116,7 +116,7 @@
               connection.start unless connection.active?
               connection.add_channels(async_api_channels)
               channel.subscribe_operations.values.each do |sub_op|
-                subscriber_klass = double('SubscriberKlass')
+                subscriber_klass = double('SubscriberKlass', name: "SubscriberKlass")
                 sub_op.subscribe(subscriber_klass)
               end
             end

spec/rails_app/spec/railtie_spec.rb

@@ -58,7 +58,7 @@
       connection.add_channels(async_api_channels)
 
       channel.subscribe_operations.each_value do |subscribe_operation|
-        subscriber_klass = double('SubscriberKlass')
+        subscriber_klass = double('SubscriberKlass', name: "SubscriberKlass")
         subscribe_operation.subscribe(subscriber_klass)
       end