hamster 0.3.2 → 0.3.3

data/lib/hamster/hash.rb

@@ -124,7 +124,7 @@ module Hamster
     def_delegator :self, :eql?, :==
 
     def hash
-      reduce(0) { |h, key, value| h ^ key.hash ^ value.hash }
+      reduce(0) { |hash, key, value| (hash << 32) - hash + key.hash + value.hash }
     end
 
     def_delegator :self, :dup, :uniq

data/lib/hamster/list.rb

@@ -450,7 +450,7 @@ module Hamster
     def_delegator :self, :eql?, :==
 
     def hash
-      reduce(0) { |h, item| h ^ item.hash }
+      reduce(0) { |hash, item| (hash << 5) - hash + item.hash }
     end
 
     def dup

data/lib/hamster/set.rb

@@ -249,7 +249,7 @@ module Hamster
     def_delegator :self, :eql?, :==
 
     def hash
-      reduce(0) { |h, item| h ^ item.hash }
+      reduce(0) { |hash, item| (hash << 5) - hash + item.hash }
     end
 
     def_delegator :self, :dup, :uniq

data/lib/hamster/version.rb

@@ -1,5 +1,5 @@
 module Hamster
 
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 
 end

data/spec/hamster/hash/hash_spec.rb

@@ -6,37 +6,30 @@ describe Hamster::Hash do
 
   describe "#hash" do
 
-    describe "on an empty hash" do
-
-      before do
-        @result = Hamster.hash.hash
-      end
-
-      it "returns 0" do
-        @result.should == 0
-      end
-
+    it "values are sufficiently distributed" do
+      (1..4000)
+        .each_slice(4)
+        .map { |ka, va, kb, vb| Hamster.hash(ka => va, kb => vb).hash }
+        .uniq
+        .size.should == 1000
     end
 
-    describe "on a non-empty hash" do
-
-      class Item
-
-        attr_reader :hash
+    it "differs given the same keys and different values" do
+      Hamster.hash("ka" => "va").hash.should_not == Hamster.hash("ka" => "vb").hash
+    end
 
-        def initialize(h)
-          @hash = h
-        end
+    it "differs given the same values and different keys" do
+      Hamster.hash("ka" => "va").hash.should_not == Hamster.hash("kb" => "va").hash
+    end
 
-      end
+    describe "on an empty hash" do
 
       before do
-        hash = Hamster.hash(Item.new(19) => Item.new(100), Item.new(31) => Item.new(78942), Item.new(107) => Item.new(309))
-        @result = hash.hash
+        @result = Hamster.hash.hash
       end
 
-      it "returns XOR of each key/value pair hash" do
-        @result.should == 79208
+      it "returns 0" do
+        @result.should == 0
       end
 
     end

data/spec/hamster/list/hash_spec.rb

@@ -30,27 +30,12 @@ describe Hamster::List do
 
     end
 
-    describe "on a non-empty list" do
-
-      class Item
-
-        attr_reader :hash
-
-        def initialize(h)
-          @hash = h
-        end
-
-      end
-
-      before do
-        list = Hamster.list(Item.new(19), Item.new(31), Item.new(107))
-        @result = list.hash
-      end
-
-      it "returns XOR of each item's hash" do
-        @result.should == 103
-      end
-
+    it "values are sufficiently distributed" do
+      (1..4000)
+        .each_slice(4)
+        .map { |a, b, c, d| Hamster.list(a, b, c, d).hash }
+        .uniq
+        .size.should == 1000
     end
 
   end

data/spec/hamster/set/hash_spec.rb

@@ -18,27 +18,12 @@ describe Hamster::Set do
 
     end
 
-    describe "on a non-empty set" do
-
-      class Item
-
-        attr_reader :hash
-
-        def initialize(h)
-          @hash = h
-        end
-
-      end
-
-      before do
-        set = Hamster.set(Item.new(19), Item.new(31), Item.new(107))
-        @result = set.hash
-      end
-
-      it "returns XOR of each item's hash" do
-        @result.should == 103
-      end
-
+    it "values are sufficiently distributed" do
+      (1..4000)
+        .each_slice(4)
+        .map { |a, b, c, d| Hamster.set(a, b, c, d).hash }
+        .uniq
+        .size.should == 1000
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Simon Harris