Update to ruby/spec@c3677cf

5 files changed, 185 insertions, 11 deletions

diff --git a/spec/ruby/core/matchdata/byteoffset_spec.rb b/spec/ruby/core/matchdata/byteoffset_spec.rb
new file mode 100644
index 0000000000..6036097834
--- /dev/null
+++ b/spec/ruby/core/matchdata/byteoffset_spec.rb
@@ -0,0 +1,95 @@
+require_relative '../../spec_helper'
+
+describe "MatchData#byteoffset" do
+  ruby_version_is "3.2" do
+    it "returns beginning and ending byte-based offset of whole matched substring for 0 element" do
+      m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+      m.byteoffset(0).should == [1, 7]
+    end
+
+    it "returns beginning and ending byte-based offset of n-th match, all the subsequent elements are capturing groups" do
+      m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+
+      m.byteoffset(2).should == [2, 3]
+      m.byteoffset(3).should == [3, 6]
+      m.byteoffset(4).should == [6, 7]
+    end
+
+    it "accepts String as a reference to a named capture" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      m.byteoffset("f").should == [0, 3]
+      m.byteoffset("b").should == [3, 6]
+    end
+
+    it "accepts Symbol as a reference to a named capture" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      m.byteoffset(:f).should == [0, 3]
+      m.byteoffset(:b).should == [3, 6]
+    end
+
+    it "returns [nil, nil] if a capturing group is optional and doesn't match" do
+      m = /(?<x>q..)?/.match("foobarbaz")
+
+      m.byteoffset("x").should == [nil, nil]
+      m.byteoffset(1).should == [nil, nil]
+    end
+
+    it "returns correct beginning and ending byte-based offset for multi-byte strings" do
+      m = /\A\u3042(.)(.)?(.)\z/.match("\u3042\u3043\u3044")
+
+      m.byteoffset(1).should == [3, 6]
+      m.byteoffset(3).should == [6, 9]
+    end
+
+    it "returns [nil, nil] if a capturing group is optional and doesn't match for multi-byte string" do
+      m = /\A\u3042(.)(.)?(.)\z/.match("\u3042\u3043\u3044")
+
+      m.byteoffset(2).should == [nil, nil]
+    end
+
+    it "converts argument into integer if is not String nor Symbol" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      obj = Object.new
+      def obj.to_int; 2; end
+
+      m.byteoffset(1r).should == [0, 3]
+      m.byteoffset(1.1).should == [0, 3]
+      m.byteoffset(obj).should == [3, 6]
+    end
+
+    it "raises IndexError if there is no group with provided name" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      -> {
+        m.byteoffset("y")
+      }.should raise_error(IndexError, "undefined group name reference: y")
+
+      -> {
+        m.byteoffset(:y)
+      }.should raise_error(IndexError, "undefined group name reference: y")
+    end
+
+    it "raises IndexError if index is out of matches" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      -> {
+        m.byteoffset(-1)
+      }.should raise_error(IndexError, "index -1 out of matches")
+
+      -> {
+        m.byteoffset(3)
+      }.should raise_error(IndexError, "index 3 out of matches")
+    end
+
+    it "raises TypeError if can't convert argument into Integer" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      -> {
+        m.byteoffset([])
+      }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+    end
+  end
+end
diff --git a/spec/ruby/core/matchdata/captures_spec.rb b/spec/ruby/core/matchdata/captures_spec.rb
index 58d4620709..f829a25481 100644
--- a/spec/ruby/core/matchdata/captures_spec.rb
+++ b/spec/ruby/core/matchdata/captures_spec.rb
@@ -1,15 +1,6 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
+require_relative 'shared/captures'
 
 describe "MatchData#captures" do
-  it "returns an array of the match captures" do
-    /(.)(.)(\d+)(\d)/.match("THX1138.").captures.should == ["H","X","113","8"]
-  end
-
-  ruby_version_is "3.0" do
-    it "returns instances of String when given a String subclass" do
-      str = MatchDataSpecs::MyString.new("THX1138: The Movie")
-      /(.)(.)(\d+)(\d)/.match(str).captures.each { |c| c.should be_an_instance_of(String) }
-    end
-  end
+  it_behaves_like :matchdata_captures, :captures
 end
diff --git a/spec/ruby/core/matchdata/deconstruct_keys_spec.rb b/spec/ruby/core/matchdata/deconstruct_keys_spec.rb
new file mode 100644
index 0000000000..5b68f886c7
--- /dev/null
+++ b/spec/ruby/core/matchdata/deconstruct_keys_spec.rb
@@ -0,0 +1,65 @@
+require_relative '../../spec_helper'
+
+describe "MatchData#deconstruct_keys" do
+  ruby_version_is "3.2" do
+    it "returns whole hash for nil as an argument" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      m.deconstruct_keys(nil).should == { f: "foo", b: "bar" }
+    end
+
+    it "returns only specified keys" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      m.deconstruct_keys([:f]).should == { f: "foo" }
+    end
+
+    it "requires one argument" do
+      m = /l/.match("l")
+
+      -> {
+        m.deconstruct_keys
+      }.should raise_error(ArgumentError, "wrong number of arguments (given 0, expected 1)")
+    end
+
+    it "it raises error when argument is neither nil nor array" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      -> { m.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array)")
+      -> { m.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array)")
+      -> { m.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array)")
+      -> { m.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array)")
+    end
+
+    it "returns {} when passed []" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      m.deconstruct_keys([]).should == {}
+    end
+
+    it "does not accept non-Symbol keys" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      -> {
+        m.deconstruct_keys(['year', :foo])
+      }.should raise_error(TypeError, "wrong argument type String (expected Symbol)")
+    end
+
+    it "process keys till the first non-existing one" do
+      m = /(?<f>foo)(?<b>bar)(?<c>baz)/.match("foobarbaz")
+
+      m.deconstruct_keys([:f, :a, :b]).should == { f: "foo" }
+    end
+
+    it "returns {} when there are no named captured groups at all" do
+      m = /foo.+/.match("foobar")
+
+      m.deconstruct_keys(nil).should == {}
+    end
+
+    it "returns {} when passed more keys than named captured groups" do
+      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+      m.deconstruct_keys([:f, :b, :c]).should == {}
+    end
+  end
+end
diff --git a/spec/ruby/core/matchdata/deconstruct_spec.rb b/spec/ruby/core/matchdata/deconstruct_spec.rb
new file mode 100644
index 0000000000..6af55113b6
--- /dev/null
+++ b/spec/ruby/core/matchdata/deconstruct_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'shared/captures'
+
+describe "MatchData#deconstruct" do
+  ruby_version_is "3.2" do
+    it_behaves_like :matchdata_captures, :deconstruct
+  end
+end
diff --git a/spec/ruby/core/matchdata/shared/captures.rb b/spec/ruby/core/matchdata/shared/captures.rb
new file mode 100644
index 0000000000..d2c85ece5a
--- /dev/null
+++ b/spec/ruby/core/matchdata/shared/captures.rb
@@ -0,0 +1,15 @@
+require_relative '../../../spec_helper'
+require_relative '../fixtures/classes'
+
+describe :matchdata_captures, shared: true do
+  it "returns an array of the match captures" do
+    /(.)(.)(\d+)(\d)/.match("THX1138.").send(@method).should == ["H","X","113","8"]
+  end
+
+  ruby_version_is "3.0" do
+    it "returns instances of String when given a String subclass" do
+      str = MatchDataSpecs::MyString.new("THX1138: The Movie")
+      /(.)(.)(\d+)(\d)/.match(str).send(@method).each { |c| c.should be_an_instance_of(String) }
+    end
+  end
+end