match_skeleton 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52a61ea103053eb70d87995bab360db6e7557096
-  data.tar.gz: 28407978b5f043b2f180e7166da4b67d005ad64f
+  metadata.gz: 5871a4eea2d9b69ce70caf1e809c1d692059daec
+  data.tar.gz: f370ed11a1ac8b1f8fc8464097671593406188e2
 SHA512:
-  metadata.gz: aea87a97397f62d2f4facb609a264c7f5e57720c54fd2d2914d8354566556d4fa7ea88b98fd097d99f93235f518f757be22b06bd9e9762e6779cc21554a74ea7
-  data.tar.gz: bb95f8a27ea564603d1a5f4438253cd11df97c4c6b28000a420ddcba89c0697790e3b7f391aef2fa7d8bc8cf57cd69c305a378a3c4e621577c6053805230291d
+  metadata.gz: 03c3d685b7f040519c54d9dedabe8657281b01e6b27629b66965eee5ef21ba129149e4afd0cc74bb3d4ccb661b19a502f19431a4b15bfd9296ae7c83eb361565
+  data.tar.gz: 85fa223207412a249af57f807cb5ae7854d4507d98422a337949adc06b4ced66dd707d09db7b4bfddb13119bf4e51367ccb788a20badccccb0e393c171c5ba72

data/ChangeLog

@@ -1,6 +1,12 @@
+-----
+(Version: 1.0.3)
+2016-05-27  Masa Sakano
+ * Fixed a bug in #== for both MatchSkeleton and MatchData in lib/match_skeleton.rb and lib/match_skeleton/match_data.rb that it raises NoMethodErro when a completely different object is given as the argument. test/test_match_skeleton.rb is updated to reflect it.
+
 -----
 (Version: 1.0.2)
 2016-05-19  Masa Sakano
+
  * Fixed 2 bugs of (1) values_at (2) nil captures.
 
 -----

data/lib/match_skeleton/match_data.rb

@@ -14,9 +14,10 @@ class MatchData
   # @param [#string, #regexp, #pre_match] All the methods have to be there. Practically, {MatchSkeleton} and {MatchData}
   # @return [Boolean]
   def ==(obj)
-    (string    == obj.string) &&
-    (regexp    == obj.regexp) &&
-    (pre_match == obj.pre_match)
+    !!((defined?(obj.string)    && string    == obj.string) &&
+       (defined?(obj.regexp)    && regexp    == obj.regexp) &&
+       (defined?(obj.pre_match) && pre_match == obj.pre_match))
+    # nb., defined?() can return nil, and then nil (not false) will be returned.
   end
 
 end

data/lib/match_skeleton.rb

@@ -63,9 +63,10 @@ class MatchSkeleton
   # @return [Boolean]
   # @see #eql?
   def ==(obj)
-    (string    == obj.string) &&
-    (regexp    == obj.regexp) &&
-    (pre_match == obj.pre_match)
+    !!((defined?(obj.string)    && string    == obj.string) &&
+       (defined?(obj.regexp)    && regexp    == obj.regexp) &&
+       (defined?(obj.pre_match) && pre_match == obj.pre_match))
+    # nb., defined?() can return nil, and then nil (not false) will be returned.
   end
 
   # The same as {MatchData#[]}

data/test/test_match_skeleton.rb

@@ -124,11 +124,21 @@ class TestMatchSkeleton < Minitest::Test
     re1 = /g/
     pos = 3
 
+    # Equal with self
     md1 = s.match(re1, pos)
     ms1 = MatchSkeleton.new(md1, s, pos_begin: pos)
     assert_equal true,  (ms1 == md1)
     assert_equal true,  (md1 == ms1)
+    assert_equal true,  (ms1.eql?(ms1))
+    assert_equal true,  (md1.eql?(md1))
     assert_equal false, (ms1.eql?(md1))
+    assert_equal false, (md1.eql?(ms1))
+    # NOTE: Do not use assert() but use assert_equal(false, ...) to test,
+    #   because the result can well be nil, as opposed to false.
+
+    # Equal with something completely different
+    assert_equal false, (md1 == 'random')
+    assert_equal false, (ms1 == 'random')
 
     # pos_begin does not count.
     ms1p = ms1.dup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: match_skeleton
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Masa Sakano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies: []
 description: MatchSkeleton is a class equivalent to MatchData with negligible memory
   use.  As long as the original string is not destructively modified, it behaves almost