Update stringscanner specs

Newer stringscanner needs newer specs for deprecated methods
removed in recent releases.

Author: headius

spec/ruby/library/stringscanner/captures_spec.rb

@@ -0,0 +1,36 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+describe "StringScanner#captures" do
+  before do
+    @s = StringScanner.new('Fri Dec 12 1975 14:39')
+  end
+
+  it "returns the array of captured values of the most recent matching" do
+    @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+    @s.captures.should == ["Fri", "Dec", "12"]
+  end
+
+  it "returns nil if the last match fails" do
+    @s.scan(/nope/)
+    @s.captures.should == nil
+  end
+
+  it "returns nil if there is no any match done" do
+    @s.captures.should == nil
+  end
+
+  version_is StringScanner::Version, ""..."3.0.8" do # ruby_version_is ""..."3.3.3"
+    it "returns '' for an optional capturing group if it doesn't match" do
+      @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\s+)?/)
+      @s.captures.should == ["Fri", "Dec", ""]
+    end
+  end
+
+  version_is StringScanner::Version, "3.0.8" do # ruby_version_is "3.3.3"
+    it "returns nil for an optional capturing group if it doesn't match" do
+      @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\s+)?/)
+      @s.captures.should == ["Fri", "Dec", nil]
+    end
+  end
+end

spec/ruby/library/stringscanner/charpos_spec.rb

@@ -0,0 +1,18 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+describe "StringScanner#charpos" do
+  it "returns character index corresponding to the current position" do
+    s = StringScanner.new("abc")
+
+    s.scan_until(/b/)
+    s.charpos.should == 2
+  end
+
+  it "is multi-byte character sensitive" do
+    s = StringScanner.new("abcädeföghi")
+
+    s.scan_until(/ö/)
+    s.charpos.should == 8
+  end
+end

spec/ruby/library/stringscanner/check_spec.rb

@@ -22,4 +22,72 @@
     @s.matched.should == nil
   end
 
+  describe "#[] successive call with a capture group name" do
+    context "when #check was called with a Regexp pattern" do
+      it "returns matched substring when matching succeeded" do
+        @s.check(/(?<a>This)/)
+        @s.should.matched?
+        @s[:a].should == "This"
+      end
+
+      it "returns nil when matching failed" do
+        @s.check(/(?<a>2008)/)
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+    end
+
+    context "when #check was called with a String pattern" do
+      # https://github.com/ruby/strscan/issues/139
+      version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "returns nil when matching succeeded" do
+          @s.check("This")
+          @s.should.matched?
+          @s[:a].should be_nil
+        end
+      end
+      version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+        it "raises IndexError when matching succeeded" do
+          @s.check("This")
+          @s.should.matched?
+          -> { @s[:a] }.should raise_error(IndexError)
+        end
+      end
+
+      it "returns nil when matching failed" do
+        @s.check("2008")
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+
+      it "returns a matching substring when given Integer index" do
+        @s.check("This")
+        @s[0].should == "This"
+      end
+
+      # https://github.com/ruby/strscan/issues/135
+      version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "ignores the previous matching with Regexp" do
+          @s.exist?(/(?<a>This)/)
+          @s.should.matched?
+          @s[:a].should == "This"
+
+          @s.check("This")
+          @s.should.matched?
+          @s[:a].should be_nil
+        end
+      end
+      version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "ignores the previous matching with Regexp" do
+          @s.exist?(/(?<a>This)/)
+          @s.should.matched?
+          @s[:a].should == "This"
+
+          @s.check("This")
+          @s.should.matched?
+          -> { @s[:a] }.should raise_error(IndexError)
+        end
+      end
+    end
+  end
 end

spec/ruby/library/stringscanner/check_until_spec.rb

@@ -2,22 +2,128 @@
 require 'strscan'
 
 describe "StringScanner#check_until" do
-  before :each do
+  before do
     @s = StringScanner.new("This is a test")
   end
 
-  it "returns the same value of scan_until, but don't advances the scan pointer" do
+  it "returns the same value of #scan_until, but don't advances the scan pointer" do
     @s.check_until(/a/).should == "This is a"
     @s.pos.should == 0
-    @s.matched.should == "a"
     @s.check_until(/test/).should == "This is a test"
   end
 
-  ruby_version_is ""..."3.4" do
+  it "sets the last match result" do
+    @s.check_until(/a/)
+
+    @s.pre_match.should == "This is "
+    @s.matched.should == "a"
+    @s.post_match.should == " test"
+  end
+
+  version_is StringScanner::Version, ""..."3.1.1" do # ruby_version_is ""..."3.4"
     it "raises TypeError if given a String" do
       -> {
         @s.check_until('T')
       }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
     end
   end
+
+  version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+    it "searches a substring in the rest part of a string if given a String" do
+      @s.check_until("a").should == "This is a"
+      @s.pos.should == 0
+    end
+
+    # https://github.com/ruby/strscan/issues/131
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.1"
+      it "sets the last match result if given a String" do
+        @s.check_until("a")
+
+        @s.pre_match.should == ""
+        @s.matched.should == "This is a"
+        @s.post_match.should == " test"
+      end
+    end
+
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+      it "sets the last match result if given a String" do
+        @s.check_until("a")
+
+        @s.pre_match.should == "This is "
+        @s.matched.should == "a"
+        @s.post_match.should == " test"
+      end
+    end
+  end
+
+  describe "#[] successive call with a capture group name" do
+    context "when #check_until was called with a Regexp pattern" do
+      it "returns matched substring when matching succeeded" do
+        @s.check_until(/(?<a>This)/)
+        @s.should.matched?
+        @s[:a].should == "This"
+      end
+
+      it "returns nil when matching failed" do
+        @s.check_until(/(?<a>2008)/)
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+    end
+
+    version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+      context "when #check_until was called with a String pattern" do
+        # https://github.com/ruby/strscan/issues/139
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "returns nil when matching succeeded" do
+            @s.check_until("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+          it "raises IndexError when matching succeeded" do
+            @s.check_until("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+
+        it "returns nil when matching failed" do
+          @s.check_until("2008")
+          @s.should_not.matched?
+          @s[:a].should be_nil
+        end
+
+        it "returns a matching substring when given Integer index" do
+          @s.check_until("This")
+          @s[0].should == "This"
+        end
+
+        # https://github.com/ruby/strscan/issues/135
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.check_until("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.check_until("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+      end
+    end
+  end
 end

spec/ruby/library/stringscanner/clear_spec.rb

@@ -8,6 +8,7 @@
 
   it "returns nil if there is no current match" do
     @s[0].should be_nil
+    @s[:wday].should be_nil
   end
 
   it "returns the n-th subgroup in the most recent match" do
@@ -42,12 +43,18 @@
     -> { @s[0..2]}.should raise_error(TypeError)
   end
 
-  it "raises a IndexError when there's no named capture" do
+  it "raises a IndexError when there's no any named capture group in the regexp" do
     @s.scan(/(\w+) (\w+) (\d+) /)
     -> { @s["wday"]}.should raise_error(IndexError)
     -> { @s[:wday]}.should raise_error(IndexError)
   end
 
+  it "raises a IndexError when given a not existing capture group name" do
+    @s.scan(/(?<a>\w+) (?<b>\w+) (?<c>\d+) /)
+    -> { @s["wday"]}.should raise_error(IndexError)
+    -> { @s[:wday]}.should raise_error(IndexError)
+  end
+
   it "returns named capture" do
     @s.scan(/(?<wday>\w+) (?<month>\w+) (?<day>\d+) /)
     @s["wday"].should == "Fri"

spec/ruby/library/stringscanner/element_reference_spec.rb

@@ -1,7 +1,20 @@
 require_relative '../../spec_helper'
-require_relative 'shared/eos'
 require 'strscan'
 
 describe "StringScanner#eos?" do
-  it_behaves_like :strscan_eos, :eos?
+  before :each do
+    @s = StringScanner.new("This is a test")
+  end
+
+  it "returns true if the scan pointer is at the end of the string" do
+    @s.terminate
+    @s.should.eos?
+
+    s = StringScanner.new('')
+    s.should.eos?
+  end
+
+  it "returns false if the scan pointer is not at the end of the string" do
+    @s.should_not.eos?
+  end
 end