cityhash 0.1.1 → 0.2.0

data/README.rdoc

@@ -10,9 +10,9 @@ Ruby wrapper for google's cityhash.
 
   require 'cityhash'
 	
-  CityHash.city_hash64("test", 4) # => 17703940110308125106
-  CityHash.city_hash64_with_seed("test", 4, 12345) # => 14900027982776226655
-  CityHash.city_hash64_with_seeds("test", 4, 12345, 54321) # => 11136353178704814373
+  CityHash.hash64("test")               # => 17703940110308125106
+  CityHash.hash64("test", 12345)        # => 14900027982776226655
+  CityHash.hash64("test", 12345, 54321) # => 11136353178704814373
 	
 == Contributing to cityhash
  
@@ -24,6 +24,13 @@ Ruby wrapper for google's cityhash.
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+Authors
+=======
+### [Contributors](http://github.com/nashby/cityhash/contributors)
+ - [Johannes Holzfuß](http://github.com/DataWraith)
+
+[Vasiliy Ermolovich](http://github.com/nashby/)<br/>
+
 == Copyright
 
 Copyright (c) 2011 nashby. See LICENSE.txt for

data/cityhash.gemspec

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

data/lib/cityhash.rb

@@ -1,12 +1,55 @@
 require 'ffi'
 
 module CityHash
-  extend FFI::Library
-  
-  ffi_lib File.dirname(__FILE__)+"/cityhash/ext/libcity.so"
-  attach_function :city_hash64, :CityHash64, [:string, :size_t], :uint64
-  attach_function :city_hash64_with_seed, :CityHash64WithSeed, [:string, :size_t, :uint64], :uint64
-  attach_function :city_hash64_with_seeds, :CityHash64WithSeeds, [:string, :size_t, :uint64, :uint64], :uint64
-  attach_function :city_hash128, :CityHash128, [:string, :size_t], :ulong
-  attach_function :city_hash128_with_seed, :CityHash128WithSeed, [:string, :size_t, :ulong], :ulong
+  module Internal
+    extend FFI::Library
+
+    ffi_lib File.dirname(__FILE__)+"/cityhash/ext/libcity.so"
+    attach_function :city_hash64, :CityHash64, [:string, :size_t], :uint64
+    attach_function :city_hash64_with_seed, :CityHash64WithSeed, [:string, :size_t, :uint64], :uint64
+    attach_function :city_hash64_with_seeds, :CityHash64WithSeeds, [:string, :size_t, :uint64, :uint64], :uint64
+    attach_function :city_hash128, :CityHash128, [:string, :size_t], :ulong
+    attach_function :city_hash128_with_seed, :CityHash128WithSeed, [:string, :size_t, :ulong], :ulong
+  end
+
+  def self.hash64(input, seed1 = nil, seed2 = 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 seed1.nil?
+      return CityHash::Internal.city_hash64(input, len)
+    end
+
+    if seed2.nil?
+      return CityHash::Internal.city_hash64_with_seed(input, len, seed1.to_i)
+    end
+
+    return CityHash::Internal.city_hash64_with_seeds(input, len, seed1.to_i, seed2.to_i)
+  end
+
+  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 seed1.nil?
+      return CityHash::Internal.city_hash128(input, len)
+    end
+
+    return CityHash::Internal.city_hash128_with_seed(input, len, seed.to_i)
+  end
+
 end

data/lib/cityhash/ext/src/Makefile

@@ -1,2 +1,2 @@
 all:
-	g++ -shared city.cc -o ../libcity.so
+	g++ -shared -fPIC city.cc -o ../libcity.so

data/lib/cityhash/version.rb

@@ -2,8 +2,8 @@ module CityHash
  
   module Version
     MAJOR = 0
-    MINOR = 1
-    PATCH = 1
+    MINOR = 2
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/test_cityhash.rb

@@ -1,16 +1,17 @@
 require 'helper'
 
 class TestCityhash < Test::Unit::TestCase
+
   should "return 64bit hash" do
-    assert_equal 17703940110308125106, CityHash.city_hash64("test", 4)
+    assert_equal 17703940110308125106, CityHash.hash64("test")
   end
-  
+
   should "return 64bit hash with a seed" do
-    assert_equal 14900027982776226655, CityHash.city_hash64_with_seed("test", 4, 12345)
-  end  
-  
+    assert_equal 14900027982776226655, CityHash.hash64("test", 12345)
+  end
+
   should "return 64bit hash with seeds" do
-    assert_equal 11136353178704814373, CityHash.city_hash64_with_seeds("test", 4, 12345, 54321)
-  end   
-  
+    assert_equal 11136353178704814373, CityHash.hash64("test", 12345, 54321)
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: cityhash
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - nashby
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 223389711
+      hash: 738874061
       segments: 
       - 0
       version: "0"