ruby-xxHash 0.1.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4b572ac0c8cdae1cf7f5521976d4d6d914f90942
+  data.tar.gz: 80fe87bebc85f75dc8e6e196c5fd8555091f24f8
+SHA512:
+  metadata.gz: 8c1d74e45ec38e2757685c04ab47e9e3ab4d98e746d9d804a62b6e6ebdc4aac6110497c09b7576b521ccb3be842e5ba966e8d31d728fd629e12d01babf2c451d
+  data.tar.gz: 71652397a6f621ac2fca7dbe6a24749a67c3fec3adc21a5d6fc7f81ac1459946feb7de622c54f8b6c23a304ec15c7f5b8cd6e9b7cf051d24ec416c438b5bf433

data/.gitignore

@@ -1,5 +1,8 @@
 *.gem
 *.rbc
+**/*.iml
+.idea/
+ruby-xxhash/
 .bundle
 .config
 .yardoc

data/lib/ruby-xxhash.rb

@@ -1,23 +1,18 @@
+# Copyright 2014 Justin W. Smith
+
 require "ruby-xxhash/version"
+require "ruby-xxhash32"
+require "ruby-xxhash64"
 
 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 = XXhash32.new(seed)
     xxh.feed(input)
     xxh.sum32
   end
 
   def XXhash.xxh32_stream(io, seed = 0, chunk = 32)
-    xxh = XXhash.new(seed)
+    xxh = XXhash32.new(seed)
 
     while(data = io.read(chunk))
       xxh.feed(data)
@@ -26,103 +21,20 @@ class XXhash
     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
+  def XXhash.xxh64(input, seed = 0)
+    xxh = XXhash64.new(seed)
+    xxh.feed(input)
+    xxh.sum64
   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
+  def XXhash.xxh64_stream(io, seed = 0, chunk = 32)
+    xxh = XXhash64.new(seed)
 
-    while p < @memsize
-      h32 = uint32(h32 + @memory[p] * @@prime32_5)
-      h32 = uint32(uint32((h32 << 11) | (h32 >> (32 - 11))) * @@prime32_1)
-      p += 1
+    while(data = io.read(chunk))
+      xxh.feed(data)
     end
 
-    h32 ^= h32 >> 15
-    h32 = uint32(h32 * @@prime32_2)
-    h32 ^= h32 >> 13
-    h32 = uint32(h32 * @@prime32_3)
-    h32 ^= h32 >> 16
-
-    h32
+    xxh.sum64
   end
 
-private
-
-  attr_accessor :v1, :v2, :v3, :v4
-
-  def uint32(x)
-    x & @@thirtytwo1s
-  end
-end
+end

data/lib/ruby-xxhash/version.rb

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

data/lib/ruby-xxhash32.rb

@@ -0,0 +1,112 @@
+
+
+class XXhash32
+  @@mem_total_size = 16
+  @@prime32_1 = 2654435761
+  @@prime32_2 = 2246822519
+  @@prime32_3 = 3266489917
+  @@prime32_4 = 668265263
+  @@prime32_5 = 374761393
+
+  @@thirtytwo1s = (2**32-1)
+
+  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-xxhash64.rb

@@ -0,0 +1,135 @@
+require "ruby-xxhash/version"
+
+class XXhash64
+  @@mem_total_size = 32
+  @@prime64_1 = 11400714785074694791
+  @@prime64_2 = 14029467366897019727
+  @@prime64_3 = 1609587929392839161
+  @@prime64_4 = 9650029242287828579
+  @@prime64_5 = 2870177450012600261
+
+  @@sixtyfour1s = (2**64-1)
+
+  def initialize seed
+    @seed = seed
+    @v1 = seed + @@prime64_1 + @@prime64_2;
+    @v2 = seed + @@prime64_2;
+    @v3 = seed + 0;
+    @v4 = seed - @@prime64_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|
+        p64 = uint64(
+          @memory[i] |
+            (@memory[i+1] << 8) |
+            (@memory[i+2] << 16) |
+            (@memory[i+3] << 24) |
+            (@memory[i+4] << 32) |
+            (@memory[i+5] << 40) |
+            (@memory[i+6] << 48) |
+            (@memory[i+7] << 56))
+
+        v = uint64(self.send(m) + p64 * @@prime64_2)
+        v = uint64(uint64((v << 31) | (v >> (64 - 31))) * @@prime64_1)
+        self.send((m.to_s + "=").to_sym, v)
+        i += 8
+      end
+
+      p += mem_avail
+      @memsize = 0
+    end
+  end
+
+  def sum64
+    if @total_len >= 32
+      h64 = ((@v1 << 1) | (@v1 >> (64 - 1))) +
+        ((@v2 << 7) | (@v2 >> (64 - 7))) +
+        ((@v3 << 12) | (@v3 >> (64 - 12))) +
+        ((@v4 << 18) | (@v4 >> (64 - 18)))
+
+      [:v1, :v2, :v3, :v4].each do |m|
+        v = uint64(self.send(m) * @@prime64_2)
+        v = uint64((v << 31) | (v >> (64 - 31)))
+        h64 ^= uint64(v * @@prime64_1)
+        h64 = h64 * @@prime64_1 + @@prime64_4
+      end
+    else
+      h64 = @seed + @@prime64_5
+    end
+
+    h64 = uint64(h64 + @total_len)
+
+    i = 0
+    while i <= (@memsize - 8)
+      v = uint64(
+        @memory[i] |
+          (@memory[i+1] << 8) |
+          (@memory[i+2] << 16) |
+          (@memory[i+3] << 24) |
+          (@memory[i+4] << 32) |
+          (@memory[i+5] << 40) |
+          (@memory[i+6] << 48) |
+          (@memory[i+7] << 56))
+
+      v = uint64(v * @@prime64_2)
+      h64 ^= uint64(uint64((v << 31) | (v >> (64 - 31))) * @@prime64_1)
+      h64 = uint64(uint64((h64 << 27) | (h64 >> (64 - 27))) * @@prime64_1 + @@prime64_4)
+      i += 8
+    end
+
+    if i <= (@memsize - 4)
+      v = @memory[i] |
+        (@memory[i+1] << 8) |
+        (@memory[i+2] << 16) |
+        (@memory[i+3] << 24)
+      h64 ^= uint64(v * @@prime64_1)
+      h64 = uint64(uint64((h64 << 23) | (h64 >> (64-23))) * @@prime64_2 + @@prime64_3)
+      i += 4
+    end
+
+    while i < @memsize
+      h64 ^= uint64(@memory[i] * @@prime64_5)
+      h64 = uint64(uint64((h64 << 11) | (h64 >> (64 - 11))) * @@prime64_1)
+      i += 1
+    end
+
+    h64 ^= h64 >> 33
+    h64 = uint64(h64 * @@prime64_2)
+    h64 ^= h64 >> 29
+    h64 = uint64(h64 * @@prime64_3)
+    h64 ^= h64 >> 32
+
+    h64
+  end
+
+private
+
+  attr_accessor :v1, :v2, :v3, :v4
+
+  def uint64(x)
+    x & @@sixtyfour1s
+  end
+end

data/spec/results64.yaml

@@ -0,0 +1,16 @@
+---
+? - test
+  - 123
+: 3134990500624303823
+? - ! 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, '
+  - 0
+: 17031984226649854695
+? - ! 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, '
+  - 1471
+: 13163341760735734472
+? - ! 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.'
+  - 0
+: 14967567540383795520
+? - ! 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.'
+  - 1471
+: 4189552183125498197

data/spec/xxhash_spec.rb

@@ -1,34 +1,57 @@
 #Copyright (c) 2012 Vasiliy Ermolovich
+#Copyright (c) 2014 Justin W Smith
 
 require 'spec_helper'
 require 'stringio'
 require 'yaml'
 
 describe XXhash do
-  hash = YAML.load(IO.read "spec/results.yaml")
+  hash32 = YAML.load(IO.read "spec/results32.yaml")
+  hash64 = YAML.load(IO.read "spec/results64.yaml")
 
-  hash.each do |key, value|
+  hash32.each do |key, value|
     it 'returns correct hash' do
-      XXhash.xxh32(key[0], key[1]).should eq(value)
+      expect(XXhash.xxh32(key[0], key[1])).to eq(value)
     end
   end
 
+  hash64.each do |key, value|
+    it 'returns correct hash' do
+      expect(XXhash.xxh64(key[0], key[1])).to eq(value)
+    end
+  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
 
-    hash.each do |key, value|
+    hash32.each do |key, value|
       it 'returns correct hash' do
-        XXhash.xxh32_stream(StringIO.new(key[0]), key[1]).should eq(value)
+        expect(XXhash.xxh32_stream(StringIO.new(key[0]), key[1])).to eq(value)
       end
     end
 
     it 'returns same hash for streamed files' do
       h1 = XXhash.xxh32(File.read(__FILE__), 123)
       h2 = XXhash.xxh32_stream(File.open(__FILE__), 123)
-      h1.should eq(h2)
+      expect(h1).to eq(h2)
+    end
+
+    it 'raises error if argument is not an IO object' do
+      expect { XXhash.xxh64_stream('test', 123)}.to raise_error
+    end
+
+    hash64.each do |key, value|
+      it 'returns correct hash' do
+        expect(XXhash.xxh64_stream(StringIO.new(key[0]), key[1])).to eq(value)
+      end
+    end
+
+    it 'returns same hash for streamed files' do
+      h1 = XXhash.xxh64(File.read(__FILE__), 123)
+      h2 = XXhash.xxh64_stream(File.open(__FILE__), 123)
+      expect(h1).to eq(h2)
     end
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ruby-xxHash
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin W Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A pure Ruby implementation of xxhash.
@@ -66,43 +59,46 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/ruby-xxhash.rb
 - lib/ruby-xxhash/version.rb
+- lib/ruby-xxhash32.rb
+- lib/ruby-xxhash64.rb
 - ruby-xxHash.gemspec
-- spec/results.yaml
+- spec/results32.yaml
+- spec/results64.yaml
 - spec/spec_helper.rb
 - spec/xxhash_spec.rb
 homepage: https://github.com/justinwsmith/ruby-xxhash
 licenses:
 - MIT
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A pure Ruby implementation of xxhash.
 test_files:
-- spec/results.yaml
+- spec/results32.yaml
+- spec/results64.yaml
 - spec/spec_helper.rb
 - spec/xxhash_spec.rb