linguistics 2.0.2 → 2.0.3

data/spec/linguistics/en/stemmer_spec.rb

@@ -1,17 +1,8 @@
 #!/usr/bin/env spec -cfs
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-
-	libdir = basedir + "lib"
-
-	$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 )
-}
+require_relative '../../helpers'
 
 require 'rspec'
-require 'spec/lib/helpers'
 
 require 'linguistics'
 require 'linguistics/en'
@@ -21,17 +12,12 @@ require 'linguistics/en/stemmer'
 describe Linguistics::EN::Stemmer do
 
 	before( :all ) do
-		setup_logging()
 		Linguistics.use( :en )
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "adds EN::Stemmer to the list of English language modules" do
-		Linguistics::EN::MODULES.include?( Linguistics::EN::Stemmer )
+		expect( Linguistics::EN::MODULES ).to include( Linguistics::EN::Stemmer )
 	end
 
 
@@ -43,7 +29,7 @@ describe Linguistics::EN::Stemmer do
 		end
 
 		it "can fetch the stem of a word" do
-			"communication".en.stem.should == 'communic'
+			expect( "communication".en.stem ).to eq( 'communic' )
 		end
 
 	end
@@ -51,16 +37,17 @@ describe Linguistics::EN::Stemmer do
 
 	describe "on a system that doesn't have the 'ruby-stemmer' library" do
 
-		before( :all ) do
+		it "raises an NotImplementedError when you try to use stemmer functionality" do
 			# If the system *does* have stemmer support, pretend it doesn't.
 			if Linguistics::EN.has_stemmer?
-				error = LoadError.new( "simulated exception: no such file to load -- lingua/stemmer" )
-				Linguistics::EN::Stemmer.instance_variable_set( :@has_stemmer, false )
-				Linguistics::EN::Stemmer.instance_variable_set( :@stemmer_error, error )
+				exception = LoadError.new( 'no such file to load -- lingua/stemmer' )
+
+				allow( Linguistics::EN::Stemmer ).to receive( :has_stemmer? ).
+					and_return( false )
+				allow( Linguistics::EN::Stemmer ).to receive( :stemmer_error ).
+					and_return( exception )
 			end
-		end
 
-		it "raises an NotImplementedError when you try to use stemmer functionality" do
 			expect {
 				"communication".en.stem
 			}.to raise_error( LoadError, %r{lingua/stemmer}i )

data/spec/linguistics/en/titlecase_spec.rb

@@ -1,18 +1,9 @@
 #!/usr/bin/env rspec -cfd
 #coding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-
-	libdir = basedir + "lib"
-
-	$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 )
-}
+require_relative '../../helpers'
 
 require 'rspec'
-require 'spec/lib/helpers'
 
 require 'linguistics'
 require 'linguistics/en'
@@ -22,12 +13,11 @@ require 'linguistics/en/titlecase'
 describe Linguistics::EN::TitleCase do
 
 	before( :all ) do
-		setup_logging( :fatal )
 		Linguistics.use( :en )
 	end
 
-	after( :all ) do
-		reset_logging()
+	it "adds EN::TitleCase to the list of English language modules" do
+		Linguistics::EN::MODULES.include?( Linguistics::EN::TitleCase )
 	end
 
 	it "CamelCases 'motion is madness' correctly" do

data/spec/linguistics/en/wordnet_spec.rb

@@ -1,17 +1,8 @@
 #!/usr/bin/env spec -cfs
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-
-	libdir = basedir + "lib"
-
-	$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 )
-}
+require_relative '../../helpers'
 
 require 'rspec'
-require 'spec/lib/helpers'
 
 require 'linguistics'
 require 'linguistics/en'
@@ -21,14 +12,9 @@ require 'linguistics/en/wordnet'
 describe Linguistics::EN::WordNet do
 
 	before( :all ) do
-		setup_logging()
 		Linguistics.use( :en )
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "adds EN::WordNet to the list of English language modules" do
 		Linguistics::EN::MODULES.include?( Linguistics::EN::WordNet )
@@ -43,37 +29,31 @@ describe Linguistics::EN::WordNet do
 		end
 
 		it "can create a WordNet::Synset from a word" do
-			"jackal".en.synset.should be_a( WordNet::Synset )
+			expect( "jackal".en.synset ).to be_a( WordNet::Synset )
 		end
 
 		it "can load all synsets for a word" do
 			result = "appear".en.synsets
-			result.should have( 7 ).members
-			result.should include( WordNet::Synset[200422090] )
+			expect( result ).to have( 7 ).members
+			expect( result ).to include( WordNet::Synset[200422090] )
 		end
 
 	end
 
 
 	describe "on a system that doesn't have the 'wordnet' library" do
-		before( :all ) do
+
+		it "raises the appropriate LoadError when you try to use wordnet functionality" do
 			# If the system *does* have wordnet support, pretend it doesn't.
 			if Linguistics::EN.has_wordnet?
-				@had_wordnet = true
 				error = LoadError.new( "no such file to load -- wordnet" )
-				Linguistics::EN::WordNet.instance_variable_set( :@has_wordnet, false )
-				Linguistics::EN::WordNet.instance_variable_set( :@wn_error, error )
-			end
-		end
 
-		after( :all ) do
-			if @had_wordnet
-				Linguistics::EN::WordNet.instance_variable_set( :@has_wordnet, true )
-				Linguistics::EN::WordNet.instance_variable_set( :@wn_error, nil )
+				allow( Linguistics::EN::WordNet ).to receive( :has_wordnet? ).
+					and_return( false )
+				allow( Linguistics::EN::WordNet ).to receive( :wordnet_error ).
+					and_return( error )
 			end
-		end
 
-		it "raises the appropriate LoadError when you try to use wordnet functionality" do
 			expect {
 				"persimmon".en.synset
 			}.to raise_error( LoadError, %r{wordnet}i )

data/spec/linguistics/en_spec.rb

@@ -1,17 +1,8 @@
 #!/usr/bin/env spec -cfs
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-
-	libdir = basedir + "lib"
-
-	$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 )
-}
+require_relative '../helpers'
 
 require 'rspec'
-require 'spec/lib/helpers'
 
 require 'linguistics'
 require 'linguistics/en'
@@ -21,55 +12,50 @@ require 'linguistics/languagebehavior'
 describe Linguistics::EN do
 
 	before( :all ) do
-		setup_logging( :fatal )
 		Linguistics.use( :en, :proxy => true )
 		include Linguistics::EN
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it_behaves_like "a Linguistics language module"
 
 
 	it "provides a predicate for testing for the presence of modules by name" do
-		Linguistics::EN.should_not have_extension( 'nonexistant' )
-		Linguistics::EN.should have_extension( 'articles' )
+		expect( Linguistics::EN ).to_not have_extension( 'nonexistant' )
+		expect( Linguistics::EN ).to have_extension( 'articles' )
 	end
 
 	it "knows that it's not in 'classical' mode by default" do
-		Linguistics::EN.should_not be_classical()
+		expect( Linguistics::EN ).to_not be_classical()
 	end
 
 	it "can run a single block in classical mode" do
 		Linguistics::EN.in_classical_mode do
-			Linguistics::EN.should be_classical()
+			expect( Linguistics::EN ).to be_classical()
 		end
 	end
 
 	it "handles nested classical blocks correctly" do
 		Linguistics::EN.in_classical_mode do
 			Linguistics::EN.in_classical_mode do
-				Linguistics::EN.should be_classical()
+				expect( Linguistics::EN ).to be_classical()
 			end
-			Linguistics::EN.should be_classical()
+			expect( Linguistics::EN ).to be_classical()
 		end
-		Linguistics::EN.should_not be_classical()
+		expect( Linguistics::EN ).to_not be_classical()
 	end
 
 
 	it "provides a sprintf-like function for interpolating variables into a String" do
-		"I have %CONJUNCT.".en.lprintf( ["cat", "cat", "dog"] ).
-			should == "I have two cats and a dog."
+		expect( "I have %CONJUNCT.".en.lprintf(["cat", "cat", "dog"]) ).
+			to eq( "I have two cats and a dog." )
 	end
 
 
 	context "lprintf formatters" do
 
 		before( :all ) do
-			@real_formatters = Linguistics::EN.lprintf_formatters
+			@real_formatters = Linguistics::EN.lprintf_formatters.dup
 		end
 
 		before( :each ) do
@@ -83,9 +69,9 @@ describe Linguistics::EN do
 
 		it "provides a way to register new lprintf formatters with a Symbol" do
 			Linguistics::EN.register_lprintf_formatter :TEST, :plural
-			Linguistics::EN.lprintf_formatters.should have( 1 ).member
-			Linguistics::EN.lprintf_formatters.should include( :TEST )
-			Linguistics::EN.lprintf_formatters[ :TEST ].should be_a( Proc )
+			expect( Linguistics::EN.lprintf_formatters ).to have( 1 ).member
+			expect( Linguistics::EN.lprintf_formatters ).to include( :TEST )
+			expect( Linguistics::EN.lprintf_formatters[:TEST] ).to be_a( Proc )
 		end
 
 	end

data/spec/linguistics/inflector_spec.rb

@@ -1,17 +1,8 @@
 #!/usr/bin/env spec -cfs
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-
-	libdir = basedir + "lib"
-
-	$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 )
-}
+require_relative '../helpers'
 
 require 'rspec'
-require 'spec/lib/helpers'
 
 require 'linguistics'
 require 'linguistics/inflector'
@@ -19,21 +10,12 @@ require 'linguistics/inflector'
 
 describe Linguistics::Inflector do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :all ) do
-		reset_logging()
-	end
-
-
 	it "provides a human-readable representation of the object suitable for debugging" do
 		obj = Object.new
 		result = Linguistics::Inflector.new( :en, obj ).inspect
 
-		result.should include( (obj.object_id / 2).to_s(16) )
-		result.should =~ /english-language/i
+		expect( result ).to include( (obj.object_id / 2).to_s(16) )
+		expect( result ).to match( /english-language/i )
 	end
 
 end

data/spec/linguistics/iso639_spec.rb

@@ -1,18 +1,9 @@
 #!/usr/bin/env spec -cfs
 #encoding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-
-	libdir = basedir + "lib"
-
-	$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 )
-}
+require_relative '../helpers'
 
 require 'rspec'
-require 'spec/lib/helpers'
 
 require 'linguistics'
 require 'linguistics/iso639'
@@ -22,46 +13,46 @@ describe Linguistics::ISO639 do
 
 	# eng||en|English|anglais
 	it "loads simple language codes from its __DATA__ section" do
-		Linguistics::LANGUAGE_CODES.should have_key( :en )
-		Linguistics::LANGUAGE_CODES[ :en ].should have(3).members
+		expect( Linguistics::LANGUAGE_CODES ).to have_key( :en )
+		expect( Linguistics::LANGUAGE_CODES[:en] ).to have(3).members
 
-		Linguistics::LANGUAGE_CODES[ :en ].should have_key( :codes )
-		Linguistics::LANGUAGE_CODES[ :en ][:codes].should have(2).members
-		Linguistics::LANGUAGE_CODES[ :en ][:codes].should include("en", "eng")
+		expect( Linguistics::LANGUAGE_CODES[:en] ).to have_key( :codes )
+		expect( Linguistics::LANGUAGE_CODES[:en][:codes] ).to have(2).members
+		expect( Linguistics::LANGUAGE_CODES[:en][:codes] ).to include("en", "eng")
 
-		Linguistics::LANGUAGE_CODES[ :en ].should have_key( :eng_name )
-		Linguistics::LANGUAGE_CODES[ :en ][:eng_name].should == 'English'
-		Linguistics::LANGUAGE_CODES[ :en ].should have_key( :fre_name )
-		Linguistics::LANGUAGE_CODES[ :en ][:fre_name].should == 'anglais'
+		expect( Linguistics::LANGUAGE_CODES[:en] ).to have_key( :eng_name )
+		expect( Linguistics::LANGUAGE_CODES[:en][:eng_name] ).to eq( 'English' )
+		expect( Linguistics::LANGUAGE_CODES[:en] ).to have_key( :fre_name )
+		expect( Linguistics::LANGUAGE_CODES[:en][:fre_name] ).to eq( 'anglais' )
 	end
 
 	it "loads language codes with variants from its __DATA__ section" do
 
 		# cze|ces|cs|Czech|tchèque
-		Linguistics::LANGUAGE_CODES.should have_key( :cs )
-		Linguistics::LANGUAGE_CODES[ :cs ].should have(3).members
+		expect( Linguistics::LANGUAGE_CODES ).to have_key( :cs )
+		expect( Linguistics::LANGUAGE_CODES[:cs] ).to have(3).members
 
-		Linguistics::LANGUAGE_CODES[ :cs ].should have_key( :codes )
-		Linguistics::LANGUAGE_CODES[ :cs ][:codes].should have(3).members
-		Linguistics::LANGUAGE_CODES[ :cs ][:codes].should include("cs", "ces", "cze")
+		expect( Linguistics::LANGUAGE_CODES[:cs] ).to have_key( :codes )
+		expect( Linguistics::LANGUAGE_CODES[:cs][:codes] ).to have(3).members
+		expect( Linguistics::LANGUAGE_CODES[:cs][:codes] ).to include("cs", "ces", "cze")
 
-		Linguistics::LANGUAGE_CODES[ :cs ].should have_key( :eng_name )
-		Linguistics::LANGUAGE_CODES[ :cs ][:eng_name].should == 'Czech'
-		Linguistics::LANGUAGE_CODES[ :cs ].should have_key( :fre_name )
-		Linguistics::LANGUAGE_CODES[ :cs ][:fre_name].should == 'tchèque'
+		expect( Linguistics::LANGUAGE_CODES[:cs] ).to have_key( :eng_name )
+		expect( Linguistics::LANGUAGE_CODES[:cs][:eng_name] ).to eq( 'Czech' )
+		expect( Linguistics::LANGUAGE_CODES[:cs] ).to have_key( :fre_name )
+		expect( Linguistics::LANGUAGE_CODES[:cs][:fre_name] ).to eq( 'tchèque' )
 
 		# mac|mkd|mk|Macedonian|macédonien
-		Linguistics::LANGUAGE_CODES.should have_key( :mk )
-		Linguistics::LANGUAGE_CODES[ :mk ].should have( 3 ).members
+		expect( Linguistics::LANGUAGE_CODES ).to have_key( :mk )
+		expect( Linguistics::LANGUAGE_CODES[:mk] ).to have( 3 ).members
 
-		Linguistics::LANGUAGE_CODES[ :mk ].should have_key( :codes )
-		Linguistics::LANGUAGE_CODES[ :mk ][:codes].should have(3).members
-		Linguistics::LANGUAGE_CODES[ :mk ][:codes].should include("mk", "mac", "mkd")
+		expect( Linguistics::LANGUAGE_CODES[:mk] ).to have_key( :codes )
+		expect( Linguistics::LANGUAGE_CODES[:mk][:codes] ).to have(3).members
+		expect( Linguistics::LANGUAGE_CODES[:mk][:codes] ).to include("mk", "mac", "mkd")
 
-		Linguistics::LANGUAGE_CODES[ :mk ].should have_key( :eng_name )
-		Linguistics::LANGUAGE_CODES[ :mk ][:eng_name].should == 'Macedonian'
-		Linguistics::LANGUAGE_CODES[ :mk ].should have_key( :fre_name )
-		Linguistics::LANGUAGE_CODES[ :mk ][:fre_name].should == 'macédonien'
+		expect( Linguistics::LANGUAGE_CODES[:mk] ).to have_key( :eng_name )
+		expect( Linguistics::LANGUAGE_CODES[:mk][:eng_name] ).to eq( 'Macedonian' )
+		expect( Linguistics::LANGUAGE_CODES[:mk] ).to have_key( :fre_name )
+		expect( Linguistics::LANGUAGE_CODES[:mk][:fre_name] ).to eq( 'macédonien' )
 
 	end
 

data/spec/linguistics/monkeypatches_spec.rb

@@ -1,17 +1,8 @@
 #!/usr/bin/env spec -cfs
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-
-	libdir = basedir + "lib"
-
-	$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 )
-}
+require_relative '../helpers'
 
 require 'rspec'
-require 'spec/lib/helpers'
 
 require 'linguistics'
 require 'linguistics/monkeypatches'
@@ -21,20 +12,20 @@ describe Array, "extended with Linguistics::ArrayExtensions" do
 
 	it "can return a copy of itself with a separator between each element" do
 		ary = %w[one two three]
-		ary.separate( 'and' ).should == [ 'one', 'and', 'two', 'and', 'three' ]
+		expect( ary.separate( 'and' ) ).to eq([ 'one', 'and', 'two', 'and', 'three' ])
 	end
 
 	it "can return a copy of itself with each element separated by the return value of a block" do
 		ary = %w[thumpy lippy barky tiger]
 		result = ary.separate {|left, right| (left > right) ? '>' : '<' }
-		result.should == [ 'thumpy', '>', 'lippy', '>', 'barky', '<', 'tiger' ]
+		expect( result ).to eq([ 'thumpy', '>', 'lippy', '>', 'barky', '<', 'tiger' ])
 	end
 
 	it "provides a mutator variant of #separate" do
 		ary = %w[one two three]
 		result = ary.separate!( nil )
-		result.should equal( ary )
-		result.should == [ 'one', nil, 'two', nil, 'three' ]
+		expect( result ).to equal( ary )
+		expect( result ).to eq([ 'one', nil, 'two', nil, 'three' ])
 	end
 
 end