flipper-redis 1.3.3 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a790000c8a290b42d4e92173ddc5e00632c7113b16ca47c4c257d26ee36005aa
-  data.tar.gz: 6e6b7c2d513a8472e6bdc7cb99dff07daaf984751d7c7880bde92622663f95dc
+  metadata.gz: eff5e795ad93b545c0d17244c5dce9b9d1511faa60605586fe91e811f16e3ed3
+  data.tar.gz: 69b59f7b4ef2c9b61e93f7b6a909041b71edfbe6dbe9369dadb0bd0bcc4593dd
 SHA512:
-  metadata.gz: ae7bf6f058f1a54ef97bbc2b3e86e03398d01c65df8f9752c5b0351d476e70d91754680df9223b15162c0dbd9c8cdfeb7ce5f4d40da6c6443915a2c8cecaf777
-  data.tar.gz: 709339de3e5a6cb919a2ae8fbf63f882f16fc06b7339b4fe171aef7d70feb4961031af6269b6fede7877a0bd5d1b96962b3025cc2bd4285ea6abe87ee0d59cc4
+  metadata.gz: 3cdac88dec216e8ddbb4acd27cd8f9531c53ce383d87709e9fb42d9ddeed380610d1874f65e02f630c8534eef8e2625ef8064eba156a92656777fc80ec84edd8
+  data.tar.gz: e6aed049e4ad608df72fb1cb0f477347aa3b136e1b5b4b885477b1a7f63f0d65b2b8802200a223d0f3859ac0dc5890b741ddc2d8b3e5ca27ad74efdac777504f

data/lib/flipper/adapters/redis_shared/methods.rb

@@ -1,8 +1,63 @@
 module Flipper
   module Adapters
     module RedisShared
+      private
+
+      # Safely executes a block with a Redis connection, handling compatibility
+      # issues between different Redis client versions and Rails versions.
+      #
+      # This method exists to fix a compatibility issue between Rails 7.1.* and
+      # Redis versions below 4.7.0. The issue occurs because:
+      #
+      # 1. In Redis versions below 4.7.0, the `with` method is not defined on
+      #    the Redis client, so Flipper would fall back to `yield(@client)`
+      # 2. However, Rails 7.1.* introduced `Object#with` via ActiveSupport,
+      #    which shadows the Redis client's `with` method
+      # 3. Rails 7.1.*'s `Object#with` doesn't pass `self` to the block parameter
+      #    (this was fixed in Rails 7.2.0), causing the block parameter to be `nil`
+      #
+      # This method ensures that:
+      # - For Redis >= 4.7.0: Uses the Redis client's native `with` method
+      # - For ConnectionPool: Uses the ConnectionPool's `with` method
+      # - For Redis < 4.7.0: Falls back to `yield(@client)` to avoid the Rails
+      #   ActiveSupport `Object#with` method
+      #
+      # @see https://github.com/redis/redis-rb/blob/master/CHANGELOG.md#470
+      # @see https://github.com/rails/rails/pull/46681
+      # @see https://github.com/rails/rails/pull/50470
       def with_connection(&block)
-        @client.respond_to?(:with) ? @client.with(&block) : yield(@client)
+        if client_has_correct_with_method?
+          @client.with(&block)
+        else
+          yield(@client)
+        end
+      end
+
+      # Determines if the Redis client has a safe `with` method that can be used
+      # without conflicts with Rails ActiveSupport's `Object#with`.
+      #
+      # This method checks for:
+      # 1. ConnectionPool instances (which have their own `with` method)
+      # 2. Redis instances with version >= 4.7.0 (which have a proper `with` method)
+      #
+      # The method caches its result to avoid repeated checks.
+      #
+      # @return [Boolean] true if the client has a safe `with` method, false otherwise
+      def client_has_correct_with_method?
+        return @client_has_correct_with_method if defined?(@client_has_correct_with_method)
+
+        @client_has_correct_with_method = @client.respond_to?(:with) && (client_is_connection_pool? || client_is_redis_that_has_with?)
+      rescue
+        @client_has_correct_with_method = false
+      end
+
+      def client_is_connection_pool?
+        defined?(ConnectionPool) && @client.is_a?(ConnectionPool)
+      end
+
+      def client_is_redis_that_has_with?
+        @client.is_a?(::Redis) && defined?(::Redis::VERSION) &&
+          ::Gem::Version.new(::Redis::VERSION) >= ::Gem::Version.new('4.7.0')
       end
     end
   end

data/lib/flipper/version.rb

@@ -1,5 +1,5 @@
 module Flipper
-  VERSION = '1.3.3'.freeze
+  VERSION = '1.3.5'.freeze
 
   REQUIRED_RUBY_VERSION = '2.6'.freeze
   NEXT_REQUIRED_RUBY_VERSION = '3.0'.freeze

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: flipper-redis
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.5
 platform: ruby
 authors:
 - John Nunemaker
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,6 @@ extra_rdoc_files: []
 files:
 - examples/redis/basic.rb
 - examples/redis/internals.rb
-- examples/redis/namespaced.rb
 - flipper-redis.gemspec
 - lib/flipper-redis.rb
 - lib/flipper/adapters/redis.rb
@@ -69,7 +68,7 @@ metadata:
   homepage_uri: https://www.flippercloud.io
   source_code_uri: https://github.com/flippercloud/flipper
   bug_tracker_uri: https://github.com/flippercloud/flipper/issues
-  changelog_uri: https://github.com/flippercloud/flipper/releases/tag/v1.3.3
+  changelog_uri: https://github.com/flippercloud/flipper/releases/tag/v1.3.5
   funding_uri: https://github.com/sponsors/flippercloud
 rdoc_options: []
 require_paths:
@@ -85,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Redis feature flag adapter for Flipper
 test_files:

data/examples/redis/namespaced.rb

@@ -1,37 +0,0 @@
-require 'bundler/setup'
-require 'redis-namespace'
-require 'flipper/adapters/redis'
-
-options = {url: 'redis://127.0.0.1:6379'}
-if ENV['REDIS_URL']
-  options[:url] = ENV['REDIS_URL']
-end
-client = Redis.new(options)
-namespaced_client = Redis::Namespace.new(:flipper_namespace, redis: client)
-adapter = Flipper::Adapters::Redis.new(namespaced_client)
-flipper = Flipper.new(adapter)
-
-# Register a few groups.
-Flipper.register(:admins) { |actor| actor.admin? }
-Flipper.register(:early_access) { |actor| actor.early_access? }
-
-# Create a user class that has flipper_id instance method.
-User = Struct.new(:flipper_id)
-
-flipper[:stats].enable
-flipper[:stats].enable_group :admins
-flipper[:stats].enable_group :early_access
-flipper[:stats].enable_actor User.new('25')
-flipper[:stats].enable_actor User.new('90')
-flipper[:stats].enable_actor User.new('180')
-flipper[:stats].enable_percentage_of_time 15
-flipper[:stats].enable_percentage_of_actors 45
-
-flipper[:search].enable
-
-print 'all keys: '
-pp client.keys
-# all keys: ["stats", "flipper_features", "search"]
-puts
-
-puts 'notice how all the keys are namespaced'