Update AdapterBuilter for Ruby >= 3

flippercloud · Dec 19, 2023 · 93e581b · 93e581b
1 parent 55746f7
commit 93e581b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/lib/flipper/adapter_builder.rb b/lib/flipper/adapter_builder.rb
@@ -17,24 +17,12 @@ def initialize(&block)
       block.arity == 0 ? instance_eval(&block) : block.call(self) if block
     end
 
-    if RUBY_VERSION >= '3.0'
-      def use(klass, *args, **kwargs, &block)
-        @stack.push ->(adapter) { klass.new(adapter, *args, **kwargs, &block) }
-      end
-    else
-      def use(klass, *args, &block)
-        @stack.push ->(adapter) { klass.new(adapter, *args, &block) }
-      end
+    def use(klass, *args, **kwargs, &block)
+      @stack.push ->(adapter) { klass.new(adapter, *args, **kwargs, &block) }
     end
 
-    if RUBY_VERSION >= '3.0'
-      def store(adapter, *args, **kwargs, &block)
-        @store = adapter.respond_to?(:call) ? adapter : -> { adapter.new(*args, **kwargs, &block) }
-      end
-    else
-      def store(adapter, *args, &block)
-        @store = adapter.respond_to?(:call) ? adapter : -> { adapter.new(*args, &block) }
-      end
+    def store(adapter, *args, **kwargs, &block)
+      @store = adapter.respond_to?(:call) ? adapter : -> { adapter.new(*args, **kwargs, &block) }
     end
 
     def to_adapter

diff --git a/lib/flipper/configuration.rb b/lib/flipper/configuration.rb
@@ -31,14 +31,8 @@ def adapter(&block)
     end
 
     # An adapter to use to augment the primary storage adapter. See `AdapterBuilder#use`
-    if RUBY_VERSION >= '3.0'
-      def use(klass, *args, **kwargs, &block)
-        @builder.use(klass, *args, **kwargs, &block)
-      end
-    else
-      def use(klass, *args, &block)
-        @builder.use(klass, *args, &block)
-      end
+    def use(klass, *args, **kwargs, &block)
+      @builder.use(klass, *args, **kwargs, &block)
     end
 
     # Controls the default instance for flipper. When used with a block it