ruby3-backward-compatibility 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71b8fde08a5679223c87ba0b616e5dee7b2cce0ffac9f5e53baaa635b561764
-  data.tar.gz: 2ca101eaa3eea34e3f8095300c2f7a2e19220f3c96c16f192d5aa30399044159
+  metadata.gz: 6a63c38a468a5c3aac7da7774abed32e9878d46ab60fcce3b842f21526b483bf
+  data.tar.gz: 54776548a860546d7f63426e55794e0061ccb7784712469b5fe2260d904b0b3f
 SHA512:
-  metadata.gz: 0d8dc055e1f103f718bcb1674b408499bed79063dccde3aba4b919ec2c3cabd775d53a2b3434194b994c35a01ce7e2ec0cc0f0e97c70d8be1a0b5be368ca4ca4
-  data.tar.gz: c56faddac8e64cb4603ddce56ad102727335e2e80370decca5808c6fad71bdb99a38b64da2d728af2b09713fcfd3ce4cb5dcdb7432b531963091127401cf875e
+  metadata.gz: 5648d5b980179b3a2ccac12175e96db04ac6e3d2c91f980c3da34195db91c91a730b192282e3774e31604dd8ed15e6b2fdf49fbe43cdee24e7d67c92473350dd
+  data.tar.gz: ee03c7f8bbdc69fb6529f0104112a85b4b2bd6a3af24b19a4d1becd27316876c66930ae7457befb6fc9055e89aaa496c96ef000bd367f068421873cd52917371

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.2.1] - 2022-11-04
+
+- Fix `ruby3_keywords` for prepended methods.
+
 ## [0.2.0] - 2022-10-26
 
 - Add `ruby3_backward_compatibility/compatibility/i18n`.

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    ruby3-backward-compatibility (0.2.0)
+    ruby3-backward-compatibility (0.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (11.1.3)
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     i18n (1.12.0)
@@ -29,6 +30,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  byebug
   i18n
   rake (~> 13.0)
   rspec (~> 3.0)

data/README.md

@@ -133,7 +133,7 @@ Psych version 4 (default for Ruby 3.1) has two changes:
 To alias `Psych.unsafe_load` as `Psych.load`, and to allow both styles of calling `Psych.safe_load`, use
 
 ```
-require 'ruby3_backward_compatibility/psych'
+require 'ruby3_backward_compatibility/compatibility/psych'
 ```
 
 **Attention:** There has been a very good reason why Psych renamed the `.load` method: You may never use `.load` on any external strings. It is possible to create valid YAML strings that lead to the execution of arbitrary code, so calling `YAML.load` on user input is a major security vulnerability.

data/bin/rspec

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/ruby3_backward_compatibility/compatibility/i18n.rb

@@ -1,9 +1,7 @@
 require 'i18n'
 
-module I18n
-  class << self
-    extend Ruby3BackwardCompatibility::Ruby3Keywords
+module I18n::Base
+  extend Ruby3BackwardCompatibility::Ruby3Keywords
 
-    ruby3_keywords :translate, :translate!, :localize, :t, :l, :transliterate
-  end
+  ruby3_keywords :translate, :translate!, :localize, :t, :l, :transliterate
 end

data/lib/ruby3_backward_compatibility/ruby3_keywords.rb

@@ -1,27 +1,45 @@
 module Ruby3BackwardCompatibility
   module Ruby3Keywords
+    def self.find_owned_instance_method(mod, method_name)
+      method = mod.send(:instance_method, method_name)
+      while method.owner > mod
+        # we found the method in a prepended module
+        super_method = method.super_method
+        if super_method.nil?
+          warn "Called `ruby3_keywords #{method_name.inspect}` on `#{mod}`, which appears not to be the correct owner. Did you mean to call it on `#{method.owner}`?"
+          return method
+        else
+          method = super_method
+        end
+      end
+      method
+    end
+
     def self.extended(by)
       # prepend the anonymous module now, so the user has a chance to control where exactly we will end 
       # up in the prepend chain...
       by.send(:_ruby3_keywords_module)
     end
 
-    def ruby3_keywords(*methods)
-      methods.each do |method|
-        method_is_private = private_instance_methods.include?(method)
-        method_is_protected = protected_instance_methods.include?(method)
+    def ruby3_keywords(*method_names)
+      method_names.each do |method_name|
+        method_is_private = private_instance_methods.include?(method_name)
+        method_is_protected = protected_instance_methods.include?(method_name)
 
-        _ruby3_keywords_module.define_method(method) do |*args, **keyword_args|
-          if args.last.is_a?(Hash)
-            keyword_args.merge!(args.pop)
+        required_param_count = Ruby3Keywords.find_owned_instance_method(self, method_name).parameters.sum { |(kind, _name)| kind == :req ? 1 : 0 }
+        _ruby3_keywords_module.define_method(method_name) do |*args|
+          if args.last.respond_to?(:to_hash) && args.size > required_param_count
+            keyword_args = args.pop
+            super(*args, **keyword_args)
+          else
+            super(*args)
           end
-          super(*args, **keyword_args)
         end
 
         if method_is_private
-          _ruby3_keywords_module.send(:private, method)
+          _ruby3_keywords_module.send(:private, method_name)
         elsif method_is_protected
-          _ruby3_keywords_module.send(:protected, method)
+          _ruby3_keywords_module.send(:protected, method_name)
         end
       end
     end

data/lib/ruby3_backward_compatibility/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruby3BackwardCompatibility
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/ruby3-backward-compatibility.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Uncomment to register a new dependency of your gem
-  # spec.add_dependency 'example-gem', '~> 1.0'
+  spec.add_development_dependency 'byebug'
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby3-backward-compatibility
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
-dependencies: []
+date: 2022-11-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - tobias.kraze@makandra.de
@@ -26,6 +40,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - lib/ruby3_backward_compatibility.rb
 - lib/ruby3_backward_compatibility/compatibility/all.rb