cityhash 0.3.0 → 0.4.0

data/README.md

@@ -9,12 +9,16 @@ Ruby wrapper for google's cityhash.
 ### Usage
 
     require 'cityhash'
-	
-    CityHash.hash64("test")               # => 17703940110308125106
-    CityHash.hash64("test", 12345)        # => 14900027982776226655
-    CityHash.hash64("test", 12345, 54321) # => 11136353178704814373
-    CityHash.hash128("test") # => 130554790001792308794529643941127319555
-    CityHash.hash128("test", [123,123]) # => 183946415266487905135364192266033899899 
+    
+    text = "test"
+    seed1 = 12345
+    seed2 = 54321
+    
+    CityHash.hash64(text)               # => 17703940110308125106
+    CityHash.hash64(text, seed1)        # => 14900027982776226655
+    CityHash.hash64(text, seed1, seed2) # => 11136353178704814373
+    CityHash.hash128(text)              # => 130554790001792308794529643941127319555
+    CityHash.hash128(text, seed1)       # => 1238187875708097619810923284135194760226
 	
 ### Contributing to cityhash
  

data/cityhash.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cityhash}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nashby"]

data/lib/cityhash.rb

@@ -1,6 +1,10 @@
 require 'ffi'
 
 module CityHash
+
+  LOW64_MASK  = 0x0000000000000000ffffffffffffffff
+  HIGH64_MASK = 0xffffffffffffffff0000000000000000
+
   module Internal
     extend FFI::Library
 
@@ -16,40 +20,34 @@ module CityHash
     input_str = input.to_s
 
     # Ruby 1.8 compatibility
-    len = 0
     if input_str.respond_to?(:bytesize)
       len = input_str.bytesize
     else
       len = input_str.size
     end
 
-    if seed1.nil?
-      return CityHash::Internal.city_hash64(input_str, len)
-    end
+    return CityHash::Internal.city_hash64(input_str, len) if seed1.nil? 
+    return CityHash::Internal.city_hash64_with_seed(input_str, len, seed1.to_i & LOW64_MASK) if seed2.nil?
 
-    if seed2.nil?
-      return CityHash::Internal.city_hash64_with_seed(input_str, len, seed1.to_i)
-    end
-
-    return CityHash::Internal.city_hash64_with_seeds(input_str, len, seed1.to_i, seed2.to_i)
+    CityHash::Internal.city_hash64_with_seeds(input_str, len, seed1.to_i & LOW64_MASK, seed2.to_i & LOW64_MASK)
   end
 
-  def self.hash128(input, seed = [])
+  def self.hash128(input, seed = nil)
     input_str = input.to_s
 
     # Ruby 1.8 compatibility
-    len = 0
     if input_str.respond_to?(:bytesize)
       len = input_str.bytesize
     else
       len = input_str.size
     end
 
-    if seed.empty?
-      return CityHash::Internal.city_hash128(input_str, len).to_i
-    end
+    return CityHash::Internal.city_hash128(input_str, len).to_i if seed.nil?
+
+    seed_low  =  seed.to_i & LOW64_MASK
+    seed_high = (seed.to_i & HIGH64_MASK) >> 64
 
-    return CityHash::Internal.city_hash128_with_seed(input_str, len, seed[0].to_i, seed[1].to_i).to_i
+    CityHash::Internal.city_hash128_with_seed(input_str, len, seed_low, seed_high).to_i
   end
 
 end

data/lib/cityhash/version.rb

@@ -2,7 +2,7 @@ module CityHash
  
   module Version
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     BUILD = nil
 

data/test/test_cityhash.rb

@@ -19,7 +19,8 @@ class TestCityhash < Test::Unit::TestCase
   end
 
   should "return 128bit hash with seed" do
-    assert_equal 183946415266487905135364192266033899899, CityHash.hash128("test", [123,123])
+    seed = (123 << 64) | 123
+    assert_equal 183946415266487905135364192266033899899, CityHash.hash128("test", seed)
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: cityhash
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - nashby
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -308570463
+      hash: 282303183
       segments: 
       - 0
       version: "0"