wordnet 1.0.0.pre.127 → 1.0.0.pre.134

data/Manifest.txt

@@ -1,3 +1,4 @@
+ChangeLog
 History.rdoc
 LICENSE
 Manifest.txt
@@ -20,14 +21,12 @@ lib/wordnet.rb
 lib/wordnet/constants.rb
 lib/wordnet/lexicallink.rb
 lib/wordnet/lexicon.rb
-lib/wordnet/mixins.rb
 lib/wordnet/model.rb
 lib/wordnet/morph.rb
 lib/wordnet/semanticlink.rb
 lib/wordnet/sense.rb
 lib/wordnet/sumoterm.rb
 lib/wordnet/synset.rb
-lib/wordnet/utils.rb
 lib/wordnet/word.rb
 spec/lib/helpers.rb
 spec/linguawordnet.tests.rb

data/README.rdoc

@@ -31,7 +31,7 @@ TO-DO: More details and better writing later.
 
 == License
 
-Copyright (c) 2010-2011, The FaerieMUD Consortium
+Copyright (c) 2002-2012, The FaerieMUD Consortium
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -24,16 +24,18 @@ hoespec = Hoe.spec( 'wordnet' ) do
 	self.readme_file = 'README.rdoc'
 	self.history_file = 'History.rdoc'
 	self.extra_rdoc_files = FileList[ '*.rdoc' ]
+	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Ruby WordNet']
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'sequel',  '~> 3.29'
-	self.dependency 'sqlite3', '~> 1.3', :developer
-	self.dependency 'rspec',   '~> 2.7', :developer
+	self.dependency 'sequel',      '~> 3.38'
+	self.dependency 'loggability', '~> 0.5'
+	self.dependency 'sqlite3',     '~> 1.3', :developer
+	self.dependency 'rspec',       '~> 2.7', :developer
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.spec_extras[:post_install_message] = %{
-	If you don't already have a WordNet database installed somewhere, 
+	If you don't already have a WordNet database installed somewhere,
 	you'll need to either download and install one from:
 
 	   http://wnsql.sourceforge.net/
@@ -46,6 +48,9 @@ hoespec = Hoe.spec( 'wordnet' ) do
 	self.require_ruby_version( '>=1.9.2' )
 
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags )
+	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
+
+	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end
 
 ENV['VERSION'] ||= hoespec.spec.version.to_s

data/lib/wordnet.rb

@@ -1,13 +1,18 @@
 #!/usr/bin/env ruby
 #encoding: utf-8
 
-require 'logger'
+require 'loggability'
 require 'sequel'
 
 # This is a Ruby interface to the WordNet® lexical database. It uses the WordNet-SQL
 # project's databases instead of reading from the canonical flatfiles for speed and
 # easy modification.
 module WordNet
+	extend Loggability
+
+	# Loggability API -- Set up a logger for WordNet classes
+	log_as :wordnet
+
 
 	# Release version
 	VERSION = '1.0.0'
@@ -16,9 +21,8 @@ module WordNet
 	REVISION = %q$Revision: $
 
 	# Abort if not >=1.9.2
-	vvec = lambda {|version| version.split('.').collect {|v| v.to_i }.pack('N*') }
 	abort "This version of WordNet requires Ruby 1.9.2 or greater." unless
-		vvec[RUBY_VERSION] >= vvec['1.9.2']
+		RUBY_VERSION >= '1.9.2'
 
 
 	### Lexicon exception - something has gone wrong in the internals of the
@@ -32,50 +36,6 @@ module WordNet
 
 	require 'wordnet/constants'
 	include WordNet::Constants
-	require 'wordnet/utils'
-
-	#
-	# Logging
-	#
-
-	@default_logger = Logger.new( $stderr )
-	@default_logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
-
-	@default_log_formatter = WordNet::LogFormatter.new( @default_logger )
-	@default_logger.formatter = @default_log_formatter
-
-	@logger = @default_logger
-
-	class << self
-		# @return [Logger::Formatter] the log formatter that will be used when the logging
-		#    subsystem is reset
-		attr_accessor :default_log_formatter
-
-		# @return [Logger] the logger that will be used when the logging subsystem is reset
-		attr_accessor :default_logger
-
-		# @return [Logger] the logger that's currently in effect
-		attr_accessor :logger
-		alias_method :log, :logger
-		alias_method :log=, :logger=
-	end
-
-
-	### Reset the global logger object to the default
-	### @return [void]
-	def self::reset_logger
-		self.logger = self.default_logger
-		self.logger.level = Logger::WARN
-		self.logger.formatter = self.default_log_formatter
-	end
-
-
-	### Returns +true+ if the global logger has not been set to something other than
-	### the default one.
-	def self::using_default_logger?
-		return self.logger == self.default_logger
-	end
-
 
 	### Get the WordNet version.
 	### @return [String] the library's version

data/lib/wordnet/constants.rb

@@ -164,11 +164,11 @@ module WordNet::Constants
 
 	# Record-part delimiter
 	DELIM = '||'
-	DELIM_RE = Regexp::new( Regexp::quote(DELIM) )
+	DELIM_RE = Regexp.new( Regexp::quote(DELIM) )
 
 	# Record-subpart delimiter
 	SUB_DELIM = '|'
-	SUB_DELIM_RE = Regexp::new( Regexp::quote(SUB_DELIM) )
+	SUB_DELIM_RE = Regexp.new( Regexp::quote(SUB_DELIM) )
 
 	# Lexicographer file index -- from lexnames(5WN)
 	LEXFILES = [

data/lib/wordnet/lexicon.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/ruby
 
 require 'pathname'
+require 'loggability'
 require 'rubygems'
 
 require 'wordnet' unless defined?( WordNet )
 require 'wordnet/constants'
-require 'wordnet/mixins'
 require 'wordnet/synset'
 require 'wordnet/word'
 
@@ -13,8 +13,11 @@ require 'wordnet/word'
 # WordNet lexicon class - abstracts access to the WordNet lexical
 # database, and provides factory methods for looking up words and synsets.
 class WordNet::Lexicon
-	include WordNet::Constants,
-	        WordNet::Loggable
+	extend Loggability
+	include WordNet::Constants
+
+	# Loggability API -- log to the WordNet module's logger
+	log_to :wordnet
 
 	# class LogTracer
 	# 	def method_missing( sym, msg, &block )
@@ -27,25 +30,33 @@ class WordNet::Lexicon
 
 
 	# Add the logger device to the default options after it's been loaded
-	WordNet::DEFAULT_DB_OPTIONS.merge!( :logger => [WordNet.logger] )
+	WordNet::DEFAULT_DB_OPTIONS.merge!( :logger => [Loggability[WordNet]] )
 	# WordNet::DEFAULT_DB_OPTIONS.merge!( :logger => [LogTracer.new] )
 
 
 	### Get the Sequel URI of the default database, if it's installed.
 	def self::default_db_uri
-		WordNet.log.debug "Fetching the default db URI"
+		self.log.debug "Fetching the default db URI"
+
+		# Try to load the default database gem, ignoring it if it's not installed.
+		begin
+			gem 'wordnet-defaultdb'
+		rescue Gem::LoadError
+		end
 
+		# Now try the gem datadir first, and fall back to a local installation of the
+		# default db
 		datadir = nil
 		if Gem.datadir( 'wordnet-defaultdb' )
 			datadir = Pathname( Gem.datadir('wordnet-defaultdb') )
 		else
-			WordNet.log.warn "  no defaultdb gem; looking for the development database"
+			self.log.warn "  no defaultdb gem; looking for the development database"
 			datadir = Pathname( __FILE__ ).dirname.parent.parent +
 				'wordnet-defaultdb/data/wordnet-defaultdb'
 		end
 
 		dbfile = datadir + 'wordnet30.sqlite'
-		WordNet.log.debug "  dbfile is: %s" % [ dbfile ]
+		self.log.debug "  dbfile is: %s" % [ dbfile ]
 
 		if dbfile.exist?
 			return "sqlite:#{dbfile}"

data/lib/wordnet/model.rb

@@ -1,12 +1,12 @@
 #!/usr/bin/ruby
 
+require 'loggability'
 require 'sequel'
 
 # Use a mock database until the real one is provided by the user
 Sequel::Model.db = Sequel.mock if Sequel::DATABASES.empty?
 
 require 'wordnet' unless defined?( WordNet )
-require 'wordnet/mixins'
 
 module WordNet
 
@@ -18,8 +18,12 @@ module WordNet
 	# 'validation_helpers', 'schema', and 'subclasses' Sequel plugins.
 	#
 	class Model < Sequel::Model
-		include WordNet::Loggable
+		extend Loggability
 
+		# Loggability API -- log to the WordNet module's logger
+		log_to :wordnet
+
+		# Sequel plugins
 		plugin :validation_helpers
 		plugin :schema
 		plugin :subclasses
@@ -46,7 +50,7 @@ module WordNet
 			end
 
 			self.descendents.each do |subclass|
-				WordNet.log.info "Resetting database connection for: %p to: %p" % [ subclass, newdb ]
+				self.log.info "Resetting database connection for: %p to: %p" % [ subclass, newdb ]
 				subclass.db = newdb
 			end
 		end

data/lib/wordnet/morph.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 
 require 'wordnet' unless defined?( WordNet )
-require 'wordnet/mixins'
 require 'wordnet/model'
 
 # WordNet morph model class

data/lib/wordnet/sense.rb

@@ -24,7 +24,7 @@ class WordNet::Sense < WordNet::Model( :senses )
 	def self::lexical_link( type, typekey=nil )
 		typekey ||= type.to_s.chomp( 's' ).to_sym
 
-		WordNet.log.debug "Generating a %p method for %p links" % [ type, typekey ]
+		self.log.debug "Generating a %p method for %p links" % [ type, typekey ]
 
 		method_body = Proc.new do
 			linkinfo = WordNet::Synset.linktype_names[ typekey ] or
@@ -32,7 +32,7 @@ class WordNet::Sense < WordNet::Model( :senses )
 			ssids = self.lexlinks_dataset.filter( :linkid => linkinfo[:id] ).select( :synset2id )
 			self.class.filter( :synsetid => ssids )
 		end
-		WordNet.log.debug "  method body is: %p" % [ method_body ]
+		self.log.debug "  method body is: %p" % [ method_body ]
 
 		define_method( type, &method_body )
 	end

data/lib/wordnet/synset.rb

@@ -153,6 +153,8 @@ class WordNet::Synset < WordNet::Model( :synsets )
 	def_dataset_method( :adjective_satellites ) { filter(pos: 's') }
 
 
+	# :section:
+
 	### Overridden to reset any lookup tables that may have been loaded from the previous
 	### database.
 	def self::db=( newdb )
@@ -225,10 +227,17 @@ class WordNet::Synset < WordNet::Model( :synsets )
 	end
 
 
+	##
+	# :singleton-method: semantic_link_methods
+	# An Array of semantic link methods
+	class << self; attr_reader :semantic_link_methods ; end
+	@semantic_link_methods = []
+
+
 	### Generate methods that will return Synsets related by the given semantic pointer
 	### +type+.
 	def self::semantic_link( type )
-		WordNet.log.debug "Generating a %p method" % [ type ]
+		self.log.debug "Generating a %p method" % [ type ]
 
 		ds_method_body = Proc.new do
 			self.semanticlink_dataset( type )
@@ -239,6 +248,8 @@ class WordNet::Synset < WordNet::Model( :synsets )
 			self.semanticlink_dataset( type ).all
 		end
 		define_method( type, &ss_method_body )
+
+		self.semantic_link_methods << type.to_sym
 	end
 
 

data/lib/wordnet/word.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 
 require 'wordnet' unless defined?( WordNet )
-require 'wordnet/mixins'
 require 'wordnet/model'
 
 # WordNet word model class

data/spec/lib/helpers.rb

@@ -12,41 +12,13 @@ BEGIN {
 }
 
 require 'rspec'
+require 'loggability/spechelpers'
 require 'wordnet'
 
 
 ### RSpec helper functions.
 module WordNet::SpecHelpers
 
-	# A logger that logs to an array.
-	class ArrayLogger
-		### Create a new ArrayLogger that will append content to +array+.
-		def initialize( array )
-			@array = array
-		end
-
-		### Write the specified +message+ to the array.
-		def write( message )
-			@array << message
-		end
-
-		### No-op -- this is here just so Logger doesn't complain
-		def close; end
-
-	end # class ArrayLogger
-
-
-	unless defined?( LEVEL )
-		LEVEL = {
-			:debug => Logger::DEBUG,
-			:info  => Logger::INFO,
-			:warn  => Logger::WARN,
-			:error => Logger::ERROR,
-			:fatal => Logger::FATAL,
-		  }
-	end
-
-
 	###############
 	module_function
 	###############
@@ -57,35 +29,6 @@ module WordNet::SpecHelpers
 	end
 
 
-	### Reset the logging subsystem to its default state.
-	def reset_logging
-		WordNet.reset_logger
-	end
-
-
-	### Alter the output of the default log formatter to be pretty in SpecMate output
-	def setup_logging( level=Logger::FATAL )
-
-		# Turn symbol-style level config into Logger's expected Fixnum level
-		if LEVEL.key?( level )
-			level = LEVEL[ level ]
-		end
-
-		logger = Logger.new( $stderr )
-		WordNet.logger = logger
-		WordNet.logger.level = level
-
-		# Only do this when executing from a spec in TextMate
-		if ENV['HTML_LOGGING'] || (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)
-			Thread.current['logger-output'] = []
-			logdevice = ArrayLogger.new( Thread.current['logger-output'] )
-			WordNet.logger = Logger.new( logdevice )
-			# WordNet.logger.level = level
-			WordNet.logger.formatter = WordNet::HtmlLogFormatter.new( logger )
-		end
-	end
-
-
 	### Make a WordNet::Directory that will use the given +conn+ object as its
 	### LDAP connection. Also pre-loads the schema object and fixtures some other
 	### external data.
@@ -105,6 +48,7 @@ end
 RSpec.configure do |c|
 	c.mock_with :rspec
 	c.include( WordNet::SpecHelpers )
+	c.include( Loggability::SpecHelpers )
 
 	c.treat_symbols_as_metadata_keys_with_true_values = true
 

data/spec/wordnet_spec.rb

@@ -30,14 +30,6 @@ describe WordNet do
 		reset_logging()
 	end
 
-	it "should know if its default logger is replaced" do
-		WordNet.reset_logger
-		WordNet.should be_using_default_logger
-		WordNet.logger = Logger.new( $stderr )
-		WordNet.should_not be_using_default_logger
-	end
-
-
 	it "returns a version string if asked" do
 		WordNet.version_string.should =~ /\w+ [\d.]+/
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordnet
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.127
+  version: 1.0.0.pre.134
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -45,7 +45,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.29'
+        version: '3.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,7 +53,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.29'
+        version: '3.38'
+- !ruby/object:Gem::Dependency
+  name: loggability
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +93,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +101,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +198,7 @@ extra_rdoc_files:
 - README.rdoc
 - WordNet30-license.txt
 files:
+- ChangeLog
 - History.rdoc
 - LICENSE
 - Manifest.txt
@@ -204,14 +221,12 @@ files:
 - lib/wordnet/constants.rb
 - lib/wordnet/lexicallink.rb
 - lib/wordnet/lexicon.rb
-- lib/wordnet/mixins.rb
 - lib/wordnet/model.rb
 - lib/wordnet/morph.rb
 - lib/wordnet/semanticlink.rb
 - lib/wordnet/sense.rb
 - lib/wordnet/sumoterm.rb
 - lib/wordnet/synset.rb
-- lib/wordnet/utils.rb
 - lib/wordnet/word.rb
 - spec/lib/helpers.rb
 - spec/linguawordnet.tests.rb
@@ -226,12 +241,14 @@ homepage: http://deveiate.org/projects/Ruby-WordNet
 licenses:
 - BSD
 post_install_message: ! "\nIf you don't already have a WordNet database installed
-  somewhere, \nyou'll need to either download and install one from:\n\n   http://wnsql.sourceforge.net/\n\nor
+  somewhere,\nyou'll need to either download and install one from:\n\n   http://wnsql.sourceforge.net/\n\nor
   just install the 'wordnet-defaultdb' gem, which will install\nthe SQLite version
   for you.\n\n"
 rdoc_options:
-- --main
-- README.rdoc
+- -f
+- fivefish
+- -t
+- Ruby WordNet
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -248,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wordnet
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This library is a Ruby interface to WordNet®