cityhash 0.8.1 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 964373c4e613cd8d4c996f8499e24bb50a919b00
+  data.tar.gz: 743d17ddff4ba29d11209c89af5bfdfc11ba7e8e
+SHA512:
+  metadata.gz: ae99d60b87a15463974003da1ff1f625edb70ba39f40627dd2c6326cad9749a9f5366ea6fbdb79540a5c34557e87dcbf8f0d02b351cd91d92b8f23cb41abe4f5
+  data.tar.gz: ea0f0ae415a26d2ea7828c8347bb7d430bd5ed34dd1584ca27a329577f5ed13511e8aab9238cb6953d99664cb2a5919c4c98f1993ed256c2df5ac5462b51727c

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.9.0 (October 11, 2017) ##
+
+### enhancements
+  * update cityhash lib version
+  * ditch old rubies. support only Ruby 2.0+
+  * let the environment dictate the arch
+  * do not define CRC methods if it's not supported by system
+
 ## 0.8.1 (May 18, 2013) ##
 
 ### bugfixes

data/README.md

@@ -6,10 +6,6 @@ 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
@@ -30,6 +26,12 @@ CityHash.hash128crc(text, seed1)    # => 101668641288246442316643001405184598611
 CityHash.hash256crc(text)           # => 11964743055457135893972873789222488394617411264226841264756
 ```
 
+### Important note
+
+CityHash does not maintain backward compatibility with previous versions. You should not use CityHash for persitent storage, or else never upgrade it. 
+
+If you need backward compatibility please consider other hash functions like [xxHash](https://github.com/nashby/xxhash) or [MurmurHash](https://github.com/ksss/digest-murmurhash)
+
 ### Contributing to cityhash
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/ext/cityhash/city.cc

@@ -59,6 +59,33 @@ static uint32 UNALIGNED_LOAD32(const char *p) {
 #define bswap_32(x) OSSwapInt32(x)
 #define bswap_64(x) OSSwapInt64(x)
 
+#elif defined(__sun) || defined(sun)
+
+#include <sys/byteorder.h>
+#define bswap_32(x) BSWAP_32(x)
+#define bswap_64(x) BSWAP_64(x)
+
+#elif defined(__FreeBSD__)
+
+#include <sys/endian.h>
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+
+#elif defined(__OpenBSD__)
+
+#include <sys/types.h>
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
+
+#elif defined(__NetBSD__)
+
+#include <sys/types.h>
+#include <machine/bswap.h>
+#if defined(__BSWAP_RENAME) && !defined(__bswap_32)
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+#endif
+
 #else
 
 #include <byteswap.h>
@@ -95,8 +122,8 @@ static const uint64 k1 = 0xb492b66fbe98f273ULL;
 static const uint64 k2 = 0x9ae16a3b2f90404fULL;
 
 // Magic numbers for 32-bit hashing.  Copied from Murmur3.
-static const uint32_t c1 = 0xcc9e2d51;
-static const uint32_t c2 = 0x1b873593;
+static const uint32 c1 = 0xcc9e2d51;
+static const uint32 c2 = 0x1b873593;
 
 // A 32-bit to 32-bit integer hash copied from Murmur3.
 static uint32 fmix(uint32 h)
@@ -142,8 +169,9 @@ static uint32 Hash32Len13to24(const char *s, size_t len) {
 static uint32 Hash32Len0to4(const char *s, size_t len) {
   uint32 b = 0;
   uint32 c = 9;
-  for (int i = 0; i < len; i++) {
-    b = b * c1 + s[i];
+  for (size_t i = 0; i < len; i++) {
+    signed char v = s[i];
+    b = b * c1 + v;
     c ^= b;
   }
   return fmix(Mur(b, Mur(len, c)));

data/ext/cityhash/cityhash.cc

@@ -16,27 +16,32 @@ extern "C" VALUE cityhash_hash32(VALUE mod, VALUE input)
 
 extern "C" VALUE cityhash_hash64(VALUE mod, VALUE input)
 {
+  Check_Type(input, T_STRING);
   return ULL2NUM(CityHash64(StringValuePtr(input), RSTRING_LEN(input)));
 }
 
 extern "C" VALUE cityhash_hash64_with_seed(VALUE mod, VALUE input, VALUE seed)
 {
+  Check_Type(input, T_STRING);
   return ULL2NUM(CityHash64WithSeed(StringValuePtr(input), RSTRING_LEN(input), NUM2ULL(seed)));
 }
 
 extern "C" VALUE cityhash_hash64_with_seeds(VALUE mod, VALUE input, VALUE seed1, VALUE seed2)
 {
+  Check_Type(input, T_STRING);
   return ULL2NUM(CityHash64WithSeeds(StringValuePtr(input), RSTRING_LEN(input), NUM2ULL(seed1), NUM2ULL(seed2)));
 }
 
 extern "C" VALUE cityhash_hash128(VALUE mod, VALUE input)
 {
+  Check_Type(input, T_STRING);
   uint128 hash = CityHash128(StringValuePtr(input), RSTRING_LEN(input));
   return rb_str_new((char *)&hash, sizeof(hash));
 }
 
 extern "C" VALUE cityhash_hash128_with_seed(VALUE mod, VALUE input, VALUE seed_string)
 {
+  Check_Type(input, T_STRING);
   uint128 seed = *(uint128 *)StringValuePtr(seed_string);
   uint128 hash = CityHash128WithSeed(StringValuePtr(input), RSTRING_LEN(input), seed);
   return rb_str_new((char *)&hash, sizeof(hash));
@@ -58,7 +63,7 @@ extern "C" VALUE cityhash_hashcrc128_with_seed(VALUE mod, VALUE input, VALUE see
 
 extern "C" VALUE cityhash_hashcrc256(VALUE mod, VALUE input)
 {
-  uint64 hash[3] = {};
+  uint64 hash[4] = {};
   CityHashCrc256(StringValuePtr(input), RSTRING_LEN(input), hash);
   return rb_str_new((char *)&hash, sizeof(hash));
 }

data/ext/cityhash/extconf.rb

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

data/lib/cityhash.rb

@@ -31,23 +31,27 @@ module CityHash
     unpacked_digest(digest)
   end
 
-  def self.hash128crc(input, seed=nil)
-    input = input.to_s
+  if Internal.respond_to?(:hash128crc)
+    def self.hash128crc(input, seed=nil)
+      input = input.to_s
 
-    digest = if seed
-      Internal.hash128crc_with_seed(input, packed_seed(seed))
-    else
-      Internal.hash128crc(input)
-    end
+      digest = if seed
+        Internal.hash128crc_with_seed(input, packed_seed(seed))
+      else
+        Internal.hash128crc(input)
+      end
 
-    unpacked_digest(digest)
+      unpacked_digest(digest)
+    end
   end
 
-  def self.hash256crc(input)
-    input = input.to_s
-    digest = Internal.hash256crc(input)
+  if Internal.respond_to?(:hash256crc)
+    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
+      [0..7, 8..15, 16..23].map { |r| digest[r].unpack('Q').first.to_s }.join.to_i
+    end
   end
 
   private

data/lib/cityhash/version.rb

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

data/test/cityhash_test.rb

@@ -27,19 +27,33 @@ describe CityHash do
   end
 
   it 'returns 128bit crc hash' do
+    skip unless CityHash.respond_to?(:hash128crc)
+
     assert_equal 124124989950401219618153994964897029896, CityHash.hash128crc("test")
   end
 
   it 'returns 128bit crc hash with seed' do
+    skip unless CityHash.respond_to?(:hash128crc)
+
     seed = (123 << 64) | 123
     assert_equal 1834994000056895780313918994795281207519, CityHash.hash128crc("test", seed)
   end
 
   it 'returns 256bit crc hash' do
+    skip unless CityHash.respond_to?(:hash256crc)
+
     assert_equal 11964743055457135893972873789222488394617411264226841264756, CityHash.hash256crc("test")
   end
 
   it 'converts input data to string' do
     assert_equal CityHash.hash128('1337'), CityHash.hash128(1337)
   end
+
+  it 'does not core when you pass it nil' do
+    assert_raises TypeError do
+      CityHash::Internal.hash64(nil)
+    end
+
+    CityHash.hash64(nil)
+  end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cityhash
 version: !ruby/object:Gem::Version
-  version: 0.8.1
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Vasiliy Ermolovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies: []
 description: ruby bindings for google's cityhash
 email:
@@ -19,8 +18,8 @@ extensions:
 - ext/cityhash/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -38,33 +37,26 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/nashby/cityhash
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3315565900202712629
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3315565900202712629
 requirements: []
 rubyforge_project: cityhash
-rubygems_version: 1.8.24
+rubygems_version: 2.5.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ruby bindings for google's cityhash
 test_files:
 - test/cityhash_test.rb