Merge pull request #79 from toptal/devx-524-replace-ruby2-keywords-to…

…-support-ruby3 [DEVX-524] Replace obsolete ruby2_keywords def with a gem
toptal · Aug 26, 2022 · 376339a · 376339a
2 parents 83dfdf3 + cc45137
commit 376339a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/granite.gemspec b/granite.gemspec
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'active_data', '~> 1.2.0'
   s.add_runtime_dependency 'activesupport', '>= 5.1', '< 7.1'
   s.add_runtime_dependency 'memoist', '~> 0.16'
+  s.add_runtime_dependency 'ruby2_keywords', '~> 0.0.5'
 
   s.add_development_dependency 'activerecord'
   s.add_development_dependency 'appraisal'

diff --git a/lib/granite.rb b/lib/granite.rb
@@ -1,11 +1,11 @@
 require 'active_support/dependencies'
 require 'action_controller'
+require 'ruby2_keywords'
 
 require 'granite/version'
 require 'granite/config'
 require 'granite/context'
 require 'granite/util'
-require 'granite/ruby3_compatibility'
 
 module Granite
   def self.config

diff --git a/lib/granite/context_proxy/proxy.rb b/lib/granite/context_proxy/proxy.rb
@@ -3,8 +3,6 @@ module ContextProxy
     # Proxy which wraps the following method calls with BA context.
     #
     class Proxy
-      extend Granite::Ruby3Compatibility
-
       def initialize(klass, context)
         @klass = klass
         @context = context

diff --git a/lib/granite/ruby3_compatibility.rb b/lib/granite/ruby3_compatibility.rb