1 files changed, 30 insertions, 11 deletions
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