From 817afbd987d35e4d65f599270f3b42777698556f Mon Sep 17 00:00:00 2001 From: knu Date: Wed, 25 Oct 2006 08:54:05 +0000 Subject: * ext/digest, test/digest/test_digest.rb: Merge from trunk: - Introduce versioning in Digest::Base API, and prefix C constants with RUBY_ and C type names with rb_ to avoid name clash in writing extensions. - Introduce Digest::Class and Digest::Instance for ease of implementing subclasses and add-ons. - Digest::Instance module requires and assumes that any instance be resettable and clonable. An instance method #new() is added so digest instances work just like digest classes. - The constructor does no longer take an initial string to feed; digest() and hexdigest() now do, instead. This allows digest classes to take their own hashing parameters. - Make some changes to digest() and hexdigest() class methods, which now take extra arguments, which are passed through to the constructor in an internal call. - Add #digest_length/size/length() and #block_length(), - Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256, SHA384 and SHA512, hoping this module would make a decent example of a digest subclass written in Ruby. - Rip BubbleBabble support out of the base class and have a separate module named digest/bubblebabble. - Remove RD documents in favor of newly written and embedded RDoc documentation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/digest/lib/digest.rb | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) (limited to 'ext/digest/lib/digest.rb') diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb index c277a0eea5..578c6f53d4 100644 --- a/ext/digest/lib/digest.rb +++ b/ext/digest/lib/digest.rb @@ -1,27 +1,46 @@ require 'digest.so' module Digest - autoload "MD5", "digest/md5" - autoload "RMD160", "digest/rmd160" - autoload "SHA1", "digest/sha1" - autoload "SHA256", "digest/sha2" - autoload "SHA384", "digest/sha2" - autoload "SHA512", "digest/sha2" + autoload "SHA256", "digest/sha2.so" + autoload "SHA384", "digest/sha2.so" + autoload "SHA512", "digest/sha2.so" - class Base - # creates a digest object and read given file, _name_. + def self.const_missing(name) + begin + require File.join('digest', name.to_s.downcase) + + return Digest.const_get(name) if Digest.const_defined?(name) + rescue LoadError => e + end + + raise NameError, "Digest class not found: Digest::#{name}" + end + + class ::Digest::Class + # creates a digest object and reads a given file, _name_. # # p Digest::SHA256.file("X11R6.8.2-src.tar.bz2").hexdigest # # => "f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534" def self.file(name) - digest = self.new + new.file(name) + end + end + + module Instance + # updates the digest with the contents of a given file _name_ and + # returns self. + def file(name) File.open(name, "rb") {|f| buf = "" while f.read(16384, buf) - digest.update buf + update buf end } - digest + self end end end + +def Digest(name) + Digest.const_get(name) +end -- cgit v1.2.3