wordnet 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ad96c50badb95731cea04d9413faee469842b80b9831ccd17fbe60206069cb9d
-  data.tar.gz: f8d045d5d3d4d4ece365c66cca1b8a630b6133b7164d6000f016b7eae74b8812
+SHA1:
+  metadata.gz: 27d43321cb1c8ba285945387a8eedd6bd25f5647
+  data.tar.gz: 6b7f5d9abef4970f46a98bc06f621ef2de26744d
 SHA512:
-  metadata.gz: c518543f3492cb5365c2b21ee775213bbfb8aab36f6dcf5294123453a45b8c819559d0f2a88b0245874775c044fb13d494382a9a18d8ac6f99e1c09f8c619e85
-  data.tar.gz: d2de124e23a91f9f1cac09d0c150a7336649fbaf5b8ef45141838c5a6a9b37b6a70f31da99b7bd27b97e88823e36558ce6abe7ae14b102e621835576c4330944
+  metadata.gz: 6dac34d56a4eea80abe63377c08e8f68e1d149e40e230757bb05213f3bd45d88b0238eb4f3cb04d46e0ef2a016bb9229e8a22e6240c94295e19e32fed023ec31
+  data.tar.gz: 7b93069a12a31970a977afcf2ecf8a12113f103d56818c99c417c83f5f7f2c3f4d1f93e0ffd268d73f81d0910c760de20c5d923ab06d214d00e320bf391c80f5

data/.gems

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

data/.ruby-version

@@ -1 +1 @@
-2.3
+2.4

data/History.rdoc

@@ -1,3 +1,12 @@
+==  v1.1.0 [2017-09-26] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Update to WordNet 3.1 (from SQLUNet 5.2.0), Sequel 5.0.
+- Made fetching Synset by ordinal deterministic
+- Documentation updates/fixes
+
+
 == v1.0.1 [2016-09-18] Michael Granger <ged@FaerieMUD.org>
 
 - Finish up and fix WordNet::Sense

data/README.md

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

data/README.rdoc

@@ -1,22 +1,23 @@
 = Ruby-WordNet
 
-* http://deveiate.org/projects/Ruby-WordNet
+* https://bitbucket.org/ged/ruby-wordnet/
 
 == Description
 
 This library is a Ruby interface to WordNet®[http://wordnet.princeton.edu/].
-WordNet® is an online lexical reference system whose design is inspired
-by current psycholinguistic theories of human lexical memory. English
-nouns, verbs, adjectives and adverbs are organized into synonym sets, each
-representing one underlying lexical concept. Different relations link
-the synonym sets.
-
-This library uses WordNet-SQL[http://wnsql.sourceforge.net/], which is a
-conversion of the lexicon flatfiles into a relational database format. You
-can either install the 'wordnet-defaultdb' gem, which packages up the
-SQLite3 version of WordNet-SQL, or install your own and point the lexicon
-at it by passing 
-{Sequel connection parameters}[http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html]
+WordNet® is an online lexical reference system whose design is inspired by
+current psycholinguistic theories of human lexical memory. English nouns,
+verbs, adjectives and adverbs are organized into synonym sets, each
+representing one underlying lexical concept. Different relations link the
+synonym sets.
+
+This library uses SqlUNET[http://sqlunet.sourceforge.net/], which is a
+conversion of the WordNet (along with a number of other linguistic databases)
+lexicon flatfiles into a relational database format. You can either install the
+{wordnet-defaultdb}[https://rubygems.org/gems/wordnet-defaultdb] gem, which
+packages up the SQLite3 version of SqlUNet, or install your own and point the
+lexicon at it by passing {Sequel connection
+parameters}[http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html]
 to the constructor.
 
 === Usage
@@ -53,15 +54,15 @@ mapping:
 [WordNet::SumoTerm]      {Suggested Upper Merged Ontology}[http://www.ontologyportal.org/]
                          terms, with associations back to related Synsets.
 
-This is only supported by a subset of the WordNetSQL databases, and there
-is a fair amount of work left to be done before it's really functional. Drop
-me a note if you're interested in working on this.
+As mentioned above, SqlUNet has done an amazing job of linking up a number of
+other useful linguistic lexicons via WordNet synsets. I plan on adding support
+for at minimum VerbNet, FrameNet, and PropBank.
 
 
 == Requirements
 
-* Ruby >= 1.9.3
-* Sequel >= 3.38.0
+* Ruby >= 2.3
+* Sequel >= 5.0
 
 
 == Authors
@@ -71,7 +72,7 @@ me a note if you're interested in working on this.
 
 == License
 
-Copyright (c) 2002-2012, The FaerieMUD Consortium
+Copyright (c) 2002-2017, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -29,12 +29,12 @@ hoespec = Hoe.spec( 'wordnet' ) do
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'sequel',      '~> 4.38'
-	self.dependency 'loggability', '~> 0.11'
+	self.dependency 'sequel',               '~> 5.0'
+	self.dependency 'loggability',          '~> 0.11'
 
-	self.dependency 'sqlite3',     '~> 1.3', :developer
-	self.dependency 'rspec',       '~> 3.5', :developer
-	self.dependency 'simplecov',   '~> 0.12', :developer
+	self.dependency 'sqlite3',              '~> 1.3', :developer
+	self.dependency 'rspec',                '~> 3.5', :developer
+	self.dependency 'simplecov',            '~> 0.12', :developer
 
 	self.spec_extras[:post_install_message] = %{
 	If you don't already have a WordNet database installed somewhere,

data/certs/ged.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
+MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
 GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
+HhcNMTcwOTI3MDAzMDQ0WhcNMTgwOTI3MDAzMDQ0WjA+MQwwCgYDVQQDDANnZWQx
 GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
 ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
 83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
@@ -14,13 +14,13 @@ 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=
+YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBBQUAA4IBgQB/qyi5pCjK8ceoKalfVAjS
+vG64FEnLnD1bm39T5UaFIRmo+abZtfpg2QhwKvPbPjOicau2+m+MDQ2Cc3tgyaC3
+dZxcP6w8APFg4AId09uWAZKf0xajvBMS2aOz8Bbmag6fwqRRkTMqsNYnmqcF7aRT
+DuEzbEMfaOUYjU9RuB48vr4q8yRft0ww+3jq5iwNkrX1buL2pwBbyvgms6D/BV41
+MaTVMjsHqJUwU2xVfhGtxGAWAer5S1HGYHkbio6mGVtiie0uWjmnzi7ppIlMr48a
+7BNTsoZ+/JRk3iQWmmNsyFT7xfqBKye7cH11BX8V8P4MeGB5YWlMI+Myj5DZY3fQ
+st2AGD4rb1l0ia7PfubcBThSIdz61eCb8gRi/RiZZwb3/7+eyEncLJzt2Ob9fGSF
+X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
+OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
 -----END CERTIFICATE-----

data/lib/wordnet.rb

@@ -4,9 +4,9 @@
 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.
+# This is a Ruby interface to the WordNet® lexical database. It uses the SqlUNet
+# project's databases instead of reading from the canonical flatfiles for speed,
+# easy modification, and correlation with other linguistic lexicons.
 module WordNet
 	extend Loggability
 
@@ -15,15 +15,11 @@ module WordNet
 
 
 	# Release version
-	VERSION = '1.0.1'
+	VERSION = '1.1.0'
 
 	# VCS revision
 	REVISION = %q$Revision: $
 
-	# 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
 	### lexicon.
@@ -38,7 +34,6 @@ module WordNet
 	include WordNet::Constants
 
 	### Get the WordNet version.
-	### @return [String] the library's version
 	def self::version_string( include_buildnum=false )
 		vstring = "%s %s" % [ self.name, VERSION ]
 		vstring << " (build %s)" % [ REVISION[/: ([[:xdigit:]]+)/, 1] || '0' ] if include_buildnum
@@ -47,15 +42,15 @@ module WordNet
 
 
 	require 'wordnet/lexicon'
-
 	require 'wordnet/model'
-	require 'wordnet/sense'
-	require 'wordnet/synset'
-	require 'wordnet/semanticlink'
-	require 'wordnet/lexicallink'
-	require 'wordnet/word'
-	require 'wordnet/morph'
-	require 'wordnet/sumoterm'
+
+	WordNet::Model.register_model( 'wordnet/sense' )
+	WordNet::Model.register_model( 'wordnet/synset' )
+	WordNet::Model.register_model( 'wordnet/semanticlink' )
+	WordNet::Model.register_model( 'wordnet/lexicallink' )
+	WordNet::Model.register_model( 'wordnet/word' )
+	WordNet::Model.register_model( 'wordnet/morph' )
+	WordNet::Model.register_model( 'wordnet/sumoterm' )
 
 	#
 	# Backward-compatibility stuff
@@ -79,6 +74,5 @@ module WordNet
 	Other     = :s
 
 
-
 end # module WordNet
 

data/lib/wordnet/constants.rb

@@ -14,11 +14,11 @@ module WordNet::Constants
 
 	# Synset syntactic-category names -> indicators
 	SYNTACTIC_CATEGORIES = {
-		:noun		=> "n",
-		:verb		=> "v",
-		:adjective	=> "a",
-		:adverb		=> "r",
-		:other		=> "s",
+		noun: "n",
+		verb: "v",
+		adjective: "a",
+		adverb: "r",
+		other: "s",
 	}
 	# Syntactic-category indicators -> names
 	SYNTACTIC_SYMBOLS = SYNTACTIC_CATEGORIES.invert
@@ -34,29 +34,29 @@ module WordNet::Constants
 
 	# Synset pointer typenames -> indicators
 	POINTER_TYPES = {
-		:antonym		=> '!',
-		:hypernym		=> '@',
-		:entailment		=> '*',
-		:hyponym		=> '~',
-		:meronym		=> '%',
-		:holonym		=> '#',
-		:cause			=> '>',
-		:verb_group		=> '$',
-		:similar_to		=> '&',
-		:participle		=> '<',
-		:pertainym		=> '\\',
-		:attribute		=> '=',
-		:derived_from	=> '\\',
-		:see_also		=> '^',
-		:derivation		=> '+',
-		:domain			=> ';',
-		:member			=> '-',
+		antonym: '!',
+		hypernym: '@',
+		entailment: '*',
+		hyponym: '~',
+		meronym: '%',
+		holonym: '#',
+		cause: '>',
+		verb_group: '$',
+		similar_to: '&',
+		participle: '<',
+		pertainym: '\\',
+		attribute: '=',
+		derived_from: '\\',
+		see_also: '^',
+		derivation: '+',
+		domain: ';',
+		member: '-',
 	}
 
 	# Synset pointer indicator -> typename
 	POINTER_SYMBOLS = POINTER_TYPES.invert
 
-	# Map the pointer types into their own symbols (eg., :verb_group => VerbGroup)
+	# Map the pointer types into their own symbols (eg., verb_group: VerbGroup)
 	POINTER_TYPES.each do |sym,val|
 		cname = sym.to_s.gsub( /(?:^|_)(.)/ ) { $1.upcase }
 		const_set( cname, val )
@@ -65,7 +65,7 @@ module WordNet::Constants
 	# Hypernym synset pointer types
 	HYPERNYM_TYPES = {
 		nil             => '@', # Install non-subtype methods, too
-		:instance       => '@i',
+		instance: '@i',
 	}
 
 	# Hypernym indicator -> type map
@@ -74,7 +74,7 @@ module WordNet::Constants
 	# Hyponym synset pointer types
 	HYPONYM_TYPES = {
 		nil             => '~', # Install non-subtype methods, too
-		:instance       => '~i',
+		instance: '~i',
 	}
 
 	# Hyponym indicator -> type map
@@ -82,13 +82,13 @@ module WordNet::Constants
 
 	# Meronym synset pointer types
 	MERONYM_TYPES = {
-		:member			=> '%m',
-		:stuff			=> '%s',
-		:portion		=> '%o',
-		:component		=> '%p',
-		:feature		=> '%f',
-		:phase			=> '%a',
-		:place			=> '%l',
+		member: '%m',
+		stuff: '%s',
+		portion: '%o',
+		component: '%p',
+		feature: '%f',
+		phase: '%a',
+		place: '%l',
 	}
 
 	# Meronym indicator -> type map
@@ -102,13 +102,13 @@ module WordNet::Constants
 
 	# Holonym synset pointer types
 	HOLONYM_TYPES = {
-		:member			=> '#m',
-		:stuff			=> '#s',
-		:portion		=> '#o',
-		:component		=> '#p',
-		:feature		=> '#f',
-		:phase			=> '#a',
-		:place			=> '#l',
+		member: '#m',
+		stuff: '#s',
+		portion: '#o',
+		component: '#p',
+		feature: '#f',
+		phase: '#a',
+		place: '#l',
 	}
 
 	# Holonym indicator -> type map
@@ -122,9 +122,9 @@ module WordNet::Constants
 
 	# Domain synset pointer types
 	DOMAIN_TYPES = {
-		:category		=> ';c',
-		:region			=> ';r',
-		:usage			=> ';u',
+		category: ';c',
+		region: ';r',
+		usage: ';u',
 	}
 
 	# Domain indicator -> type map
@@ -138,9 +138,9 @@ module WordNet::Constants
 
 	# Member synset pointer types
 	MEMBER_TYPES = {
-		:category		=> '-c',
-		:region			=> '-r',
-		:usage			=> '-u',
+		category: '-c',
+		region: '-r',
+		usage: '-u',
 	}
 
 	# Member indicator -> type map
@@ -154,12 +154,12 @@ module WordNet::Constants
 
 	# Map of primary types to maps of their subtypes
 	POINTER_SUBTYPES = {
-		:hyponym    => HYPONYM_TYPES,
-		:hypernym   => HYPERNYM_TYPES,
-		:meronym	=> MERONYM_TYPES,
-		:holonym	=> HOLONYM_TYPES,
-		:member		=> MEMBER_TYPES,
-		:domain		=> DOMAIN_TYPES,
+		hyponym: HYPONYM_TYPES,
+		hypernym: HYPERNYM_TYPES,
+		meronym: MERONYM_TYPES,
+		holonym: HOLONYM_TYPES,
+		member: MEMBER_TYPES,
+		domain: DOMAIN_TYPES,
 	}
 
 

data/lib/wordnet/lexicallink.rb

@@ -14,16 +14,16 @@ class WordNet::LexicalLink < WordNet::Model( :lexlinks )
 	##
 	# The WordNet::Sense the link is pointing *from*.
 	many_to_one :origin,
-		:class       => :"WordNet::Sense",
-		:key         => :synset1id,
-		:primary_key => :synsetid
+		class: 'WordNet::Sense',
+		key: :synset1id,
+		primary_key: :synsetid
 
 	##
 	# The WordNet::Synset the link is pointing *to*.
 	one_to_many :target,
-		:class       => :"WordNet::Synset",
-		:key         => :synsetid,
-		:primary_key => :synset2id
+		class: 'WordNet::Synset',
+		key: :synsetid,
+		primary_key: :synset2id
 
 
 	######

data/lib/wordnet/lexicon.rb

@@ -7,8 +7,14 @@ require 'rubygems'
 
 require 'wordnet' unless defined?( WordNet )
 require 'wordnet/constants'
-require 'wordnet/synset'
-require 'wordnet/word'
+require 'wordnet/model'
+
+# Try to load the default database gem, ignoring it if it's not installed.
+begin
+	require 'wordnet-defaultdb'
+rescue LoadError
+	# No-op
+end
 
 
 # WordNet lexicon class - provides access to the WordNet lexical
@@ -18,13 +24,13 @@ 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]:
+# criteria}[http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html]:
 #
-#     lex = WordNet::Lexicon.new( 'postgres://localhost/wordnet30' )
-#     # => #<WordNet::Lexicon:0x7fd192a76668 postgres://localhost/wordnet30>
+#     lex = WordNet::Lexicon.new( 'postgres://localhost/wordnet31' )
+#     # => #<WordNet::Lexicon:0x7fd192a76668 postgres://localhost/wordnet31>
 #
 #     # Another way of doing the same thing:
-#     lex = WordNet::Lexicon.new( adapter: 'postgres', database: 'wordnet30', host: 'localhost' )
+#     lex = WordNet::Lexicon.new( adapter: 'postgres', database: 'wordnet31', host: 'localhost' )
 #     # => #<WordNet::Lexicon:0x7fd192d374b0 postgres>
 #
 # Alternatively, if you have the 'wordnet-defaultdb' gem (which includes an
@@ -33,7 +39,7 @@ require 'wordnet/word'
 #
 #     lex = WordNet::Lexicon.new
 #     # => #<WordNet::Lexicon:0x7fdbfac1a358 sqlite:[...]/gems/wordnet-defaultdb-1.0.1
-#     #     /data/wordnet-defaultdb/wordnet30.sqlite>
+#     #     /data/wordnet-defaultdb/wordnet31.sqlite>
 #
 # == Looking Up Synsets
 #
@@ -128,36 +134,10 @@ class WordNet::Lexicon
 	log_to :wordnet
 
 
-	# Add the logger device to the default options after it's been loaded
-	WordNet::DEFAULT_DB_OPTIONS.merge!( :logger => [Loggability[WordNet]] )
-
-
 	### Get the Sequel URI of the default database, if it's installed.
 	def self::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
-			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'
-		self.log.debug "  dbfile is: %s" % [ dbfile ]
-
-		if dbfile.exist?
-			return "sqlite:#{dbfile}"
+		if defined?( WordNet::DefaultDB )
+			return WordNet::DefaultDB.uri
 		else
 			return nil
 		end
@@ -181,6 +161,13 @@ class WordNet::Lexicon
 
 		@db.sql_log_level = :debug
 		WordNet::Model.db = @db
+		WordNet::Model.descendents.each do |subclass|
+			self.log.debug "Switching DB for %p to %p" % [ subclass, @db ]
+			subclass.dataset = @db[ subclass.table_name ]
+		end
+
+		# Add the logger device after it's been loaded
+		@db.logger = Loggability[ self.class ]
 	end
 
 
@@ -189,7 +176,7 @@ class WordNet::Lexicon
 		uri = WordNet::Lexicon.default_db_uri or raise WordNet::LexiconError,
 			"No default WordNetSQL database! You can install it via the " +
 			"wordnet-defaultdb gem, or download a version yourself from " +
-			"http://sourceforge.net/projects/wnsql/"
+			"http://sqlunet.sourceforge.net/"
 		@db = self.connect( uri, options )
 	end
 
@@ -277,7 +264,7 @@ class WordNet::Lexicon
 	###   definition using a LIKE query.
 	###
 	def lookup_synsets( word, *args )
-		dataset = WordNet::Synset.filter( :words => WordNet::Word.filter(lemma: word.to_s) )
+		dataset = WordNet::Synset.filter( words: WordNet::Word.filter(lemma: word.to_s) )
 		self.log.debug "Looking up synsets for %p" % [ word.to_s ]
 
 		# Add filters to the dataset for each argument
@@ -287,11 +274,11 @@ class WordNet::Lexicon
 
 			when Integer
 				self.log.debug "  limiting to sense %d" % [ arg ]
-				dataset = dataset.limit( 1, arg-1 )
+				dataset = dataset.order( :synsetid ).limit( 1, arg-1 )
 
 			when Range
 				self.log.debug "  limiting to range of senses: %p" % [ arg ]
-				dataset = dataset.limit( arg.entries.length, arg.begin - 1 )
+				dataset = dataset.order( :synsetid ).limit( arg.entries.length, arg.begin - 1 )
 
 			when Regexp
 				self.log.debug "  filter: definition =~ %p" % [ arg ]