linkparser 1.0.4 → 1.1.0

data/spec/linkparser/mixins_spec.rb

@@ -0,0 +1,67 @@
+#!/usr/bin/ruby -w
+#
+# Specification for the LinkParser::Sentence class
+# $Id: mixins_spec.rb,v a5e7d9e3cf5c 2010/11/25 00:50:55 ged $
+#
+# See the LICENSE file in the distribution for information about copyright and licensing.
+#
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+
+	libdir = basedir + 'lib'
+	extdir = basedir + 'ext'
+
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
+	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
+	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
+}
+
+require 'rspec'
+require 'linkparser/mixins'
+
+
+describe LinkParser, "mixins" do
+
+	describe LinkParser::DeprecationUtilities do
+
+		before( :all ) do
+			@class = Class.new do
+				extend LinkParser::DeprecationUtilities
+				def no_args
+					return :no_args_result
+				end
+				def two_args( arg1, arg2 )
+					return [arg1, arg2]
+				end
+				def splat_args( *args )
+					return args
+				end
+
+				deprecated_method :no_args
+				deprecated_method :two_args, :splat_args
+			end
+			@object = @class.new
+		end
+
+		it "provides a function for marking a method as deprecated" do
+			@object.should_receive( :warn ).with( /deprecated/i )
+			@object.no_args.should == :no_args_result
+		end
+
+		it "provides a function for marking a method that takes arguments as deprecated" do
+			@object.should_receive( :warn ).with( /deprecated/i )
+			@object.two_args( :arg_one, :arg_two ).should == [ :arg_one, :arg_two ]
+		end
+
+		it "provides a function for marking a method with splatted arguments as deprecated" do
+			@object.should_receive( :warn ).with( /deprecated/i )
+			@object.splat_args( :arg_one, :arg_two ).should == [ :arg_one, :arg_two ]
+		end
+
+
+	end
+
+end
+

data/spec/linkparser/parseoptions_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 #
 # Specification for the LinkParser::ParseOptions class
-# $Id: parseoptions_spec.rb 53 2009-06-03 12:52:13Z deveiant $
+# $Id: parseoptions_spec.rb,v a5e7d9e3cf5c 2010/11/25 00:50:55 ged $
 #
 # See the LICENSE file in the distribution for information about copyright and licensing.
 #
@@ -9,24 +9,30 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
 
-require 'spec/runner'
+require 'rspec'
+
 require 'linkparser'
 
 
 describe LinkParser::ParseOptions do
 
+	before( :all ) do
+		$DEBUG = true if ENV['DEBUG']
+	end
+
 	before( :each ) do
 		@opts = LinkParser::ParseOptions.new
 	end
-	
+
 
 	it "starts out with documented defaults" do
 		@opts.verbosity.should              == 1		# Docs say this is 0
@@ -51,19 +57,20 @@ describe LinkParser::ParseOptions do
 	end
 
 	it "supports all the members mentioned in the documentation" do
-		pending "some of them aren't implemented in the link-grammar library"
-		@opts.display_short?.should == true		# Not in the API
+		pending "some of them aren't implemented in the link-grammar library" do
+			@opts.display_short?.should == true		# Not in the API
+		end
 	end
 
 
 	it "knows whether the timer constraints were exceeded or not" do
 		@opts.timer_expired?.should == false
 	end
-	
+
 	it "knows whether the memory constraints were exceeded or not" do
 		@opts.memory_exhausted?.should == false
 	end
-	
+
 	it "knows whether the timer constraints were exceeded or not" do
 		@opts.resources_exhausted?.should == false
 	end
@@ -74,19 +81,9 @@ describe LinkParser::ParseOptions do
 		}.should_not raise_error()
 	end
 
-
-	describe "in versions of link-grammar >= 4.5.0" do
-	
-		before( :each ) do
-			version_vec = LinkParser.link_grammar_version[/(\d+\.\d+\.\d+)/, 1].
-				split('.').collect {|v| v.to_i }.pack('n*')
-			pending "the underlying library is %s" unless version_vec >= [4,5,0].pack('n*')
-		end
-
-		it "knows whether spell_guessing is enabled or not" do
-			@opts.spell_guessing_enabled?.should == true
-		end
+	it "knows whether spell_guessing is enabled or not" do
+		@opts.spell_guessing_enabled?.should == true
 	end
-	
+
 end
 

data/spec/linkparser/sentence_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 #
 # Specification for the LinkParser::Sentence class
-# $Id: sentence_spec.rb 53 2009-06-03 12:52:13Z deveiant $
+# $Id: sentence_spec.rb,v 6c597e731a87 2010/11/22 15:59:36 ged $
 #
 # See the LICENSE file in the distribution for information about copyright and licensing.
 #
@@ -9,30 +9,32 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
 
-require 'spec/runner'
+require 'rspec'
+
 require 'linkparser'
 
 
 describe LinkParser::Sentence do
 
-
 	before( :all ) do
-		@dict = LinkParser::Dictionary.new( :verbosity => 0 )
+		@dict = LinkParser::Dictionary.new( 'en', :verbosity => 0 )
+		$DEBUG = true if ENV['DEBUG']
 	end
-	
 
 	before( :each ) do
 		@sentence = LinkParser::Sentence.new( "The cat runs.", @dict )
 	end
-	
+
+
 	it "returns an informational string when inspected before it's been parsed" do
 		@sentence.inspect.should =~ %r{
 			<
@@ -59,7 +61,7 @@ describe LinkParser::Sentence do
 	it "can return itself as a tokenized string" do
 		@sentence.to_s.should == "LEFT-WALL the cat runs . RIGHT-WALL"
 	end
-	
+
 
 	it "returns the linkage count as the result of parsing the sentence" do
 		@sentence.parse.should == 1
@@ -79,7 +81,7 @@ describe LinkParser::Sentence do
 	it "delegates linkage methods to its first linkage" do
 		@sentence.num_links.should == 5
 	end
-	
+
 
 	it "knows whether or not it's been parsed" do
 		@sentence.should_not be_parsed()
@@ -97,26 +99,26 @@ describe LinkParser::Sentence do
 		@sentence.word( 0 ).should == 'LEFT-WALL'
 		@sentence[ -1 ].should == 'RIGHT-WALL'
 	end
-	
+
 	it "can return an Array of all tokenized words" do
 		@sentence.words.should == [
 			'LEFT-WALL', 'the', 'cat', 'runs', '.', 'RIGHT-WALL'
 		]
 	end
-	
+
 
 	it "knows that it doesn't have any superfluous words in it" do
 		@sentence.null_count == 0
 	end
-	
-	
+
+
 
 	describe "parsed from a sentence with a superfluous word in it" do
 
 		before( :each ) do
 			@sentence = @dict.parse( "This sentence contains a gravel superfluous word.")
 		end
-	
+
 
 		it "knows how many null links it has" do
 			@sentence.null_count == 1
@@ -125,11 +127,11 @@ describe LinkParser::Sentence do
 
 
 	describe "parsed from a sentence that yields no linkages" do
-	
+
 		before( :each ) do
 			@sentence = @dict.parse( "The event that he smiled at me gives me hope" )
 		end
-	
+
 		it "raises a descriptive exception if a delegated method is called" do
 			expect {
 				@sentence.constituent_tree_string

data/spec/linkparser_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 #
 # Specification for the LinkParser library
-# $Id: linkparser_spec.rb 48 2008-12-19 18:30:33Z deveiant $
+# $Id: linkparser_spec.rb,v 6c597e731a87 2010/11/22 15:59:36 ged $
 #
 # See the LICENSE file in the distribution for information about copyright and licensing.
 #
@@ -9,22 +9,28 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
 
-require 'spec/runner'
+require 'rspec'
+
 require 'linkparser'
 
 
 describe LinkParser do
 
+	before( :all ) do
+		$DEBUG = true if ENV['DEBUG']
+	end
+
 	it "knows what version of the link-grammar library it was built against" do
 		LinkParser.link_grammar_version.should =~ /link-grammar-\d+\.\d+\.\d+/i
 	end
-	
+
 end

metadata

@@ -1,164 +1,76 @@
 --- !ruby/object:Gem::Specification 
 name: linkparser
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
+- Martin Chase
 - Michael Granger
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQwwCgYDVQQDDANnZWQx
+  FzAVBgoJkiaJk/IsZAEZFgdfYWVyaWVfMRMwEQYKCZImiZPyLGQBGRYDb3JnMB4X
+  DTEwMDkxNjE0NDg1MVoXDTExMDkxNjE0NDg1MVowPDEMMAoGA1UEAwwDZ2VkMRcw
+  FQYKCZImiZPyLGQBGRYHX2FlcmllXzETMBEGCgmSJomT8ixkARkWA29yZzCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy//BFxC1f/cPSnwtJBWoFiFrir
+  h7RicI+joq/ocVXQqI4TDWPyF/8tqkvt+rD99X9qs2YeR8CU/YiIpLWrQOYST70J
+  vDn7Uvhb2muFVqq6+vobeTkILBEO6pionWDG8jSbo3qKm1RjKJDwg9p4wNKhPuu8
+  KGue/BFb67KflqyApPmPeb3Vdd9clspzqeFqp7cUBMEpFS6LWxy4Gk+qvFFJBJLB
+  BUHE/LZVJMVzfpC5Uq+QmY7B+FH/QqNndn3tOHgsPadLTNimuB1sCuL1a4z3Pepd
+  TeLBEFmEao5Dk3K/Q8o8vlbIB/jBDTUx6Djbgxw77909x6gI9doU4LD5XMcCAwEA
+  AaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJeoGkOr9l4B
+  +saMkW/ZXT4UeSvVMA0GCSqGSIb3DQEBBQUAA4IBAQBG2KObvYI2eHyyBUJSJ3jN
+  vEnU3d60znAXbrSd2qb3r1lY1EPDD3bcy0MggCfGdg3Xu54z21oqyIdk8uGtWBPL
+  HIa9EgfFGSUEgvcIvaYqiN4jTUtidfEFw+Ltjs8AP9gWgSIYS6Gr38V0WGFFNzIH
+  aOD2wmu9oo/RffW4hS/8GuvfMzcw7CQ355wFR4KB/nyze+EsZ1Y5DerCAagMVuDQ
+  U0BLmWDFzPGGWlPeQCrYHCr+AcJz+NRnaHCKLZdSKj/RHuTOt+gblRex8FAh8NeA
+  cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
+  -----END CERTIFICATE-----
 
-date: 2009-06-09 00:00:00 -07:00
+date: 2010-11-30 00:00:00 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: text-format
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: termios
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: libxml-ruby
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ultraviolet
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: tmail
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.3.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: amatch
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 4.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rcodetools
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.7.0.0
-    version: 
+dependencies: []
+
 description: |-
   A Ruby binding for the link-grammar library, a syntactic parser
   of English. See http://www.link.cs.cmu.edu/link/ for more
   information about the Link Grammar, and
   http://www.abisource.org/projects/link-grammar/ for information
   about the link-grammar library.
-email: ged@FaerieMUD.org
+email: 
+- stillflame@FaerieMUD.org
+- ged@FaerieMUD.org
 executables: []
 
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
 - ChangeLog
-- README
+- README.md
 - LICENSE
 files: 
 - Rakefile
 - ChangeLog
-- README
+- README.md
 - LICENSE
 - spec/bugfixes_spec.rb
 - spec/linkparser/dictionary_spec.rb
 - spec/linkparser/linkage_spec.rb
+- spec/linkparser/mixins_spec.rb
 - spec/linkparser/parseoptions_spec.rb
 - spec/linkparser/sentence_spec.rb
 - spec/linkparser_spec.rb
 - lib/linkparser/linkage.rb
+- lib/linkparser/mixins.rb
 - lib/linkparser/sentence.rb
 - lib/linkparser.rb
 - ext/dictionary.c
@@ -170,52 +82,56 @@ files:
 - ext/extconf.rb
 - rake/191_compat.rb
 - rake/dependencies.rb
+- rake/documentation.rb
 - rake/helpers.rb
+- rake/hg.rb
 - rake/manual.rb
 - rake/packaging.rb
 - rake/publishing.rb
-- rake/rdoc.rb
 - rake/style.rb
 - rake/svn.rb
 - rake/testing.rb
 - rake/verifytask.rb
-- rake/win32.rb
 - Rakefile.local
 has_rdoc: true
 homepage: http://deveiate.org/projects/Ruby-LinkParser/
-licenses: []
-
+licenses: 
+- BSD
 post_install_message: 
 rdoc_options: 
-- -w
-- "4"
-- -SHN
-- -i
+- --tab-width=4
+- --show-hash
+- --include
 - .
-- -m
-- README
-- -t
-- linkparser
-- -W
-- http://deveiate.org/projects/Ruby-LinkParser/browser/trunk/
+- --main=README.md
+- --title=linkparser
 require_paths: 
 - lib
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
-- link-grammar >= 4.4.2
-rubyforge_project: linkparser
-rubygems_version: 1.3.4
+- link-grammar >= 4.7.0
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: a Ruby binding for the link-grammar library
@@ -223,6 +139,7 @@ test_files:
 - spec/bugfixes_spec.rb
 - spec/linkparser/dictionary_spec.rb
 - spec/linkparser/linkage_spec.rb
+- spec/linkparser/mixins_spec.rb
 - spec/linkparser/parseoptions_spec.rb
 - spec/linkparser/sentence_spec.rb
 - spec/linkparser_spec.rb