Linguistics 1.0.3 → 1.0.5

data/lib/linguistics/en/wordnet.rb

@@ -81,20 +81,19 @@
 #  $Id: wordnet.rb,v 1.3 2003/09/14 11:28:02 deveiant Exp $
 # 
 
-module Linguistics
-module EN
+module Linguistics::EN
 
-	@hasWordnet		= false
-	@wnError		= nil
-	@wnLexicon		= nil
+	@has_wordnet		= false
+	@wn_error		= nil
+	@wn_lexicon		= nil
 
 	# Load WordNet and open the lexicon if possible, saving the error that
 	# occurs if anything goes wrong.
 	begin
 		require 'wordnet'
-		@hasWordnet = true
+		@has_wordnet = true
 	rescue LoadError => err
-		@wnError = err
+		@wn_error = err
 	end
 
 
@@ -104,22 +103,22 @@ module EN
 	class << self
 
 		### Returns +true+ if WordNet was loaded okay
-		def hasWordnet? ; @hasWordnet; end
+		def has_wordnet? ; @has_wordnet; end
 
 		### If #haveWordnet? returns +false+, this can be called to fetch the
 		### exception which was raised when WordNet was loaded.
-		def wnError ; @wnError; end
+		def wn_error ; @wn_error; end
 
 		### The instance of the WordNet::Lexicon used for all Linguistics WordNet
 		### functions.
-		def wnLexicon
-			if @wnError
+		def wn_lexicon
+			if @wn_error
 				raise NotImplementedError,
 					"WordNet functions are not loaded: %s" %
-					@wnError.message
+					@wn_error.message
 			end
 
-			@wnLexicon ||= WordNet::Lexicon::new
+			@wn_lexicon ||= WordNet::Lexicon::new
 		end
 
 		### Make a function that calls the method +meth+ on the synset of an input
@@ -152,17 +151,17 @@ module EN
 	### Look up the synset associated with the given word or collocation in the
 	### WordNet lexicon and return a WordNet::Synset object.
 	def synset( word, pos=nil, sense=1 )
-		lex = Linguistics::EN::wnLexicon
-		if pos.is_a?( Fixnum)
+		lex = Linguistics::EN::wn_lexicon
+		if pos.is_a?( Fixnum )
 			sense = pos
 			pos = nil
 		end
 		postries = pos ? [pos] : [:noun, :verb, :adjective, :adverb, :other]
 		syn = nil
 
-		postries.each {|pos|
+		postries.each do |pos|
 			break if syn = lex.lookupSynsets( word.to_s, pos, sense )
-		}
+		end
 
 		return syn
 	end
@@ -172,7 +171,7 @@ module EN
 	### the WordNet lexicon and return an Array of WordNet::Synset objects. If
 	### +pos+ is +nil+, return synsets for all parts of speech.
 	def synsets( word, pos=nil )
-		lex = Linguistics::EN::wnLexicon
+		lex = Linguistics::EN::wn_lexicon
 		postries = pos ? [pos] : [:noun, :verb, :adjective, :adverb, :other]
 		syns = []
 
@@ -199,16 +198,27 @@ module EN
 
 	# Returns the name of the lexicographer file that contains the raw data for
 	# the receiver.
-	def_synset_function :lexInfo
+	def_synset_function :lex_info
 
 	# :TODO: Finish these comments, and figure out how the hell to get the
 	# methods to show up in RDoc.
 	def_synset_function :frames
 
+
+	# Returns the synsets for the receiver's antonyms, if any. Ex:
+	# 'opaque'.en.synset.antonyms
+	#   ==> [#<WordNet::Synset:0x010ca614/454927 clear (adjective): "free
+	#        from cloudiness; allowing light to pass through; "clear water";
+	#        "clear plastic bags"; "clear glass"; "the air is clear and clean""
+	#        (similarTos: 6, attributes: 1, derivations: 2, antonyms: 1,
+	#        seeAlsos: 1)>]
 	def_synset_function :antonyms
+
 	def_synset_function :hypernyms
+    def_synset_function :instanceHypernyms
 	def_synset_function :entailment
 	def_synset_function :hyponyms
+    def_synset_function :instanceHyponyms
 	def_synset_function :causes
 	def_synset_function :verbgroups
 	def_synset_function :similarTo
@@ -248,6 +258,5 @@ module EN
 	def_synset_function :usageMembers
 
 
-end # module EN
-end # module Linguistics
+end # module Linguistics::EN
 

data/test.rb

@@ -37,12 +37,12 @@ ARGV.options {|oparser|
 
 	oparser.on( "--debug", "-d", TrueClass, "Turn debugging on" ) {
 		$DEBUG = true
-		debugMsg "Turned debugging on."
+		debug_msg "Turned debugging on."
 	}
 
 	oparser.on( "--verbose", "-v", TrueClass, "Make progress verbose" ) {
 		$VERBOSE = true
-		debugMsg "Turned verbose on."
+		debug_msg "Turned verbose on."
 	}
 
 	# Handle the 'help' option
@@ -68,9 +68,9 @@ Find.find( File::join($basedir,"tests") ) {|file|
  		Find.prune unless patterns.find {|pat| pat =~ file}
  	end
 
-	debugMsg "Considering '%s': " % file
+	debug_msg "Considering '%s': " % file
 	next unless file =~ /\.tests.rb$/
-	debugMsg "Requiring '%s'..." % file
+	debug_msg "Requiring '%s'..." % file
 	require "#{file}"
 	requires << file
 }

data/tests/en/conjunction.tests.rb

@@ -3,7 +3,7 @@
 # Unit test for English conjunctions 
 # $Id: conjunction.tests.rb,v 1.2 2003/09/11 05:03:12 deveiant Exp $
 #
-# Copyright (c) 2003 The FaerieMUD Consortium.
+# Copyright (c) 2003, 2005 The FaerieMUD Consortium.
 # 
 
 unless defined? Linguistics::TestCase
@@ -18,7 +18,7 @@ end
 ### parses in which the actual parser-generator's behaviour is defined.
 class EnglishConjunctionsTestCase < Linguistics::TestCase
 
-	Linguistics::use( :en )
+	Linguistics::use( :en, :installProxy => true )
 	include Linguistics::EN
 	
 	Tests = {
@@ -108,7 +108,93 @@ class EnglishConjunctionsTestCase < Linguistics::TestCase
 	###	T E S T S
 	#################################################################
 
+	Items = %w{cow chicken blancmange cyclist}
 
+	# Test for defect #6
+	def test_conjunction_should_use_supplied_block_for_object_transform_on_first_invocation
+		rval = nil
+
+		# Create a new class, as we need to guarantee that this will be the
+		# first #conjunction call to it.
+		collection = Class::new {
+			include Enumerable, Linguistics
+			def initialize( *ary )
+				@ary = ary.flatten
+			end
+
+			# Delegate #each to the contained Array
+			def each( &block )
+				@ary.each( &block )
+			end
+		}
+
+		obj = collection.new( 'foo', 'bar', 'baz' )
+
+		assert_nothing_raised do
+			rval = obj.en.conjunction {|word| "%d-letter word" % word.length }
+		end
+	end
+
+
+	def test_conjunction_should_use_supplied_block_for_object_transform
+		rval = nil
+
+		assert_nothing_raised do
+			rval = Items.en.conjunction {|word| "%s-word" % word[0,1]}
+		end
+
+		assert_equal "three c-words and a b-word", rval
+	end
+
+
+	def test_conjunction_should_use_supplied_block_for_object_transform_through_autoproxy
+		rval = nil
+
+		assert_nothing_raised do
+			rval = Items.conjunction {|word| "%s-word" % word[0,1]}
+		end
+
+		assert_equal "three c-words and a b-word", rval
+	end
+
+	def test_conjunction_with_penultimate_separator_turned_off_should_not_use_one
+		rval = nil
+		
+		assert_nothing_raised do
+			rval = Items.en.conjunction( :penultimate => false )
+		end
+		
+		assert_equal "a cow, a chicken, a blancmange and a cyclist", rval
+	end
+
+	def test_three_item_conjunction_should_honor_penultimate_setting
+		rval = nil
+		
+		assert_nothing_raised do
+			rval = %w{duck cow dog}.en.conjunction( :penultimate => false )
+		end
+		
+		assert_equal "a duck, a cow and a dog", rval
+	end
+
+	def test_conjunction_uses_alt_separator_if_phrases_include_the_primary_one
+		rval = nil
+		scene_items = [
+			"desk with stamps, paper, and envelopes on it",
+			"basket containing milk, eggs, and broccoli",
+			"chair",
+			"wooden chest",
+			"hat rack",
+		]
+		
+		assert_nothing_raised do
+			rval = scene_items.conjunction
+		end
+		
+		assert_equal "a desk with stamps, paper, and envelopes on it; " +
+			"a basket containing milk, eggs, and broccoli; " +
+			"a chair; a wooden chest; and a hat rack", rval
+	end
 
 end
 

data/tests/en/inflect.tests.rb

@@ -3,7 +3,7 @@
 # Unit test for English inflection 
 # $Id: inflect.tests.rb,v 1.2 2003/09/11 05:04:04 deveiant Exp $
 #
-# Copyright (c) 2003 The FaerieMUD Consortium.
+# Copyright (c) 2003, 2005 The FaerieMUD Consortium.
 # 
 # Much of this test was adapted from the test script for Lingua::EN::Inflect by
 # Damien Conway:
@@ -265,7 +265,7 @@ class EnglishInflectionTestCase < Linguistics::TestCase
 	begin
 		inDataSection = false
 		methodCounter = 100
-		File::readlines( __FILE__ ).find_all {|line|
+		File::readlines( __FILE__ ).find_all do |line|
 			case line
 			when /^__END_DATA__$/
 				inDataSection = false
@@ -278,7 +278,7 @@ class EnglishInflectionTestCase < Linguistics::TestCase
 			else
 				inDataSection
 			end
-		}.each {|line|
+		end.each do |line|
 			case line
 			when PluralDataLine
 				singular, plural, altplural, comment = $~.to_a[1,4]
@@ -301,9 +301,9 @@ class EnglishInflectionTestCase < Linguistics::TestCase
 
 				methodCounter += 1
 			else
-				debugMsg "Skipped test data line '#{line.chomp}'"
+				debug_msg "Skipped test data line '#{line.chomp}'"
 			end
-		}
+		end
 	end
 
 	### Overridden initializer: auto-generated test methods have an arity of 1
@@ -363,6 +363,17 @@ class EnglishInflectionTestCase < Linguistics::TestCase
 	end
 
 
+	def test_numwords_with_an_symboland_should_use_it_to_join_words
+		rval = nil
+		
+		assert_nothing_raised do
+			rval = 2006.en.numwords( :and => ' ' )
+		end
+		
+		assert_equal "two thousand six", rval
+	end
+
+
 	def test_0040_ordinalNumbers
 		printTestHeader "English: Numbers to ordinals"
 		rval = nil

data/tests/lingtestcase.rb

@@ -33,7 +33,7 @@
 # 
 # == Rcsid
 # 
-# $Id: lingtestcase.rb 78 2005-07-13 19:58:43Z ged $
+# $Id: lingtestcase.rb 95 2007-06-13 05:25:38Z deveiant $
 # 
 # == Authors
 # 
@@ -89,7 +89,7 @@ module Linguistics
 
 		### Output the specified <tt>msgs</tt> joined together to
 		### <tt>STDERR</tt> if <tt>$DEBUG</tt> is set.
-		def self::debugMsg( *msgs )
+		def self::debug_msg( *msgs )
 			return unless $DEBUG
 			self.message "DEBUG>>> %s" % msgs.join('')
 		end
@@ -132,7 +132,7 @@ module Linguistics
 		### Forward-compatibility method for namechange in Test::Unit
 		def setup( *args )
 			self.class.setupBlocks.each {|sblock|
-				debugMsg "Calling setup block method #{sblock}"
+				debug_msg "Calling setup block method #{sblock}"
 				self.send( sblock )
 			}
 			super( *args )
@@ -144,7 +144,7 @@ module Linguistics
 		def teardown( *args )
 			super( *args )
 			self.class.teardownBlocks.each {|tblock|
-				debugMsg "Calling teardown block method #{tblock}"
+				debug_msg "Calling teardown block method #{tblock}"
 				self.send( tblock )
 			}
 		end
@@ -158,8 +158,8 @@ module Linguistics
 
 
 		### Instance alias for the like-named class method
-		def debugMsg( *msgs )
-			self.class.debugMsg( *msgs )
+		def debug_msg( *msgs )
+			self.class.debug_msg( *msgs )
 		end
 
 

data/tests/use.tests.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 #
 # Unit test for the 'use' function of the Linguistics module.
-# $Id: use.tests.rb 78 2005-07-13 19:58:43Z ged $
+# $Id: use.tests.rb 95 2007-06-13 05:25:38Z deveiant $
 #
 # Copyright (c) 2003 The FaerieMUD Consortium.
 # 
@@ -63,7 +63,7 @@ class UseTestCase < Linguistics::TestCase
 		Linguistics::use( :en )
 
 		[ TestArray, TestString, TestNumber ].each do |obj|
-			debugMsg "obj.class.instance_variables = %s" %
+			debug_msg "obj.class.instance_variables = %s" %
 				obj.class.instance_variables.inspect
 
 			assert_respond_to obj, :en

data/utils.rb

@@ -1,6 +1,6 @@
 #
 #	Install/distribution utility functions
-#	$Id: utils.rb 8 2005-07-13 12:35:15Z ged $
+#	$Id: utils.rb 10 2005-08-07 03:28:54Z ged $
 #
 #	Copyright (c) 2001-2005, The FaerieMUD Consortium.
 #
@@ -168,7 +168,7 @@ module UtilityFunctions
 
 	### Output the specified <tt>msg</tt> as an ANSI-colored debugging message
 	### (yellow on blue).
-	def debugMsg( msg )
+	def debug_msg( msg )
 		return unless $DEBUG
 		msg.chomp!
 		$stderr.puts ansiCode( 'bold', 'yellow', 'on_blue' ) + ">>> #{msg}" + ansiCode( 'reset' )
@@ -372,7 +372,7 @@ module UtilityFunctions
 
 		Dir::chdir( directory ) do
 			output = %x{svn info}
-			debugMsg( "Using info: %p" % output )
+			debug_msg( "Using info: %p" % output )
 
 			if /^URL: \s* ( .* )/xi.match( output )
 				uri = URI::parse( $1 )
@@ -527,7 +527,7 @@ module UtilityFunctions
 		if File::exists? catalogFile
 			verboseMsg "Extracting '#{keyword}' from CATALOG file (%s).\n" % catalogFile
 			File::foreach( catalogFile ) {|line|
-				debugMsg( "Examining line #{line.inspect}..." )
+				debug_msg( "Examining line #{line.inspect}..." )
 				val = $1.strip and break if /^#\s*#{keyword}:\s*(.*)$/i =~ line
 			}
 		end
@@ -623,12 +623,12 @@ module UtilityFunctions
 
 
 	### Try the specified code block, printing the given 
-	def try( msg, bind=nil )
+	def try( msg, bind=TOPLEVEL_BINDING )
 		result = ''
 		if msg =~ /^to\s/
-			message = "Trying #{msg}..."
+			message "Trying #{msg}...\n"
 		else
-			message = msg
+			message msg + "\n"
 		end
 			
 		begin

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.8
+rubygems_version: 0.9.2
 specification_version: 1
 name: Linguistics
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2005-07-14
-summary: "A generic, language-neutral framework for extending Ruby objects with linguistic
-  methods."
+  version: 1.0.5
+date: 2007-06-12 00:00:00 -07:00
+summary: A generic, language-neutral framework for extending Ruby objects with linguistic methods.
 require_paths: 
-  - lib
-email: "ged@FaerieMUD.org, stillflame@FaerieMUD.org"
+- lib
+email: ged@FaerieMUD.org, stillflame@FaerieMUD.org
 homepage: http://www.deveiate.org/projects/Linguistics/
 rubyforge_project: 
 description: 
@@ -19,40 +18,49 @@ bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
-  - "Michael Granger, Martin Chase"
+- Michael Granger, Martin Chase
 files: 
-  - Artistic
-  - experiments/randobjlist.rb
-  - install.rb
-  - lib/linguistics/en.rb
-  - lib/linguistics/iso639.rb
-  - lib/linguistics.rb
-  - lib/linguistics/en/infinitive.rb
-  - lib/linguistics/en/linkparser.rb
-  - lib/linguistics/en/wordnet.rb
-  - MANIFEST
-  - README
-  - README.english
-  - redist/crosscase.rb
-  - test.rb
-  - tests/en/conjunction.tests.rb
-  - tests/en/inflect.tests.rb
-  - tests/lingtestcase.rb
-  - tests/use.tests.rb
-  - TODO
-  - utils.rb
-  - ChangeLog
+- Artistic
+- experiments/randobjlist.rb
+- install.rb
+- lib/linguistics/en.rb
+- lib/linguistics/iso639.rb
+- lib/linguistics.rb
+- lib/linguistics/en/infinitive.rb
+- lib/linguistics/en/linkparser.rb
+- lib/linguistics/en/wordnet.rb
+- MANIFEST
+- README
+- README.english
+- redist/crosscase.rb
+- test.rb
+- tests/en/conjunction.tests.rb
+- tests/en/inflect.tests.rb
+- tests/lingtestcase.rb
+- tests/use.tests.rb
+- TODO
+- utils.rb
+- ChangeLog
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+