[GR-17457] Update digest to match methods spec and unexclude passing tests

PullRequest: truffleruby/2385

Author: eregon

lib/truffle/digest.rb

@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
@@ -78,13 +80,17 @@ def new
       copy
     end
 
+    def block_length
+      raise RuntimeError, "#{self.class.name} does not implement block_length()"
+    end
+
     def update(message)
       raise RuntimeError, "#{self.class.name} does not implement update()"
     end
     alias_method :<<, :update
 
     def reset
-      Truffle::Digest.reset @digest
+      raise RuntimeError, "#{self.class.name} does not implement reset()"
     end
 
     def digest(message = NO_MESSAGE)
@@ -103,7 +109,6 @@ def hexdigest(message = NO_MESSAGE)
       Digest.hexencode(digest(message))
     end
     alias_method :to_s, :hexdigest
-    alias_method :to_str, :hexdigest
 
     def digest!
       digested = finish
@@ -122,7 +127,7 @@ def hexdigest!
     end
 
     def digest_length
-      Truffle::Digest.digest_length @digest
+      StringValue(digest).length
     end
 
     def size
@@ -131,7 +136,15 @@ def size
     alias_method :length, :size
 
     def ==(other)
-      hexdigest == other.to_str
+      if Primitive.object_kind_of?(other, Digest::Instance)
+        self_str = self.digest
+        other_str = other.digest
+      else
+        self_str = self.to_s
+        other_str = Truffle::Type.rb_check_convert_type(other, String, :to_str)
+        return false if Primitive.nil?(other_str)
+      end
+      StringValue(self_str) == StringValue(other_str)
     end
 
     def inspect
@@ -154,6 +167,19 @@ def self.hexdigest(str, *args)
   end
 
   class Base < ::Digest::Class
+    def block_length
+      Truffle::Digest.digest_block_length @digest
+    end
+
+    def digest_length
+      Truffle::Digest.digest_length @digest
+    end
+
+    def reset
+      Truffle::Digest.reset @digest
+      self
+    end
+
     def update(str)
       str = StringValue(str)
       Truffle::Digest.update(@digest, str)
@@ -166,50 +192,30 @@ class MD5 < Base
     def initialize
       @digest = Truffle::Digest.md5
     end
-
-    def block_length
-      64
-    end
   end
 
   class SHA1 < Base
     def initialize
       @digest = Truffle::Digest.sha1
     end
-
-    def block_length
-      64
-    end
   end
 
   class SHA256 < Base
     def initialize
       @digest = Truffle::Digest.sha256
     end
-
-    def block_length
-      64
-    end
   end
 
   class SHA384 < Base
     def initialize
       @digest = Truffle::Digest.sha384
     end
-
-    def block_length
-      128
-    end
   end
 
   class SHA512 < Base
     def initialize
       @digest = Truffle::Digest.sha512
     end
-
-    def block_length
-      128
-    end
   end
 
   autoload :SHA2, 'digest/sha2'

spec/tags/truffle/methods_tags.txt

@@ -32,8 +32,6 @@ fails:Public methods on Rational should not include divide
 fails:Public methods on String should include freeze
 fails:Public methods on Digest.singleton_class should include const_missing
 fails:Public methods on Digest::Instance should not include finish
-fails:Public methods on Digest::Instance should not include to_str
-fails:Public methods on Digest::Instance should include block_length
 fails:Public methods on Dir should not include closed?
 fails:Public methods on Exception should include respond_to?
 fails:Public methods on FalseClass should include ===
@@ -62,11 +60,6 @@ fails:Public methods on TracePoint should include instruction_sequence
 fails:Public methods on TracePoint should include parameters
 fails:Public methods on TracePoint should include raised_exception
 fails:Public methods on TracePoint should include return_value
-fails:Public methods on Digest::Base should include block_length
-fails:Public methods on Digest::Base should include digest_length
-fails:Public methods on Digest::Base should include reset
-fails:Public methods on Digest::MD5 should not include block_length
-fails:Public methods on Digest::SHA1 should not include block_length
 fails:Public methods on ENV.singleton_class should include freeze
 fails:Public methods on Enumerator::Lazy should include filter_map
 fails:Public methods on Enumerator::Lazy should include with_index

src/main/java/org/truffleruby/stdlib/digest/DigestAlgorithm.java

@@ -10,18 +10,20 @@
 package org.truffleruby.stdlib.digest;
 
 enum DigestAlgorithm {
-    MD5("MD5", 16),
-    SHA1("SHA1", 20),
-    SHA256("SHA-256", 32),
-    SHA384("SHA-384", 48),
-    SHA512("SHA-512", 64);
+    MD5("MD5", 16, 64),
+    SHA1("SHA1", 20, 64),
+    SHA256("SHA-256", 32, 64),
+    SHA384("SHA-384", 48, 128),
+    SHA512("SHA-512", 64, 128);
 
     private final String name;
     private final int length;
+    private final int blockLength;
 
-    DigestAlgorithm(String name, int length) {
+    DigestAlgorithm(String name, int length, int blockLength) {
         this.name = name;
         this.length = length;
+        this.blockLength = blockLength;
     }
 
     public String getName() {
@@ -31,4 +33,8 @@ public String getName() {
     public int getLength() {
         return length;
     }
+
+    public int getBlockLength() {
+        return blockLength;
+    }
 }

src/main/java/org/truffleruby/stdlib/digest/DigestNodes.java

@@ -159,6 +159,16 @@ private static byte[] cloneAndDigest(MessageDigest digest) {
 
     }
 
+    @CoreMethod(names = "digest_block_length", onSingleton = true, required = 1)
+    public abstract static class DigestBlockLengthNode extends CoreMethodArrayArgumentsNode {
+
+        @Specialization
+        protected int digestBlockLength(RubyDigest digestObject) {
+            return digestObject.algorithm.getBlockLength();
+        }
+
+    }
+
     @CoreMethod(names = "digest_length", onSingleton = true, required = 1)
     public abstract static class DigestLengthNode extends CoreMethodArrayArgumentsNode {
 

test/mri/excludes/TestDigestExtend.rb

@@ -1,4 +1 @@
-exclude :test_block_length, "needs investigation"
-exclude :test_class_reset, "needs investigation"
-exclude :test_digest_length, "needs investigation"
-exclude :test_new, "needs investigation"
+exclude :test_new, "probably not cloning the @digest correctly"

test/mri/failing.exclude

@@ -99,7 +99,6 @@ coverage/test_coverage.rb
 csv/test_encodings.rb # missing ObjectSpace define_finalizer specialization
 csv/test_features.rb # `const_missing': uninitialized constant Zlib::GzipWriter
 csv/test_interface.rb # missing ObjectSpace define_finalizer specialization
-digest/test_digest_extend.rb # all failed
 drb/test_acl.rb
 drb/test_drb.rb
 drb/test_drbssl.rb