sfh 1.0.1 → 1.0.2

data/History.txt

@@ -1,6 +1,11 @@
+== 0.0.3 / 2008-02-29
+* Fixed issue with native .so version vs RubyInline version
+  * The two used a slightly different interface which was lame.  Using
+    Inline.c_singleton instead of Inline.c now.
+
 == 0.0.2 / 2008-02-29
 * Updated to use hoe for releases
-  * Fixed missing dependency (RubyInline) 
+  * Fixed missing dependency (RubyInline)
 
 == 0.0.1 / 2008-02-17
 * Initial release

data/Manifest.txt

@@ -2,7 +2,7 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-sfh.rb
+lib/sfh.rb
 bin/sfhsum
 ext/extconf.rb
 ext/sfh.c

data/README.txt

@@ -10,14 +10,6 @@ This is just a gem for it.
 * No known issues, let me know if you find any.
 
 == SYNOPSIS:
-For inline version
-  require 'sfh'
-
-  h1 = Sfh.new
-  text1 = "The quick brown fox"
-  puts "Text '#{text1}': #{h1.hash(text1, text1.length)}"
-
-The SWIG version is used like this:
   require 'sfh'
 
   text1 = "The quick brown fox"

data/Rakefile

@@ -1,13 +1,13 @@
 require 'rubygems'
 require 'hoe'
-require './sfh.rb'
+require 'lib/sfh.rb'
 
 Hoe.new('sfh', Sfh::VERSION) do |p|
   p.rubyforge_name = 'sfh'
   p.author         = 'Jonathan Wilkins'
   p.email          = 'jwilkins[at]bitland[dot]net'
-  p.summary        = 'SuperFastHash is a hash designed by Paul Hsieh ' +
-                     '(http://www.azillionmonkeys.com/qed/hash.html). ' +
+  p.summary        = 'SuperFastHash is a hash designed by Paul Hsieh '\
+                     '(http://www.azillionmonkeys.com/qed/hash.html).  '\
                      'This is just a gem for it.'
   p.description    = p.paragraphs_of('README.txt', 2..5).join("\n\n")
   p.url            = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
@@ -21,7 +21,7 @@ Rake::Task[:test].prerequisites << :extension
 kind = Config::CONFIG["DLEXT"]
 
 desc "Build native version"
-task :extension => ["ext/sfh.#{kind}"]
+task :extension => ["ext/sfh_native.#{kind}"]
 
 file "ext/Makefile" => "ext/extconf.rb" do
   Dir.chdir("ext") { ruby "extconf.rb" }

data/bin/sfhsum

@@ -3,11 +3,10 @@ require 'rubygems'
 require 'sfh'
 
 if ARGV.size > 0 then
-  h = Sfh.new
   ARGV.each do |filename|
     if FileTest::exists?(filename) then
       filedata = open(filename).read
-      puts h.hash(filedata, filedata.length)
+      puts Sfh.hash(filedata, filedata.length)
     else
       puts "error: can't find '#{filename}'"
     end

data/{sfh.rb → lib/sfh.rb}

@@ -1,15 +1,15 @@
 require 'rubygems'
 require 'inline'
 
-class Sfh
-  VERSION = '1.0.1'
+module Sfh
+  VERSION = '1.0.2'
 
   inline(:C) do |builder|
     builder.include '<stdio.h>'
     builder.include '<sys/types.h>'
     builder.include '<stdint.h>'
 
-    builder.c '
+    builder.c_singleton '
       unsigned int hash(const char * data, int len)
       {
         unsigned int hash = len, tmp;
@@ -60,9 +60,8 @@ class Sfh
 end
 
 if $0 == __FILE__
-  h = Sfh.new()
   puts "hashing 'asdf' a million times"
   1000000.times {
-    h.hash('asdf', 4)
+    Sfh.hash('asdf', 4)
   }
 end

data/test/test_sfh.rb

@@ -0,0 +1,14 @@
+require '../lib/sfh.rb'
+
+str = 'asdf'
+times = 1000000
+
+puts "hashing #{str} #{times} times"
+times.times { Sfh.hash(str, str.length) }
+puts "done"
+
+times = 1000
+puts "hashing #{str}*1000000 #{times} times"
+str = str*1000000
+times.times { Sfh.hash(str, str.length) }
+puts "done"

data/test/test_sfh_swig.rb

@@ -0,0 +1,14 @@
+require '/usr/lib/ruby/gems/1.8/gems/sfh-1.0.2/lib/sfh.so'
+
+str = 'asdf'
+times = 1000000
+
+puts "hashing #{str} #{times} times"
+times.times { Sfh.hash(str, str.length) }
+puts "done"
+
+times = 1000
+puts "hashing #{str}*1000000 #{times} times"
+str = str*1000000
+times.times { Sfh.hash(str, str.length) }
+puts "done"

metadata

@@ -3,15 +3,16 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sfh
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 date: 2008-02-29 00:00:00 -08:00
-summary: SuperFastHash is a hash designed by Paul Hsieh (http://www.azillionmonkeys.com/qed/hash.html). This is just a gem for it.
+summary: SuperFastHash is a hash designed by Paul Hsieh (http://www.azillionmonkeys.com/qed/hash.html).  This is just a gem for it.
 require_paths: 
+- lib
 - ext
 email: jwilkins[at]bitland[dot]net
 homepage: "    by Jonathan Wilkins"
 rubyforge_project: sfh
-description: "== FEATURES/PROBLEMS: * No known issues, let me know if you find any.  == SYNOPSIS: For inline version require 'sfh'  h1 = Sfh.new text1 = \"The quick brown fox\" puts \"Text '#{text1}': #{h1.hash(text1, text1.length)}\"  The SWIG version is used like this: require 'sfh'"
+description: "== FEATURES/PROBLEMS: * No known issues, let me know if you find any.  == SYNOPSIS: require 'sfh'  text1 = \"The quick brown fox\" puts \"Text '#{text1}': #{Sfh.hash(text1, text1.length)}\"  == REQUIREMENTS: RubyInline"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -33,15 +34,16 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- sfh.rb
+- lib/sfh.rb
 - bin/sfhsum
 - ext/extconf.rb
 - ext/sfh.c
 - ext/sfh.i
 - ext/sfh_wrap.c
 - ext/test_sfh_swig.rb
-test_files: []
-
+test_files: 
+- test/test_sfh_swig.rb
+- test/test_sfh.rb
 rdoc_options: 
 - --main
 - README.txt