wordnet 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: ad96c50badb95731cea04d9413faee469842b80b9831ccd17fbe60206069cb9d
+  data.tar.gz: f8d045d5d3d4d4ece365c66cca1b8a630b6133b7164d6000f016b7eae74b8812
+SHA512:
+  metadata.gz: c518543f3492cb5365c2b21ee775213bbfb8aab36f6dcf5294123453a45b8c819559d0f2a88b0245874775c044fb13d494382a9a18d8ac6f99e1c09f8c619e85
+  data.tar.gz: d2de124e23a91f9f1cac09d0c150a7336649fbaf5b8ef45141838c5a6a9b37b6a70f31da99b7bd27b97e88823e36558ce6abe7ae14b102e621835576c4330944

data/.gems

@@ -0,0 +1,5 @@
+hoe-deveiate -v0.8.0
+sequel -v4.38.0
+sqlite3 -v1.3.11
+loggability -v0.11.0
+simplecov -v0.12.0

data/.ruby-gemset

@@ -0,0 +1 @@
+wordnet

data/.ruby-version

@@ -0,0 +1 @@
+2.3

data/.simplecov

@@ -0,0 +1,8 @@
+# Simplecov config
+
+SimpleCov.start do
+	add_filter 'spec'
+	add_group "Needing tests" do |file|
+		file.covered_percent < 90
+	end
+end

data/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec

data/History.rdoc

@@ -1,3 +1,10 @@
+== v1.0.1 [2016-09-18] Michael Granger <ged@FaerieMUD.org>
+
+- Finish up and fix WordNet::Sense
+- Add Wordnet::Synset#wordlist
+- Documentation fixes, fixes for newer Ruby versions
+
+
 == v1.0.0 [2012-08-22] Michael Granger <ged@FaerieMUD.org>
 
 Converted to use Sequel and wnsql.

data/Manifest.txt

@@ -1,22 +1,20 @@
+.gems
+.ruby-gemset
+.ruby-version
+.simplecov
 ChangeLog
+Gemfile
 History.rdoc
 LICENSE
 Manifest.txt
+README.md
 README.rdoc
 Rakefile
 TODO
 WordNet30-license.txt
-examples/add-laced-boots.rb
-examples/clothes-with-collars.rb
-examples/clothesWithTongues.rb
-examples/distance.rb
-examples/domainTree.rb
+certs/ged.pem
 examples/gcs.rb
-examples/holonymTree.rb
-examples/hypernymTree.rb
-examples/hyponymTree.rb
-examples/memberTree.rb
-examples/meronymTree.rb
+examples/hypernym_tree.rb
 lib/wordnet.rb
 lib/wordnet/constants.rb
 lib/wordnet/lexicallink.rb
@@ -28,11 +26,12 @@ lib/wordnet/sense.rb
 lib/wordnet/sumoterm.rb
 lib/wordnet/synset.rb
 lib/wordnet/word.rb
-spec/lib/helpers.rb
-spec/linguawordnet.tests.rb
+spec/helpers.rb
 spec/wordnet/lexicon_spec.rb
 spec/wordnet/model_spec.rb
 spec/wordnet/semanticlink_spec.rb
+spec/wordnet/sense_spec.rb
 spec/wordnet/synset_spec.rb
 spec/wordnet/word_spec.rb
 spec/wordnet_spec.rb
+wordnet.gemspec

data/README.md

@@ -0,0 +1 @@
+The README is in RDoc format, which Bitbucket doesn't support; [see the source](https://bitbucket.org/ged/ruby-wordnet/src/3db62d5ed69878e8e7c36795d3379291db0402d6/README.rdoc?at=default).

data/Rakefile

@@ -10,6 +10,8 @@ rescue LoadError => err
 	abort "This Rakefile requires hoe (gem install hoe)"
 end
 
+GEMSPEC = 'wordnet.gemspec'
+
 Hoe.plugin :mercurial
 Hoe.plugin :signing
 
@@ -20,21 +22,20 @@ LIBDIR = BASEDIR + 'lib'
 DATADIR = BASEDIR + 'data'
 
 hoespec = Hoe.spec( 'wordnet' ) do
-	self.name = 'wordnet'
 	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.license 'BSD-3-Clause'
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'sequel',      '~> 3.38'
-	self.dependency 'loggability', '~> 0.5'
+	self.dependency 'sequel',      '~> 4.38'
+	self.dependency 'loggability', '~> 0.11'
+
 	self.dependency 'sqlite3',     '~> 1.3', :developer
-	self.dependency 'rspec',       '~> 2.7', :developer
-	self.dependency 'simplecov',   '~> 0.6', :developer
+	self.dependency 'rspec',       '~> 3.5', :developer
+	self.dependency 'simplecov',   '~> 0.12', :developer
 
-	self.spec_extras[:licenses] = ["BSD"]
 	self.spec_extras[:post_install_message] = %{
 	If you don't already have a WordNet database installed somewhere,
 	you'll need to either download and install one from:
@@ -46,38 +47,56 @@ hoespec = Hoe.spec( 'wordnet' ) do
 
 	}.gsub( /^\t/, '' )
 
-	self.require_ruby_version( '>=1.9.2' )
+	self.require_ruby_version( '>=2.2.0' )
 
 	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}"
+	self.rdoc_locations << "deveiate:/usr/local/www/public/code/ruby-#{remote_rdoc_dir}"
 end
 
 ENV['VERSION'] ||= hoespec.spec.version.to_s
 
-task 'hg:precheckin' => [ :check_history, :spec ]
-
-### Make the ChangeLog update if the repo has changed since it was last built
-file '.hg/branch'
-file 'ChangeLog' => '.hg/branch' do |task|
-	$stderr.puts "Updating the changelog..."
-	begin
-		content = make_changelog()
-	rescue NoMethodError
-		abort "This task requires hoe-mercurial (gem install hoe-mercurial)"
-	end
-	File.open( task.name, 'w', 0644 ) do |fh|
-		fh.print( content )
-	end
-end
+# Run the tests before checking in
+task 'hg:precheckin' => [ :check_history, :check_manifest, :gemspec, :spec ]
 
 # Rebuild the ChangeLog immediately before release
 task :prerelease => 'ChangeLog'
+CLOBBER.include( 'ChangeLog' )
 
-# Simplecov
 desc "Build a coverage report"
 task :coverage do
 	ENV["COVERAGE"] = 'yes'
 	Rake::Task[:spec].invoke
 end
+
+
+# Use the fivefish formatter for docs generated from development checkout
+if File.directory?( '.hg' )
+	require 'rdoc/task'
+
+	Rake::Task[ 'docs' ].clear
+	RDoc::Task.new( 'docs' ) do |rdoc|
+	    rdoc.main = "README.rdoc"
+	    rdoc.rdoc_files.include( "*.rdoc", "*.md", "ChangeLog", "lib/**/*.rb" )
+	    rdoc.generator = :fivefish
+		rdoc.title = 'Ruby WordNet'
+	    rdoc.rdoc_dir = 'doc'
+	end
+end
+
+task :gemspec => [ 'ChangeLog', GEMSPEC ]
+file GEMSPEC => __FILE__ do |task|
+	spec = $hoespec.spec
+	spec.files.delete( '.gemtest' )
+	spec.signing_key = nil
+	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	spec.cert_chain = [ 'certs/ged.pem' ]
+	File.open( task.name, 'w' ) do |fh|
+		fh.write( spec.to_ruby )
+	end
+end
+CLOBBER.include( GEMSPEC )
+
+task :default => :gemspec
+

data/certs/ged.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
+GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
+HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
+GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
+ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
+83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
+ENcvWVZS4iUzi4dsYJGY6yEOsXh2CcF46+QevV8iE+UmbkU75V7Dy1JCaUOyizEt
+TH5UHsOtUU7k9TYARt/TgYZKuaoAMZZd5qyVqhF1vV+7/Qzmp89NGflXf2xYP26a
+4MAX2qqKX/FKXqmFO+AGsbwYTEds1mksBF3fGsFgsQWxftG8GfZQ9+Cyu2+l1eOw
+cZ+lPcg834G9DrqW2zhqUoLr1MTly4pqxYGb7XoDhoR7dd1kFE2a067+DzWC/ADt
++QkcqWUm5oh1fN0eqr7NsZlVJDulFgdiiYPQiIN7UNsii4Wc9aZqBoGcYfBeQNPZ
+soo/6za/bWajOKUmDhpqvaiRv9EDpVLzuj53uDoukMMwxCMfgb04+ckQ0t2G7wqc
+/D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
+MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
+YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
+FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
+db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
+inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
+DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
+PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
+6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
+w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
+p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
+-----END CERTIFICATE-----

data/examples/gcs.rb

@@ -1,54 +1,44 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/env ruby
+#encoding: utf-8
+
 #
 #	Find least general hypernymial synsets between all noun senses of two words.
 #
 
 $LOAD_PATH.unshift "lib"
-require "wordnet"
+
+require 'wordnet'
+require 'loggability'
 
 raise RuntimeError, "You must specify two words." if ARGV.length != 2
 
-# Create the lexicon
 lex = WordNet::Lexicon.new
 
-# Look up the synsets for the specified word
-word1Syns = lex.lookup_synsets( ARGV[0], WordNet::Noun )
-word2Syns = lex.lookup_synsets( ARGV[1], WordNet::Noun )
+word1_syns = lex.lookup_synsets( ARGV[0], :noun )
+word2_syns = lex.lookup_synsets( ARGV[1], :noun )
 
-def debugMsg( message )
-	return unless $DEBUG
-	$stderr.puts message
-end
+logger = Loggability[ WordNet ]
 
 # Use the analyzer to traverse hypernyms of the synset, adding a string for each
 # one with indentation for the level
-word1Syns.each {|syn|
-	debugMsg( ">>> Searching with #{syn.wordlist} as the origin." )
+word1_syns.each do |syn|
+	logger.debug ">>> Searching with #{syn.wordlist.join(', ')} as the origin."
 
-	word2Syns.each {|secondSyn|
-		debugMsg( "  Comparing #{secondSyn.wordlist} to the origin." )
+	word2_syns.each do |syn2|
+		logger.debug "  Comparing #{syn2.wordlist.join(', ')} to the origin."
 
-		# The intersection of the two syns is the most-specific hypernym they
+		# The intersection of the two synsets is the most-specific hypernym they
 		# share in common.
-		commonSyn = (syn | secondSyn)
-
-		if commonSyn
-			puts <<-"EOF".gsub( /^\t{3}/, '' )
-			----
-			  #{syn.words.join(', ')}
-			  #{syn.gloss}
-			and
-			  #{secondSyn.words.join(', ')}
-			  #{secondSyn.gloss}
-			are both instances of
-			  #{commonSyn.words.join(', ')}
-			  #{commonSyn.gloss}.
-			----
-			EOF
+		common_syn = (syn | syn2)
+
+		# Skip common synsets that are too abstract
+		if common_syn && common_syn.lexical_domain != 'noun.tops'
+			puts syn, syn2, '  ' + common_syn.to_s, ''
 		else
-			debugMsg( "    No synsets in common." )
+			logger.debug "    No synsets in common."
 		end
-	}
+	end
+
+	logger.debug "  done with #{syn.wordlist}"
+end
 
-	debugMsg( "  done with #{syn.wordlist}" )
-}

data/examples/hypernym_tree.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+#encoding: utf-8
+
+#
+#	Find all the hypernyms of all senses of a given noun and display them in a
+#	heirarchy
+#
+
+$LOAD_PATH.unshift "lib"
+require 'wordnet'
+
+raise RuntimeError, "No word specified." if ARGV.empty?
+
+# Create the lexicon
+lex = WordNet::Lexicon.new
+
+# Look up the synsets for the specified word
+origins = lex.lookup_synsets( *ARGV )
+
+
+# Iterate over the synsets for the different senses of the word
+origins.each.with_index do |syn, i|
+	hypernyms = []
+
+	# Traverse the hypernyms
+	syn.traverse( :hypernyms ).with_depth.each do |hyper_syn, depth|
+		indent = '  ' * depth
+		hypernyms << "%s%s" % [ indent, hyper_syn ]
+	end
+
+	puts "\nHypernym tree for #{syn} (sense #{i + 1}):", *hypernyms
+	puts "Tree has #{hypernyms.length} synsets."
+end
+

data/lib/wordnet.rb

@@ -15,14 +15,14 @@ module WordNet
 
 
 	# Release version
-	VERSION = '1.0.0'
+	VERSION = '1.0.1'
 
 	# VCS revision
 	REVISION = %q$Revision: $
 
-	# Abort if not >=1.9.2
-	abort "This version of WordNet requires Ruby 1.9.3 or greater." unless
-		RUBY_VERSION >= '1.9.3'
+	# Abort if not >=2.2.0
+	abort "This version of WordNet requires Ruby 2.2.0 or greater." unless
+		RUBY_VERSION >= '2.2.0'
 
 
 	### Lexicon exception - something has gone wrong in the internals of the

data/lib/wordnet/constants.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/ruby
+# -*- ruby -*-
+#encoding: utf-8
 
 require 'wordnet' unless defined?( WordNet )
 

data/lib/wordnet/lexicallink.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/ruby
+# -*- ruby -*-
+#encoding: utf-8
 
 require 'wordnet' unless defined?( WordNet )
 require 'wordnet/synset' unless defined?( WordNet::Synset )

data/lib/wordnet/lexicon.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/ruby
+# -*- ruby -*-
+#encoding: utf-8
 
 require 'pathname'
 require 'loggability'
@@ -16,8 +17,8 @@ require 'wordnet/word'
 #
 # == Creating a Lexicon
 #
-# To create a Lexicon, point it at a database using [Sequel database connection
-# criteria]{http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html}:
+# To create a Lexicon, point it at a database using {Sequel database connection
+# criteria}[http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html]:
 #
 #     lex = WordNet::Lexicon.new( 'postgres://localhost/wordnet30' )
 #     # => #<WordNet::Lexicon:0x7fd192a76668 postgres://localhost/wordnet30>
@@ -88,7 +89,7 @@ require 'wordnet/word'
 # If you're using a database that supports using regular expressions (e.g.,
 # PostgreSQL), you can use that to select one with a matching definition:
 #
-#    lex[ :language, %r:name.*discipline: ]
+#    lex[ :language, /name.*discipline/ ]
 #    # => #<WordNet::Synset:0x7ffa78f235a8 {106304059} 'language, nomenclature,
 #    #       terminology' (noun): [noun.communication] a system of words used
 #    #       to name things in a particular discipline>
@@ -316,7 +317,7 @@ class WordNet::Lexicon
 				else
 					pattern = "%%%s%%" % [ arg ]
 					self.log.debug "  filter: definition LIKE %p" % [ pattern ]
-					dataset = dataset.filter { :definition.like(pattern) }
+					dataset = dataset.filter { Sequel.like(:definition, pattern) }
 				end
 			end
 		end

data/lib/wordnet/model.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/ruby
+# -*- ruby -*-
+#encoding: utf-8
 
 require 'loggability'
 require 'sequel'

data/lib/wordnet/morph.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/ruby
+# -*- ruby -*-
+#encoding: utf-8
 
 require 'wordnet' unless defined?( WordNet )
 require 'wordnet/model'

data/lib/wordnet/semanticlink.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/ruby
+# -*- ruby -*-
+#encoding: utf-8
 
 require 'wordnet' unless defined?( WordNet )
 require 'wordnet/constants'