lib/ahocorasick.rb @@ -3,6 +3,6 @@ *.o *.bundle pkg -ext/Makefile +ext/ahocorasick/Makefile spec/data/en.words spec/data/melville-moby_dick.txt .gitignore @@ -19,18 +19,22 @@ task :default do end desc "Runs ruby extconf.rb" -task :extconf do - `cd ext && ruby extconf.rb && cd ../` +task :extconf => :clean do + Dir.chdir('ext/ahocorasick') do + ruby "extconf.rb" + end end desc "Makes the extension" task :ext => :extconf do - `cd ext/ && make && cd ../` + Dir.chdir('ext/ahocorasick') do + sh "make" + end end desc "Cleans the workspace" task :clean do - `rm -rf ext/*.o ext/*.so ext/Makefile ext/*.bundle` + sh "rm -rf ext/ahocorasick/*.o ext/ahocorasick/*.so ext/ahocorasick/Makefile ext/ahocorasick/*.bundle" end desc "Run rspec" Rakefile @@ -1,8 +1,8 @@ require "mkmf" -# $CFLAGS << " -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline" +$CFLAGS << " -O3 -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline" dir_config("ahocorasick") -create_makefile("ahocorasick") +create_makefile("ahocorasick/native") ext/ahocorasick/extconf.rb @@ -314,7 +314,7 @@ rb_kwt_struct_alloc(VALUE klass) /* * Blump. */ -void Init_ahocorasick() { +void Init_native() { rb_mAhoCorasick = rb_define_module("AhoCorasick"); rb_cKeywordTree = rb_define_class_under(rb_mAhoCorasick, "KeywordTree", rb_cObject); ext/ahocorasick/ruby-ahocorasick.c @@ -1,11 +1,12 @@ GEM_NAME= 'ruby-ahocorasick' -GEM_VERSION= '0.4.5' +GEM_VERSION= '0.5.0' PKG_FILES = [ - 'ext/extconf.rb', - 'ext/ruby-ahocorasick.c', - 'ext/ac.h', - 'ext/ac.c', + 'ext/ahocorasick/extconf.rb', + 'ext/ahocorasick/ruby-ahocorasick.c', + 'ext/ahocorasick/ac.h', + 'ext/ahocorasick/ac.c', + 'lib/ahocorasick.rb', 'examples/dict.rb', 'examples/test.rb', 'examples/elev.rb', @@ -26,10 +27,10 @@ GEMSPEC = Gem::Specification.new do | s | EOF s.files = PKG_FILES - s.extensions << "ext/extconf.rb" + s.extensions << "ext/ahocorasick/extconf.rb" s.has_rdoc = true s.rdoc_options << '--title' << 'Ruby-AhoCorasick' << - '--inline-source' << 'ext/ruby-ahocorasick.c' << 'README.textile' << '--main' << 'README.textile' + '--inline-source' << 'ext/ahocorasick/ruby-ahocorasick.c' << 'README.textile' << '--main' << 'README.textile' s.author = "Aurelian Oancea" s.email = "oancea at gmail dot com" s.homepage = "http://www.locknet.ro" ruby-ahocorasick.gemspec @@ -1,5 +1,8 @@ -require 'ext/ahocorasick' +%w(../lib ../ext).each do |path| + $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), path))) +end +require 'ahocorasick' include AhoCorasick describe KeywordTree do @@ -237,20 +240,28 @@ describe KeywordTree do describe "Benchmarks. Loading from a file" do + before(:each) do + @start= Time.now + end + + after(:each) do + @start=nil + end + it "should be fast to load a bunch of english words" do - start= Time.now k= KeywordTree.from_file File.dirname(__FILE__) + "/data/en.words" - puts "\n%d words loaded in %s seconds" % [k.size, (Time.now - start)] - (Time.now-start).should < 0.2 + puts "\n%d words loaded in %s seconds" % [k.size, (Time.now - @start)] + (Time.now-@start).should < 0.2 end it "should be fast to find" do - start= Time.now + # start= Time.now k= KeywordTree.from_file File.dirname(__FILE__) + "/data/en.words" load_time= Time.now results= k.find_all( File.read( File.dirname(__FILE__) + "/data/melville-moby_dick.txt" ) ) - puts "\n%d words re-loaded in %s seconds.\nGot %d results in %s seconds" % [k.size, (load_time - start), results.size, (Time.now-load_time)] + puts "\n%d words re-loaded in %s seconds.\nGot %d results in %s seconds" % [k.size, (load_time - @start), results.size, (Time.now-load_time)] (Time.now-load_time).should < 1.3 + puts results.last.inspect end end spec/ahocorasick_spec.rb 0fdf77d0040104c48b3a9dd5b6c0d78ad3a30ceb aurelian aurelian@locknet.ro http://github.com/aurelian/ruby-ahocorasick/commit/3b02cee6ef5a363c6dfda8a781ee381c89070705 3b02cee6ef5a363c6dfda8a781ee381c89070705 2008-11-28T09:21:52-08:00 2008-11-28T09:21:52-08:00 * 0.5 should be ready b1acd2a50c2776fc91c059b344d8569b579ba4a0 aurelian aurelian@locknet.ro