digest-murmurhash 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 635a6c34802609c512789d68c9ebe571df48cc01
-  data.tar.gz: 1a1884fb59d6a9ccfca3c5da969e688589c093f0
+  metadata.gz: 9c86a438d6be0a5ac713575a874d2b468e3b5f0a
+  data.tar.gz: 299f5d61350a387d79ddacc490c00cef42950ef8
 SHA512:
-  metadata.gz: 2633494b6b099a2149deeb3c39af1eb81e80435156bc459b4aee9498ca5209f41ac5a400713b6ae6c762935c5a1d964bc408e63a6e21e0634778d4a78c63f329
-  data.tar.gz: 9c61561046045532d0c8fe863059625cb532d051ea978f16fc63b0bd7fada9fded44900d91642695253d50fd94344c9444d35d5e6715b2956c2078713bcd9fd2
+  metadata.gz: 29cb4f0444b18e28e5034b99f77a8136195382710d0638cacec00eae8eb5b0cbfcfe8e8fc17418d2185293d99182738241551b15ab726a3d8bde0d4bd5d44f4d
+  data.tar.gz: 79d3dc13c2d115862860747214e57607be3a9d060c48bfbb27169e093435817cf264b449fa6e27f02896bc9763a8cda4290da190eb2c545960a4403f6c6e609e

data/README.md

@@ -8,6 +8,8 @@
 
 **Digest::MurmurHash2** use algorithm MurmurHash2(32-bit).
 
+**Digest::MurmurHash2A** use algorithm MurmurHash2A(32-bit).
+
 (**Digest::MurmurHash** exist to write only version number)
 
 All classes compliance Digest API of Ruby.
@@ -36,6 +38,8 @@ p Digest::MurmurHash2.file("./LICENSE.txt").hexdigest #=> '78678326'
 
 **Digest::MurmurHash2** < Digest::StringBuffer
 
+**Digest::MurmurHash2A** < Digest::StringBuffer
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/ext/digest/murmurhash/init.c

@@ -10,7 +10,6 @@ Init_murmurhash(void)
 	VALUE cDigest_MurmurHash1, cDigest_MurmurHash2, cDigest_MurmurHash2A;
 
 	/* Digest::MurmurHash is require that Digest::StringBuffer */
-	rb_require("digest/stringbuffer");
 	mDigest = rb_path2class("Digest");
 	cDigest_StringBuffer = rb_path2class("Digest::StringBuffer");
 
@@ -18,17 +17,23 @@ Init_murmurhash(void)
 	cDigest_MurmurHash1 = rb_define_class_under(mDigest, "MurmurHash1", cDigest_StringBuffer);
 	rb_define_private_method(cDigest_MurmurHash1, "finish", murmur1_finish, 0);
 	rb_define_method(cDigest_MurmurHash1, "to_i", murmur1_to_i, 0);
+	rb_define_singleton_method(cDigest_MurmurHash1, "digest", murmur1_s_digest, -1);
+	rb_define_singleton_method(cDigest_MurmurHash1, "hexdigest", murmur1_s_hexdigest, -1);
 	rb_define_singleton_method(cDigest_MurmurHash1, "rawdigest", murmur1_s_rawdigest, -1);
 
 	/* class Digest::MurmurHash2 < Digest::StringBuffer */
 	cDigest_MurmurHash2 = rb_define_class_under(mDigest, "MurmurHash2", cDigest_StringBuffer);
 	rb_define_private_method(cDigest_MurmurHash2, "finish", murmur2_finish, 0);
 	rb_define_method(cDigest_MurmurHash2, "to_i", murmur2_to_i, 0);
+	rb_define_singleton_method(cDigest_MurmurHash2, "digest", murmur2_s_digest, -1);
+	rb_define_singleton_method(cDigest_MurmurHash2, "hexdigest", murmur2_s_hexdigest, -1);
 	rb_define_singleton_method(cDigest_MurmurHash2, "rawdigest", murmur2_s_rawdigest, -1);
 
 	/* class Digest::MurmurHash2A < Digest::StringBuffer */
 	cDigest_MurmurHash2A = rb_define_class_under(mDigest, "MurmurHash2A", cDigest_StringBuffer);
 	rb_define_private_method(cDigest_MurmurHash2A, "finish", murmur2a_finish, 0);
 	rb_define_method(cDigest_MurmurHash2A, "to_i", murmur2a_to_i, 0);
+	rb_define_singleton_method(cDigest_MurmurHash2A, "digest", murmur2a_s_digest, -1);
+	rb_define_singleton_method(cDigest_MurmurHash2A, "hexdigest", murmur2a_s_hexdigest, -1);
 	rb_define_singleton_method(cDigest_MurmurHash2A, "rawdigest", murmur2a_s_rawdigest, -1);
 }

data/ext/digest/murmurhash/murmurhash.h

@@ -19,5 +19,43 @@ typedef struct {
 		rb_raise(rb_eArgError, "NULL found for " # name " when shouldn't be.'"); \
 	}
 
+/*
+ * from https://github.com/ruby/ruby/blob/trunk/ext/digest/digest.c
+ * Copyright (C) 1995-2001 Yukihiro Matsumoto
+ * Copyright (C) 2001-2006 Akinori MUSHA
+ */
+static VALUE
+hexencode_str_new(VALUE str_digest)
+{
+	char *digest;
+	size_t digest_len;
+	size_t i;
+	VALUE str;
+	char *p;
+	static const char hex[] = {
+		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		'a', 'b', 'c', 'd', 'e', 'f'
+	};
+
+	StringValue(str_digest);
+	digest = RSTRING_PTR(str_digest);
+	digest_len = RSTRING_LEN(str_digest);
+
+	if (LONG_MAX / 2 < digest_len) {
+		rb_raise(rb_eRuntimeError, "digest string too long");
+	}
+
+	str = rb_usascii_str_new(0, digest_len * 2);
+
+	for (i = 0, p = RSTRING_PTR(str); i < digest_len; i++) {
+		unsigned char byte = digest[i];
+
+		p[i + i]     = hex[byte >> 4];
+		p[i + i + 1] = hex[byte & 0x0f];
+	}
+
+	return str;
+}
+
 #endif /* ifndef MURMURHASH_INCLUDED */
 

data/ext/digest/murmurhash/murmurhash1.c

@@ -69,6 +69,37 @@ murmur1_to_i(VALUE self)
 	return UINT2NUM(murmur_hash_process1(ptr->buffer, ptr->p - ptr->buffer));
 }
 
+VALUE
+murmur1_s_digest(int argc, VALUE *argv, VALUE klass)
+{
+	VALUE str;
+	uint32_t h;
+	uint8_t digest[4];
+
+	if (argc < 1)
+		rb_raise(rb_eArgError, "no data given");
+
+	str = *argv++;
+	argc--;
+
+	StringValue(str);
+
+	h = murmur_hash_process1(RSTRING_PTR(str), RSTRING_LEN(str));
+
+	digest[0] = h >> 24;
+	digest[1] = h >> 16;
+	digest[2] = h >> 8;
+	digest[3] = h;
+
+	return rb_str_new((const char*) digest, 4);
+}
+
+VALUE
+murmur1_s_hexdigest(int argc, VALUE *argv, VALUE klass)
+{
+	return hexencode_str_new(murmur1_s_digest(argc, argv, klass));
+}
+
 VALUE
 murmur1_s_rawdigest(int argc, VALUE *argv, VALUE klass)
 {

data/ext/digest/murmurhash/murmurhash1.h

@@ -5,6 +5,8 @@
 
 VALUE murmur1_finish(VALUE self);
 VALUE murmur1_to_i(VALUE self);
+VALUE murmur1_s_digest(int argc, VALUE *argv, VALUE klass);
+VALUE murmur1_s_hexdigest(int argc, VALUE *argv, VALUE klass);
 VALUE murmur1_s_rawdigest(int argc, VALUE *argv, VALUE klass);
 
 #endif /* ifndef MURMURHASH1_INCLUDED */

data/ext/digest/murmurhash/murmurhash2.c

@@ -71,11 +71,41 @@ murmur2_to_i(VALUE self)
 	return UINT2NUM(murmur_hash_process2(ptr->buffer, ptr->p - ptr->buffer));
 }
 
+VALUE
+murmur2_s_digest(int argc, VALUE *argv, VALUE klass)
+{
+	VALUE str;
+	uint32_t h;
+	uint8_t digest[4];
+
+	if (argc < 1)
+		rb_raise(rb_eArgError, "no data given");
+
+	str = *argv++;
+	argc--;
+
+	StringValue(str);
+
+	h = murmur_hash_process2(RSTRING_PTR(str), RSTRING_LEN(str));
+
+	digest[0] = h >> 24;
+	digest[1] = h >> 16;
+	digest[2] = h >> 8;
+	digest[3] = h;
+
+	return rb_str_new((const char*) digest, 4);
+}
+
+VALUE
+murmur2_s_hexdigest(int argc, VALUE *argv, VALUE klass)
+{
+	return hexencode_str_new(murmur2_s_digest(argc, argv, klass));
+}
+
 VALUE
 murmur2_s_rawdigest(int argc, VALUE *argv, VALUE klass)
 {
 	VALUE str;
-	volatile VALUE obj;
 
 	if (argc < 1)
 		rb_raise(rb_eArgError, "no data given");

data/ext/digest/murmurhash/murmurhash2.h

@@ -5,6 +5,8 @@
 
 VALUE murmur2_finish(VALUE self);
 VALUE murmur2_to_i(VALUE self);
+VALUE murmur2_s_digest(int argc, VALUE *argv, VALUE klass);
+VALUE murmur2_s_hexdigest(int argc, VALUE *argv, VALUE klass);
 VALUE murmur2_s_rawdigest(int argc, VALUE *argv, VALUE klass);
 
 #endif /* ifndef MURMURHASH2_INCLUDED */

data/ext/digest/murmurhash/murmurhash2a.c

@@ -65,11 +65,41 @@ murmur2a_to_i(VALUE self)
 	return UINT2NUM(murmur_hash_process2a(ptr->buffer, ptr->p - ptr->buffer));
 }
 
+VALUE
+murmur2a_s_digest(int argc, VALUE *argv, VALUE klass)
+{
+	VALUE str;
+	uint32_t h;
+	uint8_t digest[4];
+
+	if (argc < 1)
+		rb_raise(rb_eArgError, "no data given");
+
+	str = *argv++;
+	argc--;
+
+	StringValue(str);
+
+	h = murmur_hash_process2a(RSTRING_PTR(str), RSTRING_LEN(str));
+
+	digest[0] = h >> 24;
+	digest[1] = h >> 16;
+	digest[2] = h >> 8;
+	digest[3] = h;
+
+	return rb_str_new((const char*) digest, 4);
+}
+
+VALUE
+murmur2a_s_hexdigest(int argc, VALUE *argv, VALUE klass)
+{
+	return hexencode_str_new(murmur2a_s_digest(argc, argv, klass));
+}
+
 VALUE
 murmur2a_s_rawdigest(int argc, VALUE *argv, VALUE klass)
 {
 	VALUE str;
-	volatile VALUE obj;
 
 	if (argc < 1)
 		rb_raise(rb_eArgError, "no data given");

data/ext/digest/murmurhash/murmurhash2a.h

@@ -5,6 +5,8 @@
 
 VALUE murmur2a_finish(VALUE self);
 VALUE murmur2a_to_i(VALUE self);
+VALUE murmur2a_s_digest(int argc, VALUE *argv, VALUE klass);
+VALUE murmur2a_s_hexdigest(int argc, VALUE *argv, VALUE klass);
 VALUE murmur2a_s_rawdigest(int argc, VALUE *argv, VALUE klass);
 
 #endif /* ifndef MURMURHASH2A_INCLUDED */

data/lib/digest/murmurhash.rb

@@ -1,3 +1,4 @@
+require "digest/stringbuffer"
 begin
   require "digest/murmurhash/#{RUBY_VERSION[/\d+.\d+/]}/murmurhash"
 rescue LoadError

data/lib/digest/murmurhash/version.rb

@@ -1,5 +1,5 @@
 module Digest
   class MurmurHash
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digest-murmurhash
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler