ruby3-backward-compatibility 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9eab8bda5ea5cf123ec7370aae33a25c1e6d3fe16976a778152d3fce153931c
-  data.tar.gz: 550c09a1aa034b4899f4e21d69b7a2949ec16c15bce430e6a23acf72eb91ad37
+  metadata.gz: d727adf8f484386c84adf5f03c83b8b8e237d072e9755e34770f4c37c87c3f27
+  data.tar.gz: ccb5329f49247817fbc12f9b72d1a893a57ed53f2c71b7c769d7c397d2e074ec
 SHA512:
-  metadata.gz: 645183527ce9549cebfe84924fcff6d8864088a1ef442fb797f6cc1225f2348aba11c170edb58d7633b396a89d5bb327c2863789bb4b4d893e8c15aaad5900b0
-  data.tar.gz: 6e6382750d9f27dda6195b5cc637bb2dae6b57dfd46ab7afa67dcd0992709017a05771d376f0064b5298db7157ae3cdd8ba1b43ac404df5df6491bafc13ac12b
+  metadata.gz: c92cb15cc48cf8c4c78c73ebad18e980a73cdd889993d68de2a4873666a1f81a6a2715140bddb8a14f8e8b6cfd3270eb7481d9bb33c74c702495606d623ca300
+  data.tar.gz: b8c56baf3948241066277afc1289d9421df3cb8854a11b38f35b5cd18155a51180f1935418e8ed294b82900e14a8e9d33d48452fe226c3eea8be0d6afc237470

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [1.3.0] - 2024-04-16
+
+- Ruby 3.2+: Add back third argument to Regexp.new, to allow passing "n" to set `Regexp::NOENCODING`.
+
 ## [1.2.0] - 2024-04-10
 
 - First release with dedicated suport to Ruby 3.3.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby3-backward-compatibility (1.2.0)
+    ruby3-backward-compatibility (1.3.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -142,6 +142,17 @@ To add them back as no-ops, use
 require 'ruby3_backward_compatibility/compatibility/object'
 ```
 
+### Regexp (Ruby 3.2+)
+
+It was possible to instantiate a Regexp with `Regexp.new('foo', Regexp::IGNORECASE, 'n')`. The last argument used to indicate the encoding in Ruby 1.8. Up to Ruby 3.2 an argument of "n" or "N" indicated a regexp that ignores encoding (same as the Regexp::NOENCODING flag).
+
+In Ruby 3 this raises an `ArgumentError`.
+
+To bring back the old behavior, use
+
+```
+require 'ruby3_backward_compatibility/compatibility/regexp'
+```
 
 ### YAML (Psych)
 

data/lib/ruby3_backward_compatibility/compatibility/all.rb

@@ -7,5 +7,6 @@ require 'ruby3_backward_compatibility/compatibility/fixnum'
 require 'ruby3_backward_compatibility/compatibility/i18n' if defined?(I18n)
 require 'ruby3_backward_compatibility/compatibility/object'
 require 'ruby3_backward_compatibility/compatibility/psych' if defined?(Psych)
+require 'ruby3_backward_compatibility/compatibility/regexp'
 require 'ruby3_backward_compatibility/compatibility/string'
 require 'ruby3_backward_compatibility/compatibility/uri' if defined?(URI)

data/lib/ruby3_backward_compatibility/compatibility/regexp.rb

@@ -0,0 +1,51 @@
+if RUBY_VERSION >= '3.2'
+  # on 3.2 exactly, we get deprecation errors
+  # however, this is somewhat hard to fix, since 3.2 added some different ways to pass "options" that we do not want to rebuild
+
+  module Ruby3BackwardCompatibility
+    module RegexpCompatibility
+      LEGITIMATE_FLAGS = /\A[mix]+\z/
+
+      def self.prepended(by)
+        by.singleton_class.prepend ClassMethods
+      end
+
+      module ClassMethods
+        def new(regexp_or_string, options = NOT_GIVEN, n_flag = NOT_GIVEN, **kwargs)
+          if options == NOT_GIVEN
+            super(regexp_or_string, **kwargs)
+          elsif n_flag == 'n' || n_flag == 'N'
+            unless options.is_a?(Integer)
+              if RUBY_VERSION < '3.3' && options.is_a?(String) && options =~ LEGITIMATE_FLAGS
+                # on Ruby 3.2 we can legitimately have options "mix" treated as flags, so parse them
+                # on Ruby 3.3 this would never have been legitimate, since a third argument would not have been allowed
+                new_options = 0
+                new_options |= Regexp::MULTILINE if options.include?('m')
+                new_options |= Regexp::IGNORECASE if options.include?('i')
+                new_options |= Regexp::EXTENDED if options.include?('x')
+                options = new_options
+              else
+                # on all other Ruby, truish is IGNORECASE
+                options = options ? Regexp::IGNORECASE : 0
+              end
+            end
+            super(regexp_or_string, options | Regexp::NOENCODING, **kwargs)
+          elsif options.is_a?(String)
+            if options =~ LEGITIMATE_FLAGS && n_flag == NOT_GIVEN
+              # this (like any trueish value) would have been "ignore case" in Ruby < 3.2, but now is not
+              # we have to assume this is Ruby 3.2 syntax
+              super(regexp_or_string, options, **kwargs)
+            else
+              # this crashes on Ruby 3.2, so assume it is < 3.2 syntax
+              super(regexp_or_string, true, **kwargs)
+            end
+          else
+            super(regexp_or_string, options, **kwargs)
+          end
+        end
+      end
+    end
+  end
+
+  Regexp.prepend Ruby3BackwardCompatibility::RegexpCompatibility
+end

data/lib/ruby3_backward_compatibility/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby3-backward-compatibility
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -52,6 +52,7 @@ files:
 - lib/ruby3_backward_compatibility/compatibility/i18n.rb
 - lib/ruby3_backward_compatibility/compatibility/object.rb
 - lib/ruby3_backward_compatibility/compatibility/psych.rb
+- lib/ruby3_backward_compatibility/compatibility/regexp.rb
 - lib/ruby3_backward_compatibility/compatibility/string.rb
 - lib/ruby3_backward_compatibility/compatibility/uri.rb
 - lib/ruby3_backward_compatibility/version.rb