murmurhash3 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a1a6909f920c21b919ae761a9fc5411737ef6ec
-  data.tar.gz: c474084ff76de915232898081b4238d661cbd0e8
+  metadata.gz: dc1eb26dcf133d8d15e55951ce0f818dbc9ee2b0
+  data.tar.gz: f3281c6c42e173c307f3ddbbf4618af4c3e36e41
 SHA512:
-  metadata.gz: 523e834202901d89ce19b8fc0f33ee2769ff58040df511ede60b1c3a9064a6215da7d0065d1eb9799b25d164b713b915ee1c1daa6b5ade013ba49d671856b128
-  data.tar.gz: a447525272ea4c59fa1f3c68140c128949ef00359838d861ad059726ff45607612f7ed04eb8d4c9f1d09c524bb79e98ce9744feb2ddf2c65f8dc14e46e3ed82d
+  metadata.gz: 3e85d8b4ea683f0b50216ef68256fa8d3377fdda8559f91c56fe6684edf83f8b02be1fdc2fb1d63c1202fda0460d3967ef4ff7f61b58d463e96139f10d3d4ff4
+  data.tar.gz: bedd27dc2dd6e57d9078213d74285e7d0bc76d5b5d876fc44c555f5c50ff947386b4844f6938dc878b0bd5645808839dd146484a55fd57a472c3512648a6b388

data/ext/murmurhash3/extconf.rb

@@ -1,6 +1,6 @@
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
   require 'mkmf'
-  create_makefile("native_murmur")
+  create_makefile("native")
 else
   File.open(File.dirname(__FILE__) + "/Makefile", 'w') do |f|
     f.write("install:\n\t")

data/ext/murmurhash3/murmur3.c

@@ -611,8 +611,7 @@ rb_murmur3_128_int64_hash(int argc, VALUE* argv, VALUE self)
 }
 
 void
-Init_native_murmur() {
-    VALUE singleton;
+Init_native() {
     VALUE mod_murmur = rb_define_module("MurmurHash3");
     VALUE mod_murmur32 = rb_define_module_under(mod_murmur, "Native32");
     VALUE mod_murmur128 = rb_define_module_under(mod_murmur, "Native128");
@@ -625,17 +624,6 @@ Init_native_murmur() {
     rb_define_method(mod_murmur32, "murmur3_32_int32_hash", rb_murmur3_32_int32_hash, -1);
     rb_define_method(mod_murmur32, "murmur3_32_int64_hash", rb_murmur3_32_int64_hash, -1);
 
-    rb_extend_object(mod_murmur32, mod_murmur32);
-    singleton = rb_singleton_class(mod_murmur32);
-    rb_define_alias(singleton, "fmix", "murmur3_32_fmix");
-    rb_define_alias(singleton, "str_hash", "murmur3_32_str_hash");
-    rb_define_alias(singleton, "str_digest", "murmur3_32_str_digest");
-    rb_define_alias(singleton, "str_hexdigest", "murmur3_32_str_hexdigest");
-    rb_define_alias(singleton, "str_base64digest", "murmur3_32_str_base64digest");
-    rb_define_alias(singleton, "int32_hash", "murmur3_32_int32_hash");
-    rb_define_alias(singleton, "int64_hash", "murmur3_32_int64_hash");
-
-
     rb_define_method(mod_murmur128, "murmur3_128_fmix", rb_fmix64, 1);
     rb_define_method(mod_murmur128, "murmur3_128_str_hash", rb_murmur3_128_str_hash, -1);
     rb_define_method(mod_murmur128, "murmur3_128_str_digest", rb_murmur3_128_str_digest, -1);
@@ -643,15 +631,4 @@ Init_native_murmur() {
     rb_define_method(mod_murmur128, "murmur3_128_str_base64digest", rb_murmur3_128_str_base64digest, -1);
     rb_define_method(mod_murmur128, "murmur3_128_int32_hash", rb_murmur3_128_int32_hash, -1);
     rb_define_method(mod_murmur128, "murmur3_128_int64_hash", rb_murmur3_128_int64_hash, -1);
-
-    rb_extend_object(mod_murmur128, mod_murmur128);
-    singleton = rb_singleton_class(mod_murmur128);
-    rb_define_alias(singleton, "fmix", "murmur3_128_fmix");
-    rb_define_alias(singleton, "str_hash", "murmur3_128_str_hash");
-    rb_define_alias(singleton, "str_digest", "murmur3_128_str_digest");
-    rb_define_alias(singleton, "str_hexdigest", "murmur3_128_str_hexdigest");
-    rb_define_alias(singleton, "str_base64digest", "murmur3_128_str_base64digest");
-    rb_define_alias(singleton, "int32_hash", "murmur3_128_int32_hash");
-    rb_define_alias(singleton, "int64_hash", "murmur3_128_int64_hash");
-
 }

data/lib/murmurhash3/aliaser.rb

@@ -0,0 +1,30 @@
+module MurmurHash3
+  module Alias32
+    def self.included(base)
+      base.send(:extend, base)
+      class << base
+        alias fmix murmur3_32_fmix
+        alias str_hash murmur3_32_str_hash
+        alias str_digest murmur3_32_str_digest
+        alias str_hexdigest murmur3_32_str_hexdigest
+        alias str_base64digest murmur3_32_str_base64digest
+        alias int32_hash murmur3_32_int32_hash
+        alias int64_hash murmur3_32_int64_hash
+      end
+    end
+  end
+  module Alias128
+    def self.included(base)
+      base.send(:extend, base)
+      class << base
+        alias fmix murmur3_128_fmix
+        alias str_hash murmur3_128_str_hash
+        alias str_digest murmur3_128_str_digest
+        alias str_hexdigest murmur3_128_str_hexdigest
+        alias str_base64digest murmur3_128_str_base64digest
+        alias int32_hash murmur3_128_int32_hash
+        alias int64_hash murmur3_128_int64_hash
+      end
+    end
+  end
+end

data/lib/murmurhash3/native_murmur.rb

@@ -0,0 +1,11 @@
+require 'murmurhash3/aliaser'
+require 'murmurhash3/native'
+
+module MurmurHash3
+  module Native32
+    include MurmurHash3::Alias32
+  end
+  module Native128
+    include MurmurHash3::Alias128
+  end
+end

data/lib/murmurhash3/native_ruby.rb

@@ -0,0 +1,15 @@
+require 'murmurhash3/aliaser'
+if RUBY_ENGINE == 'jruby'
+  require 'murmurhash3/native'
+else
+  require 'murmurhash3/native'
+end
+
+module MurmurHash3
+  module Native32
+    include MurmurHash3::Alias32
+  end
+  #module Native128
+  #  include MurmurHash3::Alias128
+  #end
+end

data/lib/murmurhash3/pure_ruby.rb

@@ -1,4 +1,4 @@
-require 'digest'
+require 'murmurhash3/aliaser'
 module MurmurHash3
   module PureRuby32
     MASK32 = 0xffffffff
@@ -64,17 +64,7 @@ module MurmurHash3
     def murmur3_32_str_base64digest(str, seed=0)
       [[str_hash(str, seed)].pack("V")].pack("m").chomp!
     end
-
-    class << self
-      include MurmurHash3::PureRuby32
-      alias fmix murmur3_32_fmix
-      alias str_hash murmur3_32_str_hash
-      alias str_digest murmur3_32_str_digest
-      alias str_hexdigest murmur3_32_str_hexdigest
-      alias str_base64digest murmur3_32_str_base64digest
-      alias int32_hash murmur3_32_int32_hash
-      alias int64_hash murmur3_32_int64_hash
-    end
+    include MurmurHash3::Alias32
   end
 
   module PureRuby128
@@ -170,16 +160,6 @@ module MurmurHash3
     def murmur3_128_str_base64digest(str, seed=0)
       [str_hash(str, seed).pack("V4")].pack('m').chomp!
     end
-
-    class << self
-      include MurmurHash3::PureRuby128
-      alias fmix murmur3_128_fmix
-      alias str_hash murmur3_128_str_hash
-      alias str_digest murmur3_128_str_digest
-      alias str_hexdigest murmur3_128_str_hexdigest
-      alias str_base64digest murmur3_128_str_base64digest
-      alias int32_hash murmur3_128_int32_hash
-      alias int64_hash murmur3_128_int64_hash
-    end
+    include MurmurHash3::Alias128
   end
 end

data/lib/murmurhash3/version.rb

@@ -1,3 +1,3 @@
 module MurmurHash3
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: murmurhash3
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Sokolov Yura 'funny-falcon'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
-dependencies: []
+date: 2014-12-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: implementation of murmur3 hashing function
 email:
 - funny.falcon@gmail.com
@@ -21,6 +35,9 @@ files:
 - ext/murmurhash3/extconf.rb
 - ext/murmurhash3/murmur3.c
 - lib/murmurhash3.rb
+- lib/murmurhash3/aliaser.rb
+- lib/murmurhash3/native_murmur.rb
+- lib/murmurhash3/native_ruby.rb
 - lib/murmurhash3/pure_ruby.rb
 - lib/murmurhash3/version.rb
 - test/test_murmur.rb
@@ -37,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="