digest-murmurhash 1.0.0 → 1.1.0

data/spec/mem_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MurmurHash do
+describe "Digest::MurmurHash" do
   it "gc safe" do
     all_classes.each do |c|
       murmur = c.new

data/spec/spec_helper.rb

@@ -9,15 +9,13 @@ def all_classes
     MurmurHash64A,
     MurmurHash64B,
     MurmurHashNeutral2,
-    MurmurHashAligned2
+    MurmurHashAligned2,
+    MurmurHash3_x86_32,
+    MurmurHash3_x86_128,
+    MurmurHash3_x64_128
   ]
 end
 
-def seed32
-  (0..4).to_a.pack("C4")
+def seed_str(klass)
+  (0..klass::DEFAULT_SEED.length).to_a.pack("C#{klass::DEFAULT_SEED.length}")
 end
-
-def seed64
-  (0..8).to_a.pack("C8")
-end
-

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: digest-murmurhash
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: digest-simple
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,9 +66,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Digest::MurmurHash is class collections of use algorithm MurmurHash desiged
+description: digest-murmurhash is class collections of use algorithm MurmurHash desiged
   by Austin Appleby.
-email: co000ri@gmail.com
+email:
+- co000ri@gmail.com
 executables: []
 extensions:
 - ext/digest/murmurhash/extconf.rb
@@ -95,30 +82,27 @@ files:
 - README.md
 - Rakefile
 - digest-murmurhash.gemspec
+- ext/digest/murmurhash/1.c
+- ext/digest/murmurhash/2.c
+- ext/digest/murmurhash/2a.c
+- ext/digest/murmurhash/3_x64_128.c
+- ext/digest/murmurhash/3_x86_128.c
+- ext/digest/murmurhash/3_x86_32.c
+- ext/digest/murmurhash/64a.c
+- ext/digest/murmurhash/64b.c
+- ext/digest/murmurhash/aligned2.c
 - ext/digest/murmurhash/extconf.rb
-- ext/digest/murmurhash/murmurhash.c
-- ext/digest/murmurhash/murmurhash.h
-- ext/digest/murmurhash/murmurhash1.c
-- ext/digest/murmurhash/murmurhash1.h
-- ext/digest/murmurhash/murmurhash2.c
-- ext/digest/murmurhash/murmurhash2.h
-- ext/digest/murmurhash/murmurhash2a.c
-- ext/digest/murmurhash/murmurhash2a.h
-- ext/digest/murmurhash/murmurhash64a.c
-- ext/digest/murmurhash/murmurhash64a.h
-- ext/digest/murmurhash/murmurhash64b.c
-- ext/digest/murmurhash/murmurhash64b.h
-- ext/digest/murmurhash/murmurhash_aligned2.c
-- ext/digest/murmurhash/murmurhash_aligned2.h
-- ext/digest/murmurhash/murmurhash_neutral2.c
-- ext/digest/murmurhash/murmurhash_neutral2.h
+- ext/digest/murmurhash/init.c
+- ext/digest/murmurhash/init.h
+- ext/digest/murmurhash/neutral2.c
 - lib/digest/murmurhash.rb
+- lib/digest/murmurhash/base.rb
 - spec/bench.rb
 - spec/digest_spec.rb
 - spec/exception_spec.rb
 - spec/mem_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/ksss/digest-murmurhash
 licenses:
 - MIT
 metadata: {}
@@ -141,7 +125,7 @@ rubyforge_project:
 rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: Digest::MurmurHash is class collections of use algorithm MurmurHash desiged
+summary: digest-murmurhash is class collections of use algorithm MurmurHash desiged
   by Austin Appleby.
 test_files:
 - spec/bench.rb

data/ext/digest/murmurhash/murmurhash.h

@@ -1,46 +0,0 @@
-#ifndef MURMURHASH_INCLUDED
-#  define MURMURHASH_INCLUDED
-
-#include "ruby.h"
-
-#if defined(_MSC_VER)
-#  define BIG_CONSTANT(x) (x)
-// Other compilers
-#else   // defined(_MSC_VER)
-#  define BIG_CONSTANT(x) (x##LLU)
-#endif // !defined(_MSC_VER)
-
-#ifdef DYNAMIC_ENDIAN
-  /* for universal binary of NEXTSTEP and MacOS X */
-  /* useless since autoconf 2.63? */
-  static int
-  is_bigendian(void)
-  {
-    static int init = 0;
-    static int endian_value;
-    char *p;
-
-    if (init) return endian_value;
-    init = 1;
-    p = (char*)&init;
-    return endian_value = p[0] ? 0 : 1;
-  }
-#  define BIGENDIAN_P() (is_bigendian())
-#elif defined(WORDS_BIGENDIAN)
-#  define BIGENDIAN_P() 1
-#else
-#  define BIGENDIAN_P() 0
-#endif
-
-#define MURMURHASH_MAGIC 0x5bd1e995
-#define MURMURHASH_MAGIC64A BIG_CONSTANT(0xc6a4a7935bd1e995)
-
-void assign_by_endian_32(uint8_t *digest, uint64_t h);
-void assign_by_endian_64(uint8_t *digest, uint64_t h);
-
-uint32_t _murmur_finish32(VALUE self, uint32_t (*process)(const char *, uint32_t, uint32_t));
-uint64_t _murmur_finish64(VALUE self, uint64_t (*process)(const char *, uint32_t, uint64_t));
-uint32_t _murmur_s_digest32(int argc, VALUE *argv, VALUE klass, uint32_t (*process)(const char *, uint32_t, uint32_t));
-uint64_t _murmur_s_digest64(int argc, VALUE *argv, VALUE klass, uint64_t (*process)(const char *, uint32_t, uint64_t));
-
-#endif /* ifndef MURMURHASH_INCLUDED */

data/ext/digest/murmurhash/murmurhash1.h

@@ -1,11 +0,0 @@
-#ifndef MURMURHASH1_INCLUDED
-#  define MURMURHASH1_INCLUDED
-
-#include "murmurhash.h"
-
-VALUE murmur1_finish(VALUE self);
-VALUE murmur1_s_digest(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.h

@@ -1,11 +0,0 @@
-#ifndef MURMURHASH2_INCLUDED
-#  define MURMURHASH2_INCLUDED
-
-#include "murmurhash.h"
-
-VALUE murmur2_finish(VALUE self);
-VALUE murmur2_s_digest(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.h

@@ -1,11 +0,0 @@
-#ifndef MURMURHASH2A_INCLUDED
-#  define MURMURHASH2A_INCLUDED
-
-#include "murmurhash.h"
-
-VALUE murmur2a_finish(VALUE self);
-VALUE murmur2a_s_digest(int argc, VALUE *argv, VALUE klass);
-VALUE murmur2a_s_rawdigest(int argc, VALUE *argv, VALUE klass);
-
-#endif /* ifndef MURMURHASH2A_INCLUDED */
-

data/ext/digest/murmurhash/murmurhash64a.h

@@ -1,10 +0,0 @@
-#ifndef MURMURHASH64A_INCLUDED
-#  define MURMURHASH64A_INCLUDED
-
-#include "murmurhash.h"
-
-VALUE murmur64a_finish(VALUE self);
-VALUE murmur64a_s_digest(int argc, VALUE *argv, VALUE klass);
-VALUE murmur64a_s_rawdigest(int argc, VALUE *argv, VALUE klass);
-
-#endif /* ifndef MURMURHASH64A_INCLUDED */

data/ext/digest/murmurhash/murmurhash64b.h

@@ -1,11 +0,0 @@
-#ifndef MURMURHASH64B_INCLUDED
-#  define MURMURHASH64B_INCLUDED
-
-#include "murmurhash.h"
-
-VALUE murmur64b_finish(VALUE self);
-VALUE murmur64b_s_digest(int argc, VALUE *argv, VALUE klass);
-VALUE murmur64b_s_rawdigest(int argc, VALUE *argv, VALUE klass);
-
-#endif /* ifndef MURMURHASH64B_INCLUDED */
-

data/ext/digest/murmurhash/murmurhash_aligned2.c

@@ -1,75 +0,0 @@
-/*
- * MurmurHashAligned2 (C) Austin Appleby
- */
-
-#include "murmurhash_aligned2.h"
-
-uint32_t
-murmur_hash_process_aligned2(const char * key, uint32_t len, uint32_t seed)
-{
-  const uint32_t m = 0x5bd1e995;
-  const int r = 24;
-
-  uint32_t h = seed ^ len;
-
-  const unsigned char * data = (const unsigned char *)key;
-
-  while(len >= 4) {
-    uint32_t k;
-
-    k  = data[0];
-    k |= data[1] << 8;
-    k |= data[2] << 16;
-    k |= data[3] << 24;
-
-    k *= m; 
-    k ^= k >> r; 
-    k *= m;
-
-    h *= m;
-    h ^= k;
-
-    data += 4;
-    len -= 4;
-  }
-
-  switch(len) {
-    case 3: h ^= data[2] << 16;
-    case 2: h ^= data[1] << 8;
-    case 1: h ^= data[0];
-            h *= m;
-  };
-
-  h ^= h >> 13;
-  h *= m;
-  h ^= h >> 15;
-
-  return h;
-}
-
-VALUE
-murmur_aligned2_finish(VALUE self)
-{
-  uint8_t digest[4];
-  uint32_t h;
-
-  h = _murmur_finish32(self, murmur_hash_process_aligned2);
-  assign_by_endian_32(digest, h);
-  return rb_str_new((const char*) digest, 4);
-}
-
-VALUE
-murmur_aligned2_s_digest(int argc, VALUE *argv, VALUE klass)
-{
-  uint8_t digest[4];
-  uint64_t h;
-  h = _murmur_s_digest32(argc, argv, klass, murmur_hash_process_aligned2);
-  assign_by_endian_32(digest, h);
-  return rb_str_new((const char*) digest, 4);
-}
-
-VALUE
-murmur_aligned2_s_rawdigest(int argc, VALUE *argv, VALUE klass)
-{
-  return ULL2NUM(_murmur_s_digest32(argc, argv, klass, murmur_hash_process_aligned2));
-}

data/ext/digest/murmurhash/murmurhash_aligned2.h

@@ -1,11 +0,0 @@
-#ifndef MURMURHASH_ALIGNED2_INCLUDED
-#  define MURMURHASH_ALIGNED2_INCLUDED
-
-#include "murmurhash.h"
-
-VALUE murmur_aligned2_finish(VALUE self);
-VALUE murmur_aligned2_s_digest(int argc, VALUE *argv, VALUE klass);
-VALUE murmur_aligned2_s_rawdigest(int argc, VALUE *argv, VALUE klass);
-
-#endif /* ifndef MURMURHASH_ALIGNED2_INCLUDED */
-

data/ext/digest/murmurhash/murmurhash_neutral2.h

@@ -1,11 +0,0 @@
-#ifndef MURMURHASH_NEUTRAL2_INCLUDED
-#  define MURMURHASH_NEUTRAL2_INCLUDED
-
-#include "murmurhash.h"
-
-VALUE murmur_neutral2_finish(VALUE self);
-VALUE murmur_neutral2_s_digest(int argc, VALUE *argv, VALUE klass);
-VALUE murmur_neutral2_s_rawdigest(int argc, VALUE *argv, VALUE klass);
-
-#endif /* ifndef MURMURHASH_NEUTRAL2_INCLUDED */
-