linkparser 1.0.4 → 1.1.0

data/rake/testing.rb

@@ -1,6 +1,6 @@
 # 
 # Rake tasklib for testing tasks
-# $Id: testing.rb 99 2009-04-14 13:03:03Z deveiant $
+
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -16,7 +16,7 @@ end
 SPEC_FILES       = [] unless defined?( SPEC_FILES )
 TEST_FILES       = [] unless defined?( TEST_FILES )
 
-COMMON_SPEC_OPTS = ['-Du', '-b'] unless defined?( COMMON_SPEC_OPTS )
+COMMON_RSPEC_OPTS = [] unless defined?( COMMON_RSPEC_OPTS )
 
 COVERAGE_TARGETDIR = BASEDIR + 'coverage' unless defined?( COVERAGE_TARGETDIR )
 RCOV_EXCLUDES      = 'spec,tests,/Library/Ruby,/var/lib,/usr/local/lib' unless
@@ -29,7 +29,7 @@ task :test do
 		log "Running specs"
 		Rake::Task['spec:quiet'].invoke
 	end
-	
+
 	unless TEST_FILES.empty?
 		log "Running unit tests"
 		Rake::Task[:unittests].invoke 
@@ -39,114 +39,55 @@ end
 
 ### RSpec specifications
 begin
-	gem 'rspec', '>= 1.1.3'
+	gem 'rspec', '>= 2.0.0'
 
-	require 'spec'
-	require 'spec/rake/spectask'
+	require 'rspec'
+	require 'rspec/core/rake_task'
 
 	### Task: spec
 	desc "Run specs"
 	task :spec => 'spec:doc'
+	task :specs => :spec
 
 	namespace :spec do
 		desc "Run rspec every time there's a change to one of the files"
 		task :autotest do
-			require 'autotest/rspec'
-
-			autotester = Autotest::Rspec.new
-			autotester.run
+			require 'autotest'
+			Autotest.add_discovery { "rspec2" }
+			Autotest.run
 		end
 
 		desc "Generate regular color 'doc' spec output"
-		Spec::Rake::SpecTask.new( :doc ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 's', '-c']
+		RSpec::Core::RakeTask.new( :doc ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'd', '-c']
 		end
 
 		desc "Generate spec output with profiling"
-		Spec::Rake::SpecTask.new( :profile ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 'o']
+		RSpec::Core::RakeTask.new( :profile ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'p', '-p']
 		end
 
 		desc "Generate quiet non-colored plain-text output"
-		Spec::Rake::SpecTask.new( :quiet ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 'p']
+		RSpec::Core::RakeTask.new( :quiet ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'p']
 		end
 
 		desc "Generate HTML output"
-		Spec::Rake::SpecTask.new( :html ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 'h']
+		RSpec::Core::RakeTask.new( :html ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'h']
 		end
 
-	end
-rescue LoadError => err
-	task :no_rspec do
-		$stderr.puts "Specification tasks not defined: %s" % [ err.message ]
-	end
 
-	task :spec => :no_rspec
-	namespace :spec do
-		task :autotest => :no_rspec
-		task :doc => :no_rspec
-		task :profile => :no_rspec
-		task :quiet => :no_rspec
-		task :html => :no_rspec
 	end
-end
-
-
-### Test::Unit tests
-begin
-	require 'rake/testtask'
-	
-	Rake::TestTask.new( :unittests ) do |task|
-		task.libs += [LIBDIR]
-		task.test_files = TEST_FILES
-		task.verbose = true
-	end
-
-rescue LoadError => err
-	task :no_test do
-		$stderr.puts "Test tasks not defined: %s" % [ err.message ]
-	end
-
-	task :unittests => :no_rspec
-end
-
-	
-### RCov (via RSpec) tasks
-begin
-	gem 'rcov'
-	gem 'rspec', '>= 1.1.3'
-
-	require 'spec'
-	require 'rcov'
 
 	### Task: coverage (via RCov)
 	desc "Build test coverage reports"
-	unless SPEC_FILES.empty?
-		Spec::Rake::SpecTask.new( :coverage ) do |task|
-			task.spec_files = SPEC_FILES
-			task.libs += [LIBDIR]
-			task.spec_opts = ['-f', 'p', '-b']
-			task.rcov_opts = RCOV_OPTS
-			task.rcov = true
-		end
+	RSpec::Core::RakeTask.new( :coverage ) do |task|
+		task.ruby_opts = [ "-I#{LIBDIR}" ]
+		task.rspec_opts = ['-f', 'p', '-b']
+		task.rcov_opts = RCOV_OPTS
+		task.rcov = true
 	end
-# 	unless TEST_FILES.empty?
-# 		require 'rcov/rcovtask'
-
-# 		Rcov::RcovTask.new do |task|
-# 			task.libs += [LIBDIR]
-# 			task.test_files = TEST_FILES
-# 			task.verbose = true
-# 			task.rcov_opts = RCOV_OPTS
-# 		end
-# 	end
-
 
 	### Task: rcov
 	task :rcov => :coverage
@@ -154,50 +95,58 @@ begin
 	### Other coverage tasks
 	namespace :coverage do
 		desc "Generate a detailed text coverage report"
-		Spec::Rake::SpecTask.new( :text ) do |task|
-			task.spec_files = SPEC_FILES
+		RSpec::Core::RakeTask.new( :text ) do |task|
 			task.rcov_opts = RCOV_OPTS + ['--text-report']
 			task.rcov = true
 		end
 
 		desc "Show differences in coverage from last run"
-		Spec::Rake::SpecTask.new( :diff ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = ['-f', 'p', '-b']
+		RSpec::Core::RakeTask.new( :diff ) do |task|
+			task.rspec_opts = ['-f', 'p', '-b']
 			task.rcov_opts = RCOV_OPTS - ['--save'] + ['--text-coverage-diff']
 			task.rcov = true
 		end
 
-		### Task: verify coverage
-		desc "Build coverage statistics"
-		VerifyTask.new( :verify => :rcov ) do |task|
-			task.threshold = COVERAGE_MINIMUM
-		end
-
 		desc "Run RCov in 'spec-only' mode to check coverage from specs"
-		Spec::Rake::SpecTask.new( :speconly ) do |task|
-			task.spec_files = SPEC_FILES
+		RSpec::Core::RakeTask.new( :speconly ) do |task|
 			task.rcov_opts = ['--exclude', RCOV_EXCLUDES, '--text-report', '--save']
 			task.rcov = true
 		end
 	end
 
 	CLOBBER.include( COVERAGE_TARGETDIR )
-
 rescue LoadError => err
-	task :no_rcov do
-		$stderr.puts "Coverage tasks not defined: RSpec+RCov tasklib not available: %s" %
-		[ err.message ]
+	task :no_rspec do
+		$stderr.puts "Specification tasks not defined: %s" % [ err.message ]
 	end
 
-	task :coverage => :no_rcov
-	task :clobber_coverage
-	task :rcov => :no_rcov
-	namespace :coverage do
-		task :text => :no_rcov
-		task :diff => :no_rcov
+	task :spec => :no_rspec
+	namespace :spec do
+		task :autotest => :no_rspec
+		task :doc => :no_rspec
+		task :profile => :no_rspec
+		task :quiet => :no_rspec
+		task :html => :no_rspec
 	end
-	task :verify => :no_rcov
+end
+
+
+### Test::Unit tests
+begin
+	require 'rake/testtask'
+
+	Rake::TestTask.new( :unittests ) do |task|
+		task.libs += [LIBDIR]
+		task.test_files = TEST_FILES
+		task.verbose = true
+	end
+
+rescue LoadError => err
+	task :no_test do
+		$stderr.puts "Test tasks not defined: %s" % [ err.message ]
+	end
+
+	task :unittests => :no_rspec
 end
 
 

data/spec/bugfixes_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 #
 # Specification for various bugfixes to the LinkParser binding
-# $Id: bugfixes_spec.rb 48 2008-12-19 18:30:33Z deveiant $
+# $Id: bugfixes_spec.rb,v 6c597e731a87 2010/11/22 15:59:36 ged $
 #
 # See the LICENSE file in the distribution for information about copyright and licensing.
 #
@@ -9,27 +9,33 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
 
-require 'spec/runner'
+require 'rspec'
+
 require 'linkparser'
 
 # @dict = LinkParser::Dictionary.new( :verbosity => 0 )
 # s = LinkParser::Sentence.new('The cat runs.',@dict)
 # puts s.linkages.first.verb  #  "cat.n" !?!?!
 describe %{bugfix for #3: The first linkage for "The cat runs."} do
+	before( :all ) do
+		$DEBUG = true if ENV['DEBUG']
+	end
+
 	before( :each ) do
-		@dict = LinkParser::Dictionary.new( :verbosity => 0 )
+		@dict = LinkParser::Dictionary.new( 'en', :verbosity => 0 )
 		@sentence = @dict.parse( "The cat runs." )
 		@linkage = @sentence.linkages.first
 	end
-	
+
 
 	it "thinks cat is the subject" do
 		@linkage.subject.should == "cat"

data/spec/linkparser/dictionary_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 #
 # Specification for the LinkParser::Dictionary class
-# $Id: dictionary_spec.rb 48 2008-12-19 18:30:33Z deveiant $
+# $Id: dictionary_spec.rb,v a5e7d9e3cf5c 2010/11/25 00:50:55 ged $
 #
 # See the LICENSE file in the distribution for information about copyright and licensing.
 #
@@ -9,21 +9,36 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
 
-require 'spec/runner'
+require 'rspec'
+
 require 'linkparser'
 
 
 describe LinkParser::Dictionary do
+
+	### Work around current system's locale
+	before( :all ) do
+		$LANG = ENV['LANG']
+		ENV['LANG'] = 'en_US.UTF-8'
+		$DEBUG = true if ENV['DEBUG']
+	end
+
+	after( :all ) do
+		ENV['LANG'] = $LANG
+	end
+
+
 	it "can be instantiated using all default values" do
-		lambda { LinkParser::Dictionary.new }.should_not raise_error()
+		LinkParser::Dictionary.new.should be_an_instance_of( LinkParser::Dictionary )
 	end
 
 	it "can be instantiated with an options hash" do
@@ -56,35 +71,36 @@ describe LinkParser::Dictionary do
 		}.should raise_error( LinkParser::Error )
 	end
 
-end
+	context "instance" do
 
-describe "An instance of LinkParser::Dictionary" do
+		TEST_SENTENCE = "The dog plays with the ball."
 
-	TEST_SENTENCE = "The dog plays with the ball."
+		before( :each ) do
+			@dict = LinkParser::Dictionary.new( 
+				:verbosity => 0,
+				:max_null_count => 18,
+				:echo_on => true
+			  )
+		end
 
-	before( :each ) do
-		@dict = LinkParser::Dictionary.new( 
-			:verbosity => 0,
-			:max_null_count => 18,
-			:echo_on => true
-		  )
-	end
-	
 
-	it "knows what the total cost of its linkages are" do
-		@dict.max_cost.should be_an_instance_of(Fixnum)
-	end
+		it "knows what the total cost of its linkages are" do
+			@dict.max_cost.should be_an_instance_of(Fixnum)
+		end
 
-	it "can parse a sentence" do
-		@dict.parse( TEST_SENTENCE ).
-			should be_an_instance_of( LinkParser::Sentence )
-	end
-	
-	it "passes on its options to the sentences it parses" do
-		sentence = @dict.parse( TEST_SENTENCE )
-		sentence.options.max_null_count.should == 18
-		sentence.options.verbosity.should == 0
-		sentence.options.echo_on?.should == true
+		it "can parse a sentence" do
+			@dict.parse( TEST_SENTENCE ).
+				should be_an_instance_of( LinkParser::Sentence )
+		end
+
+		it "passes on its options to the sentences it parses" do
+			sentence = @dict.parse( TEST_SENTENCE )
+			sentence.options.max_null_count.should == 18
+			sentence.options.verbosity.should == 0
+			sentence.options.echo_on?.should == true
+		end
 	end
+
 end
 
+

data/spec/linkparser/linkage_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 #
 # Specification for the LinkParser::Linkage class
-# $Id: linkage_spec.rb 48 2008-12-19 18:30:33Z deveiant $
+# $Id: linkage_spec.rb,v a5e7d9e3cf5c 2010/11/25 00:50:55 ged $
 #
 # See the LICENSE file in the distribution for information about copyright and licensing.
 #
@@ -9,29 +9,32 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
 
-require 'spec/runner'
+require 'rspec'
+
 require 'linkparser'
 
 
 describe LinkParser::Linkage do
 
 	before( :all ) do
-		@dict = LinkParser::Dictionary.new( :verbosity => 0 )
+		@dict = LinkParser::Dictionary.new( 'en', :verbosity => 0 )
+		$DEBUG = true if ENV['DEBUG']
 	end
 
 	before( :each ) do
 		@sentence = @dict.parse( "The flag was wet." )
 		@linkage = @sentence.linkages.first
 	end
-	
+
 
 	#     +-------------Xp-------------+
 	#     +-----Wd-----+               |
@@ -44,14 +47,14 @@ describe LinkParser::Linkage do
 		@linkage.diagram.should =~ /flag\.n/
 		@linkage.diagram.should =~ /was\.v/
 		@linkage.diagram.should =~ /wet\.a/
-		
+
 		@linkage.diagram.should =~ /-Xp-/
 		@linkage.diagram.should =~ /-Wd-/
 		@linkage.diagram.should =~ /-Ds-/
 		@linkage.diagram.should =~ /-Ss-/
 		@linkage.diagram.should =~ /-Pa-/
 	end
-	
+
 
 	 #       LEFT-WALL      Xp      <---Xp---->  Xp        .
 	 # (m)   LEFT-WALL      Wd      <---Wd---->  Wd        flag.n
@@ -84,13 +87,13 @@ describe LinkParser::Linkage do
 		@linkage.words.should include("LEFT-WALL")
 		@linkage.words.should include("the")
 		@linkage.words.should include("flag.n")
-		@linkage.words.should include("was.v")
+		@linkage.words.should include("was.v-d")
 		@linkage.words.should include("wet.a")
 		@linkage.words.should include(".")
 		@linkage.words.should include("RIGHT-WALL")
 	end
-	
-	
+
+
 	it "knows how many links are in the sentence" do
 		@linkage.num_links.should == 6
 	end
@@ -110,13 +113,13 @@ describe LinkParser::Linkage do
 		@linkage.link_lword( 3 ).should == @linkage.words.index('flag.n')
 
 		# (m)   was.v          Pa      <---Pa---->  Pa        wet.a
-		@linkage.link_lword( 4 ).should == @linkage.words.index('was.v')
+		@linkage.link_lword( 4 ).should == @linkage.words.index('was.v-d')
 
 		#       .              RW      <---RW---->  RW        RIGHT-WALL
 		@linkage.link_lword( 5 ).should == @linkage.words.index('.')
 
 	end
-	
+
 	it "can return the right word for any of its links" do
 	 	#       LEFT-WALL      Xp      <---Xp---->  Xp        .
 		@linkage.link_rword( 0 ).should == @linkage.words.index('.')
@@ -128,7 +131,7 @@ describe LinkParser::Linkage do
 		@linkage.link_rword( 2 ).should == @linkage.words.index('flag.n')
 
 		# (m)   flag.n         Ss      <---Ss---->  Ss        was.v
-		@linkage.link_rword( 3 ).should == @linkage.words.index('was.v')
+		@linkage.link_rword( 3 ).should == @linkage.words.index('was.v-d')
 
 		# (m)   was.v          Pa      <---Pa---->  Pa        wet.a
 		@linkage.link_rword( 4 ).should == @linkage.words.index('wet.a')
@@ -150,8 +153,8 @@ describe LinkParser::Linkage do
 		# Out-of-bounds just returns -1
 		@linkage.link_length( 7 ).should == -1
 	end
-	
-	
+
+
 	it "can return labels for any of its links" do
 		@linkage.link_label( 0 ).should == "Xp"
 		@linkage.link_label( 1 ).should == "Wd"
@@ -162,7 +165,7 @@ describe LinkParser::Linkage do
 
 		@linkage.link_label( 7 ).should be_nil
 	end
-	
+
 
 	it "can return left labels for any of its links" do
 		@linkage.link_llabel( 0 ).should == "Xp"
@@ -174,7 +177,7 @@ describe LinkParser::Linkage do
 
 		@linkage.link_llabel( 7 ).should be_nil
 	end
-	
+
 
 	it "can return labels for any of its links" do
 		@linkage.link_rlabel( 0 ).should == "Xp"
@@ -186,8 +189,8 @@ describe LinkParser::Linkage do
 
 		@linkage.link_rlabel( 7 ).should be_nil
 	end
-	
-	
+
+
 	it "can return the number of domains for any link" do
 		@linkage.link_num_domains( 0 ).should == 0
 		1.upto(4) do |i|
@@ -197,25 +200,35 @@ describe LinkParser::Linkage do
 
 		@linkage.link_num_domains( 112 ).should == -1
 	end
-	
-	
+
+
 	it "can return the names of the domains of any of its links" do
 		@linkage.link_domain_names( 0 ).should be_an_instance_of( Array )
 		@linkage.link_domain_names( 0 ).should be_empty
-		
+
 		1.upto(4) do |i|
 			@linkage.link_domain_names( i ).should be_an_instance_of( Array )
 			@linkage.link_domain_names( i ).should == ["m"]
 		end
-		
+
 		@linkage.link_domain_names( 5 ).should be_an_instance_of( Array )
 		@linkage.link_domain_names( 5 ).should be_empty
-		
+
 		@linkage.link_domain_names( 12 ).should be_an_instance_of( Array )
 		@linkage.link_domain_names( 12 ).should be_empty
 	end
 
-	
+
+	it "can return the disjunct strings for any of its words" do
+		@linkage.disjunct_strings.should have( @linkage.num_words ).members
+	end
+
+
+	it "can return parsed disjuncts for any of its words" do
+		@linkage.disjuncts.should have( @linkage.num_words ).members
+	end
+
+
 	it "can report on the various cost metrics of the parse" do
 		@linkage.unused_word_cost.should be_an_instance_of( Fixnum )
 		@linkage.disjunct_cost.should be_an_instance_of( Fixnum )
@@ -244,7 +257,7 @@ describe LinkParser::Linkage do
 	it "contains link structs describing the linkage" do
 		@linkage.should have(6).links
 		@linkage.links.should be_an_instance_of( Array )
-		
+
 		@linkage.links.each do |link|
 			link.should be_a_kind_of( Struct )
 		end
@@ -254,7 +267,7 @@ describe LinkParser::Linkage do
 		@linkage.links.last.rword.should == 'RIGHT-WALL'
 		@linkage.links.last.label.should == 'RW'
 		@linkage.links[3].lword.should == 'flag.n'
-		@linkage.links[3].rword.should == 'was.v'
+		@linkage.links[3].rword.should == 'was.v-d'
 		@linkage.links[3].label.should == 'Ss'
 	end
 
@@ -267,7 +280,13 @@ describe LinkParser::Linkage do
 	it "knows when the sentence doesn't have a direct object" do
 		@linkage.object.should be_nil()
 	end
-	
+
+
+	it "knows which of its words are nouns" do
+		@linkage.nouns.should have(1).member
+		@linkage.nouns.should include( "flag" )
+	end
+
 
 	MODE1_C_TREE_STRING = "(S (NP The flag)\n   (VP was\n       (ADJP wet))\n   .)\n"
 	MODE2_C_TREE_STRING = "[S [NP The flag NP] [VP was [ADJP wet ADJP] VP] . S] \n"
@@ -276,27 +295,27 @@ describe LinkParser::Linkage do
 	it "returns an indented sexps for the constituent tree string by default (mode 1)" do
 		@linkage.constituent_tree_string.should == MODE1_C_TREE_STRING
 	end
-	
+
 
 	it "returns indented sexps for the constituent tree string if fetched with explicit mode '1'" do
 		@linkage.constituent_tree_string( 1 ).should == MODE1_C_TREE_STRING
 	end
-	
+
 	it "returns bracketed constituents if constituent tree string is fetched in mode 2" do
 		@linkage.constituent_tree_string( 2 ).should == MODE2_C_TREE_STRING
 	end
-	
+
 	it "returns unindented sexps for the constituent tree string if constituent tree string " +
 	   "is fetched in mode 3" do
 		@linkage.constituent_tree_string( 3 ).should == MODE3_C_TREE_STRING
 	end
-	
+
 	it "raises an exception for any numeric constituent tree string mode greater than 3" do
 		lambda {
 			@linkage.constituent_tree_string( 4 )
 		}.should raise_error( ArgumentError, /illegal mode 4/i )
 	end
-	
+
 	it "raises an exception for any numeric constituent tree string mode less than 1" do
 		lambda {
 			@linkage.constituent_tree_string( 0 )
@@ -309,10 +328,10 @@ describe LinkParser::Linkage do
 			@linkage.constituent_tree_string( 'glarg' )
 		}.should raise_error( TypeError )
 	end
-	
+
 	it "returns an Array of CTree structs for its constituent tree" do
 		rval = @linkage.constituent_tree
-		
+
 		rval.should be_an_instance_of( Array )
 		rval.should have(1).members
 		rval.first.should be_a_kind_of( Struct )
@@ -320,93 +339,70 @@ describe LinkParser::Linkage do
 		rval.first.children.should have(3).members
 		rval.first.children.collect {|n| n.label }.should include( 'NP', 'VP', '.' )
 	end
-	
-	it "returns 0 as the number of the current sublinkage since it has no conjunctions" do
-	    @linkage.current_sublinkage.should == 0 
-	end
-
 
 	it "returns an informational string when inspected" do
-		@linkage.inspect.should =~ /Linkage:0x[[:xdigit:]]+: sublinkage 0: \[\d+ links\]/
+		@linkage.inspect.should =~ /Linkage:0x[[:xdigit:]]+: \[\d+ links\]/
 	end
-	
-	
-	describe "from a simple sentence with a direct object" do
+
+
+	context "from a simple sentence with a direct object" do
 		before( :each ) do
 			@sentence = @dict.parse( "The dog ran home." )
 			@linkage = @sentence.linkages.first
 		end
 
 
-		it "doesn't have any sublinkages" do
-			@linkage.num_sublinkages.should == 1
-		end
-	
-		it "doesn't change after computing its union" do
-			lambda {
-				@linkage.compute_union
-			}.should_not change( @linkage, :num_sublinkages )
-		end
-
-
 		it "knows what word is the object in the sentence" do
-			@linkage.object.should == 'home'
+			# This depends on the linkage:
+			#       +---------------Xp---------------+
+			#       +-----Wd----+                    |
+			#       |      +-Ds-+--Ss--+---Ou---+    |
+			#       |      |    |      |        |    |
+			#   LEFT-WALL the dog.n ran.v-d home.n-u . 
+			# ...but it might not be the first one, so check them all.
+			@sentence.linkages.find {|linkage| linkage.object == 'home' }
+
 		end
-	
+
 	end
 
 
-	it "knows that it doesn't have any conjunctions" do
-		@linkage.should_not have_conjunction()
-	end
-	
+	context "deprecated sublinkage API" do
 
-	describe "from a sentence with a conjunction" do
 		before( :each ) do
-			@sentence = 
-				@dict.parse( "The ball rolled down the hill and bumped the curb." )
+			@sentence = @dict.parse( "The ball rolled down the hill and bumped the curb." )
 			@linkage = @sentence.linkages.first
 		end
 
-
-		it "knows that it has a conjunction" do
-			@linkage.should have_conjunction()
+		it "warns about deprecation if #num_sublinkages is called" do
+			@linkage.should_receive( :warn ).with( /deprecated/i )
+			@linkage.num_sublinkages
 		end
-	
-		it "has two sublinkages" do
-			@linkage.num_sublinkages.should == 2
-		end
-	
 
-		it "adds a sublinkage after computing its union" do
-			lambda {
-				@linkage.compute_union
-			}.should change( @linkage, :num_sublinkages ).from(2).to(3)
+		it "warns about deprecation if #compute_union is called" do
+			@linkage.should_receive( :warn ).with( /deprecated/i )
+			@linkage.compute_union
 		end
 
-
-		it "knows what word is the verb in the current sublinkage" do
-			@linkage.verb.should == 'rolled'
+		it "warn about deprecation if #current_sublinkage= is called" do
+			@linkage.should_receive( :warn ).with( /deprecated/i )
 			@linkage.current_sublinkage = 1
-			@linkage.verb.should == 'bumped'
 		end
-	
 
-		it "knows what word is the object in the current sublinkage" do
-			@linkage.object.should == 'hill'
-			@linkage.current_sublinkage = 1
-			@linkage.object.should == 'curb'
+		it "warn about deprecation if #current_sublinkage is called" do
+			@linkage.should_receive( :warn ).with( /deprecated/i )
+			@linkage.current_sublinkage
 		end
-	
+
 	end
 
 
 	it "should know that it's not an imperative sentence" do
 		@linkage.imperative?.should be_false()
 	end
-	
 
-	describe "from an imperative sentence" do
+
+	context "from an imperative sentence" do
 		before( :each ) do
 			@sentence = @dict.parse( "Go to the store!" )
 			@linkage = @sentence.linkages.first
@@ -416,19 +412,19 @@ describe LinkParser::Linkage do
 		it "knows that it's an imperative sentence" do
 			@linkage.imperative?.should be_true()
 		end
-		
-		
+
+
 	end
 
 
-	describe "bugfixes" do
-		
+	context "bugfixes" do
+
 		it "also strips off the '.p' from the subject and object when they are plural" do
 			sent = @dict.parse( 'People like goats.' )
 			sent.subject.should_not =~ /people\.p/i
 			sent.object.should_not =~ /goats\.p/i
 		end
-		
+
 	end
 
 end