google_hash 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/ext/extconf.rb

@@ -22,16 +22,13 @@ if RUBY_VERSION < '1.9'
 end
 
 # create our files...
-# currently we're int only...hmm...
-# ltodo if I am using longs, this 31 needs to be a 63 on 64 bit machines...
-# if I ever use longs :)
-
-# my goal is...ruby friendly hashers
 
 if OS.bits == 32
   unreachable_int = 31
+  unreachable_long = 31
 else
-  unreachable_int = 63
+  unreachable_int = 31
+  unreachable_long = 63
 end
 
 ruby_key =  {:convert_keys_from_ruby => "", :convert_keys_to_ruby => "", :key_type => "VALUE", :english_key_type => "ruby",
@@ -39,13 +36,13 @@ ruby_key =  {:convert_keys_from_ruby => "", :convert_keys_to_ruby => "", :key_ty
 int_key = {:assert_key_type => 'T_FIXNUM', :convert_keys_from_ruby => "FIX2INT",
   :convert_keys_to_ruby => "INT2FIX", :key_type => "int", :unreachable_key => "1<<#{unreachable_int}"}
   
-# "long" is useful on 64 bit...
-long_key = {:assert_key_type => 'T_FIXNUM', :convert_keys_from_ruby => "FIX2LONG",
-  :convert_keys_to_ruby => "LONG2FIX", :key_type => "long", :unreachable_key => "1<<#{unreachable_int}"}
+# "long" is useful on 64 bit...since it can handle a wider range of incoming int's
 
+long_key = {:assert_key_type => 'T_FIXNUM', :convert_keys_from_ruby => "FIX2LONG",
+  :convert_keys_to_ruby => "LONG2FIX", :key_type => "long", :unreachable_key => "1<<#{unreachable_long}"}
 
 bignum_as_double_key = {:assert_key_type => ['T_BIGNUM', 'T_FIXNUM'], :convert_keys_from_ruby => "rb_big2dbl",
-  :convert_keys_to_ruby => "rb_dbl2big", :key_type => "double", :unreachable_key => "1<<#{unreachable_int}",  # LODO is this a bignum value though?
+  :convert_keys_to_ruby => "rb_dbl2big", :key_type => "double", :unreachable_key => "1<<#{unreachable_long}",  # LODO is this a bignum value though? LODO TEST this key on 64 bit!
   :extra_hash_params => ", hashdouble, eqdouble",
   :extra_set_code => "if(TYPE(set_this) == T_FIXNUM)\nset_this = rb_int2big(FIX2INT(set_this));",
   :extra_get_code => "if(TYPE(get_this) == T_FIXNUM) \n get_this = rb_int2big(FIX2INT(get_this));"

data/spec/spec.google_hash.rb

@@ -56,7 +56,7 @@ describe "google_hash" do
       k.should == 33
       v.should == 'abc'
     }
-    @subject.delete(33).should == 'abc'
+    @subject.delete(33).should == 'abc' # guess we don't do delete yet [?]
     @subject.length.should == 0
     @subject[33] = 'abc'
     @subject.length.should == 1
@@ -128,8 +128,8 @@ describe "google_hash" do
     GoogleHashDenseLongToLong.new
   end
 
-  it "should do 63 bit thingy for longs on 64 bit" do
-    pending "caring about 64 bit"
+  if OS.bits == 64
+    it "should disallow keys like 1<<40 for ints on 64 bit"
   end
 
   it "should have sets"
@@ -258,6 +258,23 @@ describe "google_hash" do
   it "should have sets, too, not just hashes"
   
   it "should skip GC when native to native" do
+    # tough to test...
+  end
+  
+  it "should allow for setting the right keys" do
+    all_classes = Object.constants.grep(/googlehash/i).map{|c| Object.const_get(c) }
+    all_classes.select{|c| c.to_s =~ /(int|long)to/i}.each{|c| 
+      p c
+      keys = [0, 1, -1, 1<<29]
+      if OS.bits == 64
+       keys << (1<<61)
+      end
+      keys.each{|k|
+        instance = c.new
+        instance[k] = 0
+        instance[k].should == 0
+      }
+    }
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - rogerdpack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 -06:00
+date: 2010-12-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,6 @@ executables: []
 
 extensions: 
 - ext/extconf.rb
-- ext/temp/extconf.rb
 extra_rdoc_files: 
 - README
 files: 
@@ -129,7 +128,6 @@ files:
 - spec/scale.rb
 - spec/spec.google_hash.rb
 - types.txt
-- ext/temp/extconf.rb
 has_rdoc: true
 homepage: http://github.com/rdp/ruby_google_hash
 licenses: []

data/ext/temp/extconf.rb

@@ -1,11 +0,0 @@
-# Loads mkmf which is used to make makefiles for Ruby extensions
-require 'mkmf'
-
-# Give it a name
-extension_name = 'mytest'
-
-# The destination
-dir_config(extension_name)
-
-# Do the work
-create_makefile(extension_name)