cityhash 0.8.0 → 0.8.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.8.1 (May 18, 2013) ##
+
+### bugfixes
+  * do not segfalt with non-string input
+  * use proper compiler flag to compile crc version of cityhash lib (see README about installing gem on OSX,
+  on Linux everything should work out of the box)
+
 ## 0.8.0 (May 5, 2013) ##
 
 ### enhancements

data/README.md

@@ -6,6 +6,10 @@ Ruby wrapper for google's cityhash.
 
     gem install cityhash
 
+Since OSX uses `llvm-gcc-4.2` that doesn't support `-march=native` flag you have to compile `cityhash` lib with `clang++` compiler:
+
+    CXX=/usr/bin/clang++ gem install cityhash
+
 ### Usage
 
 ```ruby

data/ext/cityhash/extconf.rb

@@ -1,6 +1,8 @@
 require 'mkmf'
 
-%w{g O3 Wall msse4.2}.each do |flag|
+RbConfig::MAKEFILE_CONFIG['CXX'] = ENV['CXX'] if ENV['CXX']
+
+%w{g O3 Wall march=native}.each do |flag|
   flag = "-#{flag}"
   $CPPFLAGS += " #{flag}" unless $CPPFLAGS.split.include? flag
 end

data/lib/cityhash.rb

@@ -6,16 +6,22 @@ module CityHash
   HIGH64_MASK = 0xffffffffffffffff0000000000000000
 
   def self.hash32(input)
+    input = input.to_s
+
     Internal.hash32(input)
   end
 
   def self.hash64(input, seed1=nil, seed2=nil)
+    input = input.to_s
+
     return Internal.hash64(input) if seed1.nil?
     return Internal.hash64_with_seed(input, seed1.to_i) if seed2.nil?
     Internal.hash64_with_seeds(input, seed1.to_i, seed2.to_i)
   end
 
   def self.hash128(input, seed=nil)
+    input = input.to_s
+
     digest = if seed
       Internal.hash128_with_seed(input, packed_seed(seed))
     else
@@ -26,6 +32,8 @@ module CityHash
   end
 
   def self.hash128crc(input, seed=nil)
+    input = input.to_s
+
     digest = if seed
       Internal.hash128crc_with_seed(input, packed_seed(seed))
     else
@@ -36,6 +44,7 @@ module CityHash
   end
 
   def self.hash256crc(input)
+    input = input.to_s
     digest = Internal.hash256crc(input)
 
     [0..7, 8..15, 16..23].map { |r| digest[r].unpack('Q').first.to_s }.join.to_i

data/lib/cityhash/version.rb

@@ -1,3 +1,3 @@
 module CityHash
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/test/cityhash_test.rb

@@ -9,33 +9,37 @@ describe CityHash do
     assert_equal 8581389452482819506, CityHash.hash64("test")
   end
 
-  it "returns 64bit hash with a seed" do
+  it 'returns 64bit hash with a seed' do
     assert_equal 9154302171269876511, CityHash.hash64("test", 12345)
   end
 
-  it "returns 64bit hash with seeds" do
+  it 'returns 64bit hash with seeds' do
     assert_equal 4854399283587686019, CityHash.hash64("test", 12345, 54321)
   end
 
-  it "returns 128bit hash" do
+  it 'returns 128bit hash' do
     assert_equal 124124989950401219618153994964897029896, CityHash.hash128("test")
   end
 
-  it "returns 128bit hash with seed" do
+  it 'returns 128bit hash with seed' do
     seed = (123 << 64) | 123
     assert_equal 1834994000056895780313918994795281207519, CityHash.hash128("test", seed)
   end
 
-  it "returns 128bit crc hash" do
+  it 'returns 128bit crc hash' do
     assert_equal 124124989950401219618153994964897029896, CityHash.hash128crc("test")
   end
 
-  it "returns 128bit crc hash with seed" do
+  it 'returns 128bit crc hash with seed' do
     seed = (123 << 64) | 123
     assert_equal 1834994000056895780313918994795281207519, CityHash.hash128crc("test", seed)
   end
 
-  it "returns 256bit crc hash" do
+  it 'returns 256bit crc hash' do
     assert_equal 11964743055457135893972873789222488394617411264226841264756, CityHash.hash256crc("test")
   end
+
+  it 'converts input data to string' do
+    assert_equal CityHash.hash128('1337'), CityHash.hash128(1337)
+  end
 end

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cityhash
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.8.1
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 0
-  version: 0.8.0
 platform: ruby
-authors: 
+authors:
 - Vasiliy Ermolovich
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-05 00:00:00 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies: []
-
 description: ruby bindings for google's cityhash
-email: 
+email:
 - younash@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/cityhash/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -47,37 +38,34 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/nashby/cityhash
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3315565900202712629
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3315565900202712629
 requirements: []
-
 rubyforge_project: cityhash
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ruby bindings for google's cityhash
-test_files: 
+test_files:
 - test/cityhash_test.rb
 - test/test_helper.rb