diff options
Diffstat (limited to 'ext/digest/bubblebabble/bubblebabble.c')
| -rw-r--r-- | ext/digest/bubblebabble/bubblebabble.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/ext/digest/bubblebabble/bubblebabble.c b/ext/digest/bubblebabble/bubblebabble.c index a7e4d9f7d6..3a03ceced0 100644 --- a/ext/digest/bubblebabble/bubblebabble.c +++ b/ext/digest/bubblebabble/bubblebabble.c @@ -12,8 +12,8 @@ ************************************************/ #include "ruby.h" +#include "digest.h" -static VALUE mDigest, cDigest_Base; static ID id_digest; static VALUE @@ -83,9 +83,6 @@ bubblebabble_str_new(VALUE str_digest) * Digest.bubblebabble(string) -> bubblebabble_string * * Returns a BubbleBabble encoded version of a given _string_. - * - * If extra arguments are given, they are passed to - * Digest::ALGORITHM.digest() along with the _string_. */ static VALUE rb_digest_s_bubblebabble(VALUE klass, VALUE str) @@ -95,12 +92,12 @@ rb_digest_s_bubblebabble(VALUE klass, VALUE str) /* * call-seq: - * Digest::ALGORITHM.bubblebabble(string, ...) -> hash_string + * Digest::Class.bubblebabble(string, ...) -> hash_string * * Returns the BubbleBabble encoded hash value of a given _string_. */ static VALUE -rb_digest_base_s_bubblebabble(int argc, VALUE *argv, VALUE klass) +rb_digest_class_s_bubblebabble(int argc, VALUE *argv, VALUE klass) { return bubblebabble_str_new(rb_funcall2(klass, id_digest, argc, argv)); } @@ -112,7 +109,7 @@ rb_digest_base_s_bubblebabble(int argc, VALUE *argv, VALUE klass) * Returns the resulting hash value in a Bubblebabble encoded form. */ static VALUE -rb_digest_base_bubblebabble(VALUE self) +rb_digest_instance_bubblebabble(VALUE self) { return bubblebabble_str_new(rb_funcall(self, id_digest, 0)); } @@ -124,17 +121,22 @@ rb_digest_base_bubblebabble(VALUE self) void Init_bubblebabble(void) { - mDigest = rb_define_module("Digest"); - cDigest_Base = rb_define_class_under(mDigest, "Base", rb_cObject); + VALUE mDigest, mDigest_Instance, cDigest_Class; + + rb_require("digest"); + + mDigest = rb_path2class("Digest"); + mDigest_Instance = rb_path2class("Digest::Instance"); + cDigest_Class = rb_path2class("Digest::Class"); /* Digest::bubblebabble() */ rb_define_module_function(mDigest, "bubblebabble", rb_digest_s_bubblebabble, 1); - /* Digest::Base::bubblebabble() */ - rb_define_singleton_method(cDigest_Base, "bubblebabble", rb_digest_base_s_bubblebabble, -1); + /* Digest::Class::bubblebabble() */ + rb_define_singleton_method(cDigest_Class, "bubblebabble", rb_digest_class_s_bubblebabble, -1); - /* Digest::Base#bubblebabble() */ - rb_define_method(cDigest_Base, "bubblebabble", rb_digest_base_bubblebabble, 0); + /* Digest::Instance#bubblebabble() */ + rb_define_method(mDigest_Instance, "bubblebabble", rb_digest_instance_bubblebabble, 0); id_digest = rb_intern("digest"); } |