ruby-xxHash 0.0.2 → 0.1.1

data/README.md

@@ -2,7 +2,7 @@
 
 This gem provides a pure Ruby implementation of the XXhash32 hashing algorithm described here: https://code.google.com/p/xxhash/.
 
-It's intended to be source compatible with the Gem provided by nashby: https://github.com/nashby/xxhash
+It's intended to be (mostly) source compatible with the Gem provided by nashby: https://github.com/nashby/xxhash
 
 ## Installation
 
@@ -21,7 +21,7 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-require 'xxhash'
+require 'ruby-xxhash'
 
 text = "test"
 seed = 12345

data/lib/ruby-xxhash.rb

@@ -0,0 +1,128 @@
+require "ruby-xxhash/version"
+
+class XXhash
+  @@mem_total_size = 16
+  @@prime32_1 = 2654435761
+  @@prime32_2 = 2246822519
+  @@prime32_3 = 3266489917
+  @@prime32_4 = 668265263
+  @@prime32_5 = 374761393
+
+  @@thirtytwo1s = (2**32-1)
+
+  def XXhash.xxh32(input, seed = 0)
+    xxh = XXhash.new(seed)
+    xxh.feed(input)
+    xxh.sum32
+  end
+
+  def XXhash.xxh32_stream(io, seed = 0, chunk = 32)
+    xxh = XXhash.new(seed)
+
+    while(data = io.read(chunk))
+      xxh.feed(data)
+    end
+
+    xxh.sum32
+  end
+
+  def initialize seed
+    @seed = seed
+    @v1 = seed + @@prime32_1 + @@prime32_2
+    @v2 = seed + @@prime32_2
+    @v3 = seed + 0
+    @v4 = seed - @@prime32_1
+    @total_len = 0
+    @memory = Array.new(@@mem_total_size)
+    @memsize = 0
+  end
+
+
+  def feed bytes
+    if String === bytes
+      bytes = bytes.unpack("C*")
+    end
+
+    @total_len += bytes.length
+
+    p = 0
+
+    while (remaining = (bytes.length - p)) > 0
+
+      mem_avail = @@mem_total_size - @memsize
+
+      if(remaining < mem_avail)
+        @memory[@memsize, remaining] = bytes[p, remaining]
+        @memsize += remaining
+        break
+      end
+
+      @memory[@memsize, mem_avail] = bytes[p, mem_avail]
+
+      i = 0
+      [:v1, :v2, :v3, :v4].each do |m|
+        p32 = uint32(
+          @memory[i] |
+          (@memory[i+1] << 8) |
+          (@memory[i+2] << 16) |
+          (@memory[i+3] << 24))
+
+        v = uint32(self.send(m) + p32 * @@prime32_2)
+        v = uint32(uint32((v << 13) | (v >> (32 - 13))) * @@prime32_1)
+        self.send((m.to_s + "=").to_sym, v)
+        i += 4
+      end
+
+      p += mem_avail
+      @memsize = 0
+    end
+
+    return true
+  end
+
+  def sum32
+    if @total_len >= 16
+      h32 = ((@v1 << 1) | (@v1 >> (32 - 1))) +
+      ((@v2 << 7) | (@v2 >> (32 - 7))) +
+      ((@v3 << 12) | (@v3 >> (32 - 12))) +
+      ((@v4 << 18) | (@v4 >> (32 - 18)))
+    else
+      h32 = @seed + @@prime32_5
+    end
+
+    h32 = uint32(h32 + @total_len)
+
+    p = 0
+    while p <= (@memsize - 4)
+      p32 = uint32(@memory[p] |
+        (@memory[p+1] << 8) |
+        (@memory[p+2] << 16) |
+        (@memory[p+3] << 24))
+      h32 = uint32(h32 + p32 * @@prime32_3)
+      h32 = uint32(uint32((h32 << 17) | (h32 >> (32 - 17))) * @@prime32_4)
+      p += 4
+    end
+
+    while p < @memsize
+      h32 = uint32(h32 + @memory[p] * @@prime32_5)
+      h32 = uint32(uint32((h32 << 11) | (h32 >> (32 - 11))) * @@prime32_1)
+      p += 1
+    end
+
+    h32 ^= h32 >> 15
+    h32 = uint32(h32 * @@prime32_2)
+    h32 ^= h32 >> 13
+    h32 = uint32(h32 * @@prime32_3)
+    h32 ^= h32 >> 16
+
+    h32
+  end
+
+private
+
+  attr_accessor :v1, :v2, :v3, :v4
+
+  def uint32(x)
+    x & @@thirtytwo1s
+  end
+end

data/lib/ruby-xxhash/version.rb

@@ -0,0 +1,3 @@
+class XXhash
+  VERSION = "0.1.1"
+end

data/ruby-xxHash.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'xxhash/version'
+require 'ruby-xxhash/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "ruby-xxHash"

data/spec/results.yaml

@@ -0,0 +1,16 @@
+---
+? - test
+  - 123
+: 2758658570
+? - ! 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, '
+  - 0
+: 288417748
+? - ! 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, '
+  - 1471
+: 3126436440
+? - ! 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.'
+  - 0
+: 222574394
+? - ! 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.'
+  - 1471
+: 845537824

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'bundler/setup'
 Bundler.setup
 
-require 'xxhash'
+require 'ruby-xxhash'
 
 RSpec.configure do |config|
   # some (optional) config here

data/spec/xxhash_spec.rb

@@ -2,31 +2,27 @@
 
 require 'spec_helper'
 require 'stringio'
+require 'yaml'
 
 describe XXhash do
-  it 'returns correct hash' do
-     XXhash.xxh32('test', 123).should eq(2758658570)
-  end
+  hash = YAML.load(IO.read "spec/results.yaml")
 
-  it 'returns correct hash' do
-     XXhash.xxh32("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, ").should eq(0x1130e7d4)
+  hash.each do |key, value|
+    it 'returns correct hash' do
+      XXhash.xxh32(key[0], key[1]).should eq(value)
+    end
   end
 
-  it 'returns correct hash' do
-     XXhash.xxh32("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, ", 1471).should eq(0xba59a258)
-  end
 
   describe 'StreamingHash' do
     it 'raises error if argument is not an IO object' do
       expect { XXhash.xxh32_stream('test', 123)}.to raise_error
     end
 
-    it 'returns the correct hash for streamed strings' do
-      XXhash.xxh32_stream(StringIO.new('test'), 123).should eq(2758658570)
-    end
-
-    it 'returns the correct hash for streamed strings' do
-      XXhash.xxh32_stream(StringIO.new("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, "), 1471).should eq(0xba59a258)
+    hash.each do |key, value|
+      it 'returns correct hash' do
+        XXhash.xxh32_stream(StringIO.new(key[0]), key[1]).should eq(value)
+      end
     end
 
     it 'returns same hash for streamed files' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-xxHash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -71,9 +71,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/xxhash.rb
-- lib/xxhash/version.rb
+- lib/ruby-xxhash.rb
+- lib/ruby-xxhash/version.rb
 - ruby-xxHash.gemspec
+- spec/results.yaml
 - spec/spec_helper.rb
 - spec/xxhash_spec.rb
 homepage: https://github.com/justinwsmith/ruby-xxhash
@@ -102,5 +103,6 @@ signing_key:
 specification_version: 3
 summary: A pure Ruby implementation of xxhash.
 test_files:
+- spec/results.yaml
 - spec/spec_helper.rb
 - spec/xxhash_spec.rb

data/lib/xxhash.rb

@@ -1,128 +0,0 @@
-require "xxhash/version"
-
-class XXhash
-  @@mem_total_size = 16
-  @@prime32_1 = 2654435761
-  @@prime32_2 = 2246822519
-  @@prime32_3 = 3266489917
-  @@prime32_4 = 668265263
-  @@prime32_5 = 374761393
-
-  @@thirtytwo1s = (2**32-1)
-
-  def XXhash.xxh32(input, seed = 0)
-    xxh = XXhash.new(seed)
-    xxh.feed(input)
-    xxh.sum32
-  end
-
-  def XXhash.xxh32_stream(io, seed = 0, chunk = 1024)
-    xxh = XXhash.new(seed)
-
-    while(data = io.read(chunk))
-      xxh.feed(data)
-    end
-
-    xxh.sum32
-  end
-
-  def initialize seed
-    @seed = seed
-    @v1 = seed + @@prime32_1 + @@prime32_2
-    @v2 = seed + @@prime32_2
-    @v3 = seed + 0
-    @v4 = seed - @@prime32_1
-    @total_len = 0
-    @memory = Array.new(@@mem_total_size)
-    @memsize = 0
-  end
-
-
-  def feed bytes
-    if String === bytes
-      bytes = bytes.unpack("C*")
-    end
-
-    @total_len += bytes.length
-
-    p = 0
-
-    while (remaining = (bytes.length - p)) > 0
-
-      mem_avail = @@mem_total_size - @memsize
-
-      if(remaining < mem_avail)
-       @memory[@memsize, remaining] = bytes[p, remaining]
-       @memsize += remaining
-       break
-     end
-
-     @memory[@memsize, mem_avail] = bytes[p, mem_avail]
-
-     i = 0
-     [:v1, :v2, :v3, :v4].each do |m|
-      p32 = uint32(
-        @memory[i] |
-        (@memory[i+1] << 8) |
-        (@memory[i+2] << 16) |
-        (@memory[i+3] << 24))
-
-      v = uint32(self.send(m) + p32 * @@prime32_2)
-      v = uint32(uint32((v << 13) | (v >> (32 - 13))) * @@prime32_1)
-      self.send((m.to_s + "=").to_sym, v)
-      i += 4
-    end
-
-    p += mem_avail
-    @memsize = 0
-  end
-
-  return true
-end
-
-def sum32
-  if @total_len >= 16
-    h32 = ((@v1 << 1) | (@v1 >> (32 - 1))) +
-    ((@v2 << 7) | (@v2 >> (32 - 7))) +
-    ((@v3 << 12) | (@v3 >> (32 - 12))) +
-    ((@v4 << 18) | (@v4 >> (32 - 18)))
-  else
-    h32 = @seed + @@prime32_5
-  end
-
-  h32 = uint32(h32 + @total_len)
-
-  p = 0
-  while p <= (@memsize - 4)
-    p32 = uint32(@memory[p] |
-      (@memory[p+1] << 8) |
-      (@memory[p+2] << 16) |
-      (@memory[p+3] << 24))
-    h32 = uint32(h32 + p32 * @@prime32_3)
-    h32 = uint32(uint32((h32 << 17) | (h32 >> (32 - 17))) * @@prime32_4)
-    p += 4
-  end
-
-  while p < @memsize
-    h32 = uint32(h32 + @memory[p] * @@prime32_5)
-    h32 = uint32(uint32((h32 << 11) | (h32 >> (32 - 11))) * @@prime32_1)
-    p += 1
-  end
-
-  h32 ^= h32 >> 15
-  h32 = uint32(h32 * @@prime32_2)
-  h32 ^= h32 >> 13
-  h32 = uint32(h32 * @@prime32_3)
-  h32 ^= h32 >> 16
-
-  h32
-end
-
-private
-
-attr_accessor :v1, :v2, :v3, :v4
-
-def uint32(x)
-  x & @@thirtytwo1s
-end
-end

data/lib/xxhash/version.rb

@@ -1,3 +0,0 @@
-class XXhash
-  VERSION = "0.0.2"
-end