Changeset 93

Timestamp:

07/11/08 17:56:49 (7 weeks ago)

Author:

deveiant

Message:

• Synched Rakefile with rake-tasklibs
  
• Started conversion of synset tests to specs
  
• Finished converting lexicon tests to specs
  

Location:

branches/rakefile-work

Files:

• Rakefile (modified) (2 diffs)
• lib/wordnet/lexicon.rb (modified) (3 diffs)
• spec/wordnet/lexicon_spec.rb (modified) (7 diffs)
• spec/wordnet/synset_spec.rb (moved) (moved from branches/rakefile-work/spec/wordnet/synset.tests.rb) (2 diffs, 1 prop)

branches/rakefile-work/Rakefile

@@ -60 +60 @@
 SPEC_EXCLUDES = 'spec,/Library/Ruby,/var/lib,/usr/local/lib'
 
-COVERAGE_MINIMUM = 83.0
-
-RELEASE_FILES = FileList[ TEXT_FILES + SPEC_FILES + LIB_FILES + EXT_FILES ]
+TESTDIR       = BASEDIR + 'tests'
+TEST_FILES    = Pathname.glob( TESTDIR + '**/*.tests.rb' )
+
+RELEASE_FILES = FileList[ TEXT_FILES + SPEC_FILES + TEST_FILES + LIB_FILES + EXT_FILES ]
 
 
@@ -192 +193 @@
 ### Cruisecontrol task
 desc "Cruisecontrol build"
-task :cruise => [:clean, 'coverage:verify', :package] do |task|
+task :cruise => [:clean, :spec, :package] do |task|
     raise "Artifacts dir not set." if ARTIFACTS_DIR.to_s.empty?
     artifact_dir = ARTIFACTS_DIR.cleanpath

branches/rakefile-work/lib/wordnet/lexicon.rb

@@ -161 +161 @@
     def checkpoint( bytes=0, minutes=0 )
         @env.checkpoint
-    end
-
-
-    ### Return a list of archival logfiles that can be removed
-    ### safely. (BerkeleyDB-specific).
-    def archlogs
-        return @env.log_archive( BDB::ARCH_ABS )
     end
 
@@ -206 +199 @@
         # that fails, trying morphological conversion.
         entry = @index_db[ wordkey ]
+
         if entry.nil? && (word = self.morph( word, part_of_speech ))
+            wordkey = self.make_word_key( word, part_of_speech )
             entry = @index_db[ wordkey ]
         end
@@ -396 +391 @@
         word = word.gsub( /\s+/, '_' )
         return "#{word}%#{pos}"
+    end
+
+
+    ### Return a list of archival logfiles that can be removed
+    ### safely. (BerkeleyDB-specific).
+    def archlogs
+        return @env.log_archive( BDB::ARCH_ABS )
     end
 

branches/rakefile-work/spec/wordnet/lexicon_spec.rb

@@ -63 +63 @@
     #################################################################
 
-    it "passes a read-only flagset to BDB when created in :readonly mode" do
+    it "defaults to being in :readonly mode" do
         env = stub( "bdb environment handle", :open_db => nil )
         BDB::Env.should_receive( :new ).
@@ -69 +69 @@
             and_return( env )
 
-        WordNet::Lexicon.new( @path.to_s )
-    end
-    
-    it "passes a read/write flagset to BDB when created in :writable mode" do
+        lex = WordNet::Lexicon.new( @path.to_s )
+
+        lex.should be_readonly()
+        lex.should_not be_readwrite()
+    end
+    
+    it "can be created in :writable mode" do
         env = stub( "bdb environment handle", :open_db => nil )
         BDB::Env.should_receive( :new ).
@@ -78 +81 @@
             and_return( env )
 
-        WordNet::Lexicon.new( @path.to_s, :writable )
+        lex = WordNet::Lexicon.new( @path.to_s, :writable )
+
+        lex.should_not be_readonly()
+        lex.should be_readwrite()
     end
     
@@ -87 +93 @@
             and_return( env )
 
-        WordNet::Lexicon.new( @path.to_s, :readwrite )
-    end
-    
-
-    describe "created in the default configuration" do
+        lex = WordNet::Lexicon.new( @path.to_s, :readwrite )
+
+        lex.should_not be_readonly()
+        lex.should be_readwrite()
+    end
+    
+
+    describe "created in readonly mode" do
+
+        before( :each ) do
+            @env = mock( "bdb environment handle" )
+            BDB::Env.stub!( :new ).and_return( @env )
+            @env.stub!( :open_db )
+
+            @lexicon = WordNet::Lexicon.new( @path.to_s, :readonly )
+        end
+
+
+        it "doesn't try to remove logs" do
+            @env.should_not_receive( :log_archive )
+            @lexicon.clean_logs
+        end
+        
+        
+    end
+
+
+    describe "created in readwrite mode" do
+
+        before( :each ) do
+            @env = mock( "bdb environment handle" )
+            BDB::Env.stub!( :new ).and_return( @env )
+            @env.stub!( :open_db )
+
+            @lexicon = WordNet::Lexicon.new( @path.to_s, :readwrite )
+        end
+        
+
+        it "can be closed" do
+            @env.should_receive( :close )
+            @lexicon.close
+        end
+
+        it "provides a delegator for the checkpoint method of the underlying database" do
+            @env.should_receive( :checkpoint )
+            @lexicon.checkpoint
+        end
+    
+        it "provides an interface to clean up database transaction logs" do
+            @env.should_receive( :log_archive ).with( BDB::ARCH_ABS ).
+                and_return([ :log1, :log2 ])
+            File.should_receive( :chmod ).with( 0777, :log1 )
+            File.should_receive( :delete ).with( :log1 )
+            File.should_receive( :chmod ).with( 0777, :log2 )
+            File.should_receive( :delete ).with( :log2 )
+            
+            @lexicon.clean_logs
+        end
+        
+    
+    end
+    
+
+    describe "with a converted WordNet database" do
 
         before( :all ) do
@@ -113 +178 @@
         
         
-        it "returns the root word as the morphology of a dictionary word it knows about" do
+        it "returns the root word as the morphological conversion of a dictionary word it knows about" do
             @lexicon.morph( "angriest", WordNet::Adjective ).should == 'angry'
         end
 
 
-        it "returns nil as the morphology of a dictionary word it doesn't know about" do
+        it "returns nil as the morphological conversion of a dictionary word it doesn't know about" do
             @lexicon.morph( "Passomoquoddy", WordNet::Noun ).should be_nil()
         end
@@ -125 +190 @@
         it "returns the 'reverse morph' of dictionary words it knows about" do
             @lexicon.reverse_morph( "angry" ).should == 'angriest%a'
+        end
+
+
+        it "tries looking up a failing via its morphological conversion if the original fails" do
+            synsets = @lexicon.lookup_synsets( 'angriest', WordNet::Adjective )
+            
+            synsets.should_not be_nil()
+            synsets.first.should be_an_instance_of( WordNet::Synset )
+            synsets.first.words.should include( 'angry' )
+        end
+
+
+        it "returns only the requested sense if a sense is specified" do
+            synset = @lexicon.lookup_synsets( 'run', WordNet::Verb, 4 )
+            synset.should be_an_instance_of( WordNet::Synset )
+            synset.words.first.should =~ /operate/i
         end
         
@@ -161 +242 @@
                 should be_an_instance_of( WordNet::Synset )
         end
-        
-    end
-
-
-    ### Test synset creation via factory method
-    def test_lexicon_create_synset_should_create_a_new_synset
-        synset = nil
-
-        assert_nothing_raised do
-            synset = @lexicon.create_synset( "Ruby", WordNet::Noun )
-        end
-        assert_instance_of WordNet::Synset, synset
-    end
-
-
-    def test_lexicon_should_be_readonly_if_opened_in_readonly_mode
-        make_testing_directory do |path|
-            lex = WordNet::Lexicon::new( path, :readwrite ).checkpoint
-            lex = nil
-            
-            lex = WordNet::Lexicon.new( path, :readonly )
-            assert_equal true, lex.readonly?
-            assert_equal false, lex.readwrite?
-        end
-    end
-
-
-    def test_lexicon_should_be_readwrite_if_opened_in_readwrite_mode
-        make_testing_directory do |path|
-            lex = WordNet::Lexicon::new( path, :readwrite )
-
-            assert_equal false, lex.readonly?
-            assert_equal true, lex.readwrite?
-        end
-    end
-
-
-
-    # :TODO: Test store_synset()?
-
+
+    end
 
 end

branches/rakefile-work/spec/wordnet/synset_spec.rb

@@ -1 @@
-#!/usr/bin/ruby
-
-require "wntestcase"
-require "bdb"
-
-class SynsetTests < WordNet::TestCase
+#!/usr/bin/env ruby
+
+BEGIN {
+    require 'pathname'
+    basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+
+    libdir = basedir + 'lib'
+
+    $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+}
+
+begin
+    require 'fileutils'
+    require 'tmpdir'
+    require 'bdb'
+    require 'spec/runner'
+    require 'spec/lib/helpers'
+
+    require 'wordnet/lexicon'
+    require 'wordnet/synset'
+rescue LoadError
+    unless Object.const_defined?( :Gem )
+        require 'rubygems'
+        retry
+    end
+    raise
+end
+
+
+#####################################################################
+### C O N T E X T S
+#####################################################################
+
+describe WordNet::Synset do
 
     Accessors = [
@@ -68 +96 @@
         
 
-    ### Make sure the Lexicon's loaded
-    def setup
-        super
-
-        @blankSyn = WordNet::Synset::new( @lexicon, "1%n", WordNet::Noun )
-        @traversalSyn = @lexicon.lookup_synsets( 'linguistics', :noun, 1 )
-    end
-
+    before( :each ) do
+        @blank_syn = WordNet::Synset::new( @lexicon, "1%n", WordNet::Noun )
+        @traversal_syn = @lexicon.lookup_synsets( 'linguistics', :noun, 1 )
+    end
+    
 
     #################################################################