google_hash 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23f86698ca9d5943672bcedce1b34d927bb8c9e
-  data.tar.gz: 7998d5064e4ec2ca240370c73d36f3414c5e5015
+  metadata.gz: c8edcf102d93a5c863f984e01c6359767fde17a5
+  data.tar.gz: 7b9c417d19e4b7e91f57c28b12a38f41d70827b7
 SHA512:
-  metadata.gz: 286db97c34501bf64c1356a1ed34e5fe1a4db4a28e2a79eabdeef401f1352f33b3806ac53589697a04f2d2529943c55256232eefb9b5afed88d7410125b93129
-  data.tar.gz: 79c9cedde68e56d87160c7178524895fcf48d2d57a97eab17bbeabfc9a6426a000937fdecc6b88ad23d9b159a64700333094e17ddd4d607782eef3e2c972e70a
+  metadata.gz: 0d601b30366d4daf143984e72ae890bc253ec1e04e7d7d2a5d155bc3f31e629967f2d88c81f455d494b5cf569620803511571bbdbb195975c45ae773cd43b500
+  data.tar.gz: 66a4a74fd1201911475592756a1c7b4a21e9ab72cfa6d535973b4c000700bbad56159b59120e23527dd16e8852e75350f4c20c4e2b59a79ad33f93998b21040c

data/ChangeLog.txt

@@ -1,3 +1,6 @@
+0.8.5
+  fix build for 2.2.x [I hope]
+
 0.8.4
   attempt to fix poor build/gem distro
 

data/Rakefile

@@ -8,7 +8,9 @@ Jeweler::Tasks.new do |gemspec|
     gemspec.email = "rogerdpack@gmail.com"
     gemspec.homepage = "http://github.com/rdp/ruby_google_hash"
     gemspec.authors = ["rogerdpack"]
-    gemspec.add_runtime_dependency 'sane', '~> 0' # real dependency as it's used for building the gem, in the extconf.rb file itself
+    gemspec.add_runtime_dependency 'sane', '~> 0' # real dependency as it's used for building the gem, in the extconf.rb file itself, but not actually required by the gem at runtime 
     gemspec.add_development_dependency('hitimes', '~> 0')
+    gemspec.add_development_dependency('rspec', '~> 2.14.1')
+    gemspec.add_development_dependency('jeweler')
 end
 

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

data/ext/clean.bat

@@ -1,4 +1,5 @@
-rm *.cpp 
-rm *.o
-rm *.so
-rm *.def
+rm *.cpp 
+rm *.o
+rm *.so
+rm *.def
+rm *.bundle

data/ext/go.sh

@@ -0,0 +1,4 @@
+./clean.bat
+ruby extconf.rb -j8
+make -j8
+./spec.bat

data/ext/template/google_hash.cpp.erb

@@ -105,7 +105,13 @@ struct eqrb
 };
 
 #ifndef RBIGNUM_DIGITS
-# define RBIGNUM_DIGITS(a) RBIGNUM(a)->digits
+
+# ifdef RBIGNUM
+   /* 1.8 'ish */
+#   define RBIGNUM_DIGITS(a) RBIGNUM(a)->digits
+# else
+  /* 2.2.0 has no way to do this? */
+# endif
 #endif
 
 struct hashrb
@@ -129,14 +135,15 @@ struct hashrb
               case T_SYMBOL:
                // ltodo
                 return hash_me;
-              case T_BIGNUM:
-	            return LONG2FIX(((long*)(RBIGNUM_DIGITS(hash_me)))[0]); // its first digit...I'm thinkin'
-	             // not sure if this is faster or not...
-	             //case T_STRING:
+             // we don't actually do bignums yet, though rb_big2int might help here...
+                 // case T_BIGNUM:
+	         //   return LONG2FIX(((long*)(RBIGNUM_DIGITS(hash_me)))[0]); // its first digit...I'm thinkin'
+	     // not sure if this is faster or not...
+	    //case T_STRING:
 	             //return H(StringValueCStr(hash_me)); // populate/lookup 0.26 -> 0.23 [core is 0.16 somehow]
 	             // perhaps they cache?
 	             //return H(RSTRING_PTR(hash_me)); // 0.23 -> -.22
-	          }        
+	   }        
            
             VALUE hval = rb_funcall(hash_me, id_hash, 0);
             
@@ -144,8 +151,8 @@ struct hashrb
             switch (TYPE(hval)) {
               case T_FIXNUM:
 	              return hval;
-              case T_BIGNUM:
-	              return LONG2FIX(((long*)(RBIGNUM_DIGITS(hval)))[0]);
+              //??case T_BIGNUM:
+	      //??        return LONG2FIX(((long*)(RBIGNUM_DIGITS(hval)))[0]);
               default:
 	              hval = rb_to_int(hval);
 	              goto retry;
@@ -179,7 +186,7 @@ static void mark_hash_map_values(RCallback *incoming) {
 }
 
 static void free_hash_callback(RCallback* cb) {
-  delete cb->hash_map; // I had this line commented out one? huh?
+  delete cb->hash_map; // I had this line commented out once? huh?
 }
 
 static VALUE

data/google_hash.gemspec

@@ -2,14 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: google_hash 0.8.5 ruby lib
+# stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "google_hash"
-  s.version = "0.8.2"
+  s.version = "0.8.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["rogerdpack"]
-  s.date = "2014-05-26"
+  s.date = "2015-01-21"
   s.description = "Ruby wrappers to the google hash library"
   s.email = "rogerdpack@gmail.com"
   s.extensions = ["ext/extconf.rb"]
@@ -25,9 +28,9 @@ Gem::Specification.new do |s|
     "TODO",
     "VERSION",
     "ext/clean.bat",
-    "ext/clean.sh",
     "ext/extconf.rb",
     "ext/go.bat",
+    "ext/go.sh",
     "ext/sparsehash-2.0.2/AUTHORS",
     "ext/sparsehash-2.0.2/COPYING",
     "ext/sparsehash-2.0.2/ChangeLog",
@@ -137,23 +140,28 @@ Gem::Specification.new do |s|
     "to_build_locally_run_ext_go_bat"
   ]
   s.homepage = "http://github.com/rdp/ruby_google_hash"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.4.5"
   s.summary = "Ruby wrappers to the google hash library"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sane>, [">= 0"])
-      s.add_development_dependency(%q<hitimes>, [">= 0"])
+      s.add_runtime_dependency(%q<sane>, ["~> 0"])
+      s.add_development_dependency(%q<hitimes>, ["~> 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.14.1"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<sane>, [">= 0"])
-      s.add_dependency(%q<hitimes>, [">= 0"])
+      s.add_dependency(%q<sane>, ["~> 0"])
+      s.add_dependency(%q<hitimes>, ["~> 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.14.1"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sane>, [">= 0"])
-    s.add_dependency(%q<hitimes>, [">= 0"])
+    s.add_dependency(%q<sane>, ["~> 0"])
+    s.add_dependency(%q<hitimes>, ["~> 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.14.1"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/spec/spec.google_hash.rb

@@ -215,8 +215,7 @@ describe "google_hash" do
 	end
   end
   
-  it "should do bignum to doubles et al" do
-    a = GoogleHashDenseDoubleToDouble.new
+  def test_big_numbers a
     a[10000000000000000000] = 1
     a[10000000000000000000].should == 1
     a[1] = 10000000000000000000
@@ -225,13 +224,18 @@ describe "google_hash" do
     a[4].should == 3
     a[10000000000000000000] = 10000000000000000000
     a[10000000000000000000].should == 10000000000000000000
+  end
+
+  it "should do bignum to doubles et al" do
+    test_big_numbers( GoogleHashDenseDoubleToDouble.new)
   end
   
-  it "should allow for storing true bignums" do
-    pending
-    'TODO: same as above plus the following:'
-    a = GoogleHashDenseBignumToRuby.new
-    a[10000000000000000000] = 'abc'
+  it "should allow for storing true BigNum" do
+    pending 'caring about bignums at all and even having the classes in there'
+    test_big_numbers(GoogleHashDenseBigNumToRuby.new)
+    # and test the to ruby aspect
+    a[10000000000000000000] = 'abc'
+    a[10000000000000000000].should == 'abc'
   end
   
   it "should have an Enumerator return for values, keys [?] instead of an array?"

metadata

@@ -1,43 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: google_hash
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - rogerdpack
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hitimes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: hitimes
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrappers to the google hash library
 email: rogerdpack@gmail.com
 executables: []
@@ -54,9 +82,9 @@ files:
 - TODO
 - VERSION
 - ext/clean.bat
-- ext/clean.sh
 - ext/extconf.rb
 - ext/go.bat
+- ext/go.sh
 - ext/sparsehash-2.0.2/AUTHORS
 - ext/sparsehash-2.0.2/COPYING
 - ext/sparsehash-2.0.2/ChangeLog
@@ -167,24 +195,24 @@ files:
 homepage: http://github.com/rdp/ruby_google_hash
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.2.2
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5
+signing_key: 
 specification_version: 4
 summary: Ruby wrappers to the google hash library
 test_files: []

data/ext/clean.sh

@@ -1,4 +0,0 @@
-rm *.cpp 
-rm *.o
-rm *.so
-rm *.def