Linguistics 1.0.3 → 1.0.5

data/ChangeLog

@@ -186,7 +186,7 @@ r47 | deveiant | 2003-09-14 05:29:15 -0400 (Sun, 14 Sep 2003) | 13 lines
 
 - Touched up the file description a bit.
 
-- @lpError now intitialized: bug spotted by Martin Chase.
+- @lp_error now intitialized: bug spotted by Martin Chase.
 
 - Calls to #linkParse no longer trap parse errors. This was done for two
   reasons:
@@ -266,7 +266,7 @@ r37 | deveiant | 2003-09-11 00:55:11 -0400 (Thu, 11 Sep 2003) | 10 lines
 - Added support for MyClass::extend( Linguistics ) and class MyClass; include
   Linguistics; end.
 
-- Modified code in #loadLanguage to minimize the number of requires.
+- Modified code in #load_language to minimize the number of requires.
 
 ------------------------------------------------------------------------
 r36 | deveiant | 2003-09-11 00:52:32 -0400 (Thu, 11 Sep 2003) | 2 lines

data/README

@@ -9,25 +9,16 @@
 
 == Requirements
 
-* Ruby >= 1.8.0
-
-The following libraries are required, but are included in the redist/
-directory. The installer script should install these for you if you don't
-already have them.
-
-* HashSlice - Adds slicing to the builtin Hash class
+* Ruby >= 1.8.4
 
 
 == Optional
 
-* CrossCase - Provide auto-aliasing of camelCase to under_barred methods and
-  vice-versa. (Included in redist/)
-
 * Ruby-WordNet (>= 0.02) - adds integration for the Ruby binding for the WordNet� lexical
   reference system.
 
-  URL: http://www.deveiate.org/code/Ruby-WordNet.html
-  Download: http://www.deveiate.org/code/Ruby-WordNet-0.02.tar.gz
+  URL: http://deveiate.org/projects/Ruby-WordNet
+  Download: http://deveiate.org/code/Ruby-WordNet-0.02.tar.gz
 
 * LinkParser (>= 0.0.4) - adds integration for the Ruby Link Grammar Parser by
   Martin Chase.
@@ -38,16 +29,16 @@ already have them.
 
 == General Information
 
-This module is a framework for building linguistic utilities for Ruby objects in
-any language. It includes a generic language-independant front end, a module for
-mapping language codes into language names, and a module which contains various
-English-language utilities.
+This module is a framework for building linguistic utilities for Ruby objects
+in any language. It includes a generic language-independant front end, a
+module for mapping language codes into language names, and a module which
+contains various English-language utilities.
 
 
 === Method Interface
 
-The Linguistics module comes with a language-independant mechanism for extending
-core Ruby classes with linguistic methods. 
+The Linguistics module comes with a language-independant mechanism for
+extending core Ruby classes with linguistic methods.
 
 It consists of three parts: a core linguistics module which contains the
 class-extension framework for languages, a generic inflector class that serves
@@ -61,8 +52,8 @@ language-specific methods to be added to objects without cluttering up the
 interface or risking collision between them, albeit at the cost of three or four
 more characters per method invocation.
 
-If you don't like extending core Ruby classes, the language modules should also
-allow you to use them as a function library as well.
+If you don't like extending core Ruby classes, the language modules should
+also allow you to use them as a function library as well.
 
 For example, the English-language module contains a #plural function which can
 be accessed via a method on a core class:
@@ -77,8 +68,8 @@ or via the Linguistics::EN::plural function directly:
   plural( "goose" )
   # => "geese"
 
-The class-extension mechanism actually uses the functional interface behind the
-scenes.
+The class-extension mechanism actually uses the functional interface behind
+the scenes.
 
 A new feature with the 0.02 release: You can now omit the language-code method
 for unambiguous methods by calling Linguistics::use with the +:installProxy+
@@ -101,13 +92,13 @@ More about how this works in the documentation for Linguistics::use.
 To add a new language to the framework, create a file named the same as the
 ISO639 2- or 3-letter language code for the language you're adding. It must be
 placed under lib/linguistics/ to be recognized by the linguistics module, but
-you can also just require it yourself prior to calling Linguistics::use(). This
-file should define a module under Linguistics that is an all-caps version of the
-code used in the filename. Any methods you wish to be exposed to users should be
-declared as module functions (ie., using Module#module_function).
+you can also just require it yourself prior to calling Linguistics::use().
+This file should define a module under Linguistics that is an all-caps version
+of the code used in the filename. Any methods you wish to be exposed to users
+should be declared as module functions (ie., using Module#module_function).
 
-You may also wish to add your module to the list of default languages by adding
-the appropriate symbol to the Linguistics::DefaultLanguages array.
+You may also wish to add your module to the list of default languages by
+adding the appropriate symbol to the Linguistics::DefaultLanguages array.
 
 For example, to create a Portuguese-language module, create a file called
 'lib/linguistics/pt.rb' which contains the following:
@@ -128,8 +119,8 @@ See the English language module (lib/linguistics/en.rb) for an example.
 
 See the README.english file for a synopsis.
 
-The English-language module currently contains linguistic functions ported from
-a few excellent Perl modules:
+The English-language module currently contains linguistic functions ported
+from a few excellent Perl modules:
 
   Lingua::EN::Inflect
   Lingua::Conjunction
@@ -137,8 +128,8 @@ a few excellent Perl modules:
 
 See the lib/linguistics/en.rb file for specific attributions.
 
-New with version 0.02: integration with the Ruby WordNet� and LinkParser modules
-(which must be installed separately).
+New with version 0.02: integration with the Ruby WordNet� and LinkParser
+modules (which must be installed separately).
 
 
 == To Do
@@ -148,8 +139,8 @@ New with version 0.02: integration with the Ruby WordNet
   additional stemming functions and some other strategies are ongoing.
 
 * Martin Chase <stillflame at FaerieMUD dot org> is working on an integration
-  module for his excellent work on a Ruby interface to the CMU Link Grammar (an
-  english-sentence parser). This will make writing fairly accurate natural
+  module for his excellent work on a Ruby interface to the CMU Link Grammar
+  (an english-sentence parser). This will make writing fairly accurate natural
   language parsers in Ruby much easier.
 
 * Suggestions (and patches) for any of these items or additional features are
@@ -159,8 +150,8 @@ New with version 0.02: integration with the Ruby WordNet
 
 == Legal
 
-This module is Open Source Software which is Copyright (c) 2003 by The FaerieMUD
-Consortium. All rights reserved.
+This module is Open Source Software which is Copyright (c) 2003 by The
+FaerieMUD Consortium. All rights reserved.
 
 You may use, modify, and/or redistribute this software under the terms of the
 Perl Artistic License, a copy of which should have been included in this
@@ -168,9 +159,9 @@ distribution (See the file Artistic). If it was not, a copy of it may be
 obtained from http://language.perl.com/misc/Artistic.html or
 http://www.faeriemud.org/artistic.html).
 
-THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.
+THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 
  $Id: README,v 1.6 2003/10/09 13:21:48 deveiant Exp $

data/install.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/ruby
 #
-#	Linguistics Module Install Script
-#	$Id: install.rb,v 1.3 2003/10/09 13:23:09 deveiant Exp $
+#	Module Install Script
+#	$Id: install.rb 11 2005-08-07 03:30:22Z ged $
 #
 #	Thanks to Masatoshi SEKI for ideas found in his install.rb.
 #
-#	Copyright (c) 2001-2004 The FaerieMUD Consortium.
+#	Copyright (c) 2001-2005 The FaerieMUD Consortium.
 #
 #	This is free software. You may use, modify, and/or redistribute this
 #	software under the terms of the Perl Artistic License. (See
@@ -20,17 +20,18 @@ include Config
 
 require 'find'
 require 'ftools'
+require 'optparse'
 
-
-$version	= %q$Revision: 1.3 $
-$rcsId		= %q$Id: install.rb,v 1.3 2003/10/09 13:23:09 deveiant Exp $
+$version	= %q$Revision: 11 $
+$rcsId		= %q$Id: install.rb 11 2005-08-07 03:30:22Z ged $
 
 # Define required libraries
 RequiredLibraries = [
-	# libraryname, nice name, RAA URL, Download URL
-# 	[ 'hashslice', "Ruby-Hashslice", 
-# 		'http://www.ruby-lang.org/en/raa-list.rhtml?name=Ruby-HashSlice',
-# 		'http://www.devEiate.org/code/Ruby-HashSlice-1.03.tar.gz' ],
+	# libraryname, nice name, RAA URL, Download URL, e.g.,
+	#[ 'strscan', "Strscan", 
+	#	'http://www.ruby-lang.org/en/raa-list.rhtml?name=strscan',
+	#	'http://i.loveruby.net/archive/strscan/strscan-0.6.7.tar.gz',
+	#],
 ]
 
 class Installer
@@ -122,31 +123,61 @@ class Installer
 
 end
 
+
 if $0 == __FILE__
-	header "Linguistics Installer #$version"
+	dryrun = false
 
-	for lib in RequiredLibraries
-		testForRequiredLibrary( *lib )
-	end
+	# Parse command-line switches
+	ARGV.options {|oparser|
+		oparser.banner = "Usage: #$0 [options]\n"
 
-	viewOnly = ARGV.include? '-n'
-	verbose = ARGV.include? '-v'
+		oparser.on( "--verbose", "-v", TrueClass, "Make progress verbose" ) {
+			$VERBOSE = true
+			debug_msg "Turned verbose on."
+		}
 
-	# "Compatibility" with Aoki-san's install.rb
-	if ARGV.include?( 'config' ) || ARGV.include?( 'setup' )
-		print "Ok."
-		exit
+		oparser.on( "--dry-run", "-n", TrueClass, "Don't really install anything" ) {
+			debug_msg "Turned dry-run on."
+			dryrun = true
+		}
+
+		# Handle the 'help' option
+		oparser.on( "--help", "-h", "Display this text." ) {
+			$stderr.puts oparser
+			exit!(0)
+		}
+
+		oparser.parse!
+	}
+
+	# Don't do anything if they expect this to be the three-step install script
+	# and they aren't doing the 'install' step.
+	if ARGV.include?( "config" )
+		for lib in RequiredLibraries
+			testForRequiredLibrary( *lib )
+		end
+		puts "Done."
+	elsif ARGV.include?( "setup" )
+		puts "Done."
+	elsif ARGV.empty?
+		for lib in RequiredLibraries
+			testForRequiredLibrary( *lib )
+		end
 	end
 
-	debugMsg "Sitelibdir = '#{CONFIG['sitelibdir']}'"
-	sitelibdir = CONFIG['sitelibdir']
-	debugMsg "Sitearchdir = '#{CONFIG['sitearchdir']}'"
-	sitearchdir = CONFIG['sitearchdir']
+	if ARGV.empty? || ARGV.include?( "install" )
+		debug_msg "Sitelibdir = '#{CONFIG['sitelibdir']}'"
+		sitelibdir = CONFIG['sitelibdir']
+		debug_msg "Sitearchdir = '#{CONFIG['sitearchdir']}'"
+		sitearchdir = CONFIG['sitearchdir']
+
+		message "Installing..."
+		i = Installer.new( dryrun )
+		#i.installFiles( "redist", sitelibdir, 0444, verbose )
+		i.installFiles( "lib", sitelibdir, 0444, $VERBOSE )
 
-	message "Installing\n"
-	i = Installer.new( viewOnly )
-	i.installFiles( "redist", sitelibdir, 0444, verbose )
-	i.installFiles( "lib", sitelibdir, 0444, verbose )
+		message "done.\n"
+	end
 end
 	
 

data/lib/linguistics.rb

@@ -23,7 +23,7 @@
 # 
 # == Version
 #
-#  $Id: linguistics.rb 78 2005-07-13 19:58:43Z ged $
+#  $Id: linguistics.rb 95 2007-06-13 05:25:38Z deveiant $
 # 
 
 require 'linguistics/iso639'
@@ -35,10 +35,10 @@ module Linguistics
 	### Class constants
 
 	# Subversion revision
-	SVNRev = %q$Rev: 78 $
+	SVNRev = %q$Rev: 95 $
 
 	# Subversion ID
-	SVNid = %q$Id: linguistics.rb 78 2005-07-13 19:58:43Z ged $
+	SVNid = %q$Id: linguistics.rb 95 2007-06-13 05:25:38Z deveiant $
 
 	# Language module implementors should do something like:
 	#   Linguistics::DefaultLanguages.push( :ja ) # or whatever
@@ -86,7 +86,7 @@ module Linguistics
 
 		### Autoload linguistic methods defined in the module this object's
 		### class uses for inflection.
-		def method_missing( sym, *args )
+		def method_missing( sym, *args, &block )
 			return super unless self.class.langmod.respond_to?( sym )
 
 			self.class.module_eval %{
@@ -95,7 +95,7 @@ module Linguistics
 				end
 			}, "{Autoloaded: " + __FILE__ + "}", __LINE__
 
-			self.method( sym ).call( *args )
+			self.method( sym ).call( *args, &block )
 		end
 
 
@@ -119,11 +119,11 @@ module Linguistics
 		case obj
 		when Class
 			# $stderr.puts "Extending %p" % obj if $DEBUG
-			self::installLanguageProxy( obj )
+			self::install_language_proxy( obj )
 		else
 			sclass = (class << obj; self; end)
 			# $stderr.puts "Extending a object's metaclass: %p" % obj if $DEBUG
-			self::installLanguageProxy( sclass )
+			self::install_language_proxy( sclass )
 		end
 
 		super
@@ -139,7 +139,7 @@ module Linguistics
 
 	### Make an languageProxy class that encapsulates all of the inflect operations
 	### using the given language module.
-	def self::makeLanguageProxy( mod )
+	def self::make_language_proxy( mod )
 		# $stderr.puts "Making language proxy for mod %p" % [mod]
 		Class::new( LanguageProxyClass ) {
 			@langmod = mod
@@ -148,20 +148,20 @@ module Linguistics
 
 
 	### Install the language proxy
-	def self::installLanguageProxy( klass, languages=DefaultLanguages )
+	def self::install_language_proxy( klass, languages=DefaultLanguages )
 		languages.replace( DefaultLanguages ) if languages.empty?
 
 		# Create an languageProxy class for each language specified
-		languages.each {|lang|
+		languages.each do |lang|
 			# $stderr.puts "Extending the %p class with %p" %
 			#	[ klass, lang ] if $DEBUG
 
 			# Load the language module (skipping to the next if it's already
-			# loaded), make an languageProxy class that delegates to it, and figure
-			# out what the languageProxy method will be called.
-			mod = loadLanguage( lang.to_s.downcase )
+			# loaded), make a languageProxy class that delegates to it, and
+			# figure out what the languageProxy method will be called.
+			mod = load_language( lang.to_s.downcase )
 			ifaceMeth = mod.name.downcase.sub( /.*:/, '' )
-			languageProxyClass = makeLanguageProxy( mod )
+			languageProxyClass = make_language_proxy( mod )
 
 			# Install a hash for languageProxy classes and an accessor for the
 			# hash if it's not already present.
@@ -186,14 +186,15 @@ module Linguistics
 					end
 				}, __FILE__, __LINE__
 			end
-		}
+		end
 	end
 
 
 
 	### Install a regular proxy method in the given klass that will delegate
 	### calls to missing method to the languageProxy for the given +language+.
-	def self::installDelegatorProxy( klass, langcode )
+	def self::install_delegator_proxy( klass, langcode )
+		raise ArgumentError, "Missing langcode" if langcode.nil?
 
 		# Alias any currently-extant
 		if klass.instance_methods( false ).include?( "method_missing" )
@@ -204,27 +205,29 @@ module Linguistics
 
 		# Add the #method_missing method that auto-installs delegator methods
 		# for methods supported by the linguistic proxy objects.
-		klass.module_eval {
-			define_method( :method_missing ) do |sym, *args|
+		klass.module_eval %{
+			def method_missing( sym, *args, &block )
 
-				if self.send( langcode ).respond_to?( sym )
+				# If the linguistic delegator answers the message, install a
+				# delegator method and call it.
+				if self.send( :#{langcode} ).respond_to?( sym )
 
-					# $stderr.puts "Installing linguistic delegator method #{sym} " \
+					# $stderr.puts "Installing linguistic delegator method \#{sym} " \
 					#	"for the '#{langcode}' proxy"
 					self.class.module_eval %{
-						def #{sym}( *args )
-							self.#{langcode}.#{sym}( *args )
+						def \#{sym}( *args, &block )
+							self.#{langcode}.\#{sym}( *args, &block )
 						end
 					}
-					self.method( sym ).call( *args )
+					self.method( sym ).call( *args, &block )
 
 				# Otherwise either call the overridden proxy method if there is
 				# one, or just let our parent deal with it.
 				else
 					if self.respond_to?( :__orig_method_missing )
-						return self.__orig_method_missing( sym, *args )
+						return self.__orig_method_missing( sym, *args, &block )
 					else
-						super( sym, *args )
+						super( sym, *args, &block )
 					end
 				end
 			end
@@ -237,6 +240,13 @@ module Linguistics
 	###	L A N G U A G E - I N D E P E N D E N T   F U N C T I O N S
 	#################################################################
 
+
+	### Handle auto-magic usage
+	def self::const_missing( sym )
+		load_language( sym.to_s.downcase )
+	end
+
+
 	###############
 	module_function
 	###############
@@ -271,7 +281,7 @@ module Linguistics
 		classes.each {|klass|
 
 			# Create an languageProxy class for each installed language
-			installLanguageProxy( klass, languages )
+			install_language_proxy( klass, languages )
 
 			# Install the delegator proxy if configured
 			if config[:installProxy]
@@ -281,14 +291,14 @@ module Linguistics
 				when String
 					langcode = config[:installProxy].intern
 				when TrueClass
-					langcode = DefaultLanguages[0]
+					langcode = languages[0] || DefaultLanguages[0] || :en
 				else
 					raise ArgumentError,
 						"Unexpected value %p for :installProxy" %
 						config[:installProxy]
 				end
 
-				installDelegatorProxy( klass, langcode )
+				install_delegator_proxy( klass, langcode )
 			end
 		}
 	end
@@ -332,7 +342,7 @@ module Linguistics
 
 	### Try to load the module that implements the given language, returning
 	### the Module object if successful.
-	def self::loadLanguage( lang )
+	def self::load_language( lang )
 		raise "Unknown language code '#{lang}'" unless
 			LanguageCodes.key?( lang )
 
@@ -342,7 +352,7 @@ module Linguistics
 		mod = LanguageCodes[ lang ][:codes].sort {|a,b|
 			(a.length <=> b.length).nonzero? ||
 			(a <=> b)
-		}.each {|code|
+		}.each do |code|
 			unless Linguistics::const_defined?( code.upcase )
 				begin
 					require "linguistics/#{code}"
@@ -354,7 +364,7 @@ module Linguistics
 
 			break Linguistics::const_get( code.upcase ) if
 				Linguistics::const_defined?( code.upcase )
-		}
+		end
 
 		if mod.is_a?( Array )
 			raise LoadError,