linkparser 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fdb3ebc1f449d0bcbdf3b4a1c69b0b417abd68642ac64d9df62cc2ccf330ba5
-  data.tar.gz: 1ea9b2c22a7a3212ca9fdae2e2640344e73f06331c451289bcac1fbe7c283940
+  metadata.gz: 60a11d5f3a0362ec040bd6777b59dda5773119508f77fe17f958b98504da4145
+  data.tar.gz: ea70b44b2f4c7c70851b912644b644a648d9361ced1846897424226e741dd380
 SHA512:
-  metadata.gz: c8484674e2df9d3eee3844db974a28d06b4030b6609418b6b1d54641ec0e67099632955c6ebd9276bbf23353a66cbf082472791a4764834160f70a04cd8b8f20
-  data.tar.gz: ed5d589f141897ec1b703f3f0d30628f418e1eca728f6d5d60b9e034ae5ed85956ac1897e33ed77692a8756bdc66965fbb6a8e2525818b9c00eafcbeddc4f9e6
+  metadata.gz: fecdcab511f4b1ac9f8f7c6e882238e275127fb05d2380d39c889102e07141e37e990ee32dc77aed3f8773de41b7bd8da56031f425b47671b6db4f95cf4c583e
+  data.tar.gz: 53c2e99535d292f2b0a2e5d3b13e137846a1de39e2a6f8d9b2e5f7422a90308a9eac7ebe7e1cc896bac8bf58710d9d5356b5a148d454dfbf607e507dfba85b7b

data/History.md

@@ -1,6 +1,13 @@
 # Release History for linkparser
 
 ---
+## v2.3.0 [2023-01-02] Michael Granger <ged@faeriemud.org>
+
+Enhancements:
+
+- Updated old-style function declarations, made some specs more flexible
+- Update deps, bump default Ruby to 3.2
+
 
 ## v2.2.0 [2020-12-24] Michael Granger <ged@faeriemud.org>
 

data/README.md

@@ -96,7 +96,7 @@ https://www.gnu.org/licenses/lgpl-2.1.html
 
 The gem itself is licensed under the BSD license:
 
-Copyright (c) 2006-2020, The FaerieMUD Consortium
+Copyright (c) 2006-2023, The FaerieMUD Consortium
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/ext/linkparser_ext/dictionary.c

@@ -21,7 +21,7 @@
  * Allocation function
  */
 static struct rlink_dictionary *
-rlink_dictionary_alloc()
+rlink_dictionary_alloc( void )
 {
 	struct rlink_dictionary *ptr = ALLOC( struct rlink_dictionary );
 
@@ -310,7 +310,7 @@ rlink_parse( int argc, VALUE *argv, VALUE self )
  *  file, and then creates all other objects through it.
  */
 void
-rlink_init_dict()
+rlink_init_dict( void )
 {
 #ifdef FOR_RDOC
 	rlink_mLinkParser = rb_define_module( "LinkParser" );

data/ext/linkparser_ext/linkage.c

@@ -28,7 +28,7 @@ VALUE max_width_sym;
  * Allocation function
  */
 static struct rlink_linkage *
-rlink_linkage_alloc()
+rlink_linkage_alloc( void )
 {
 	struct rlink_linkage *ptr = ALLOC( struct rlink_linkage );
 
@@ -136,20 +136,17 @@ rlink_linkage_s_alloc(  VALUE klass )
  *  the parse options of the Sentence for the new linkage.
  */
 static VALUE
-rlink_linkage_init( argc, argv, self )
-	int argc;
-	VALUE *argv;
-	VALUE self;
+rlink_linkage_init( int argc, VALUE *argv, VALUE self )
 {
 	if ( !check_linkage(self) ) {
-		int i, link_index, max_index;
+		int link_index, max_index;
 		VALUE index, sentence, options, defopts;
 		struct rlink_sentence *sent_ptr;
 		Linkage linkage;
 		Parse_Options opts;
 		struct rlink_linkage *ptr;
 
-		i = rb_scan_args( argc, argv, "21", &index, &sentence, &options );
+		rb_scan_args( argc, argv, "21", &index, &sentence, &options );
 
 		defopts = rb_hash_new(); /*rb_funcall( sentence, rb_intern("options"), 0 );*/
 		options = rlink_make_parse_options( defopts, options );
@@ -651,7 +648,7 @@ rlink_linkage_get_violation_name( VALUE self )
  *
  */
 void
-rlink_init_linkage()
+rlink_init_linkage( void )
 {
 	rlink_cLinkage = rb_define_class_under( rlink_mLinkParser, "Linkage", rb_cObject );
 

data/ext/linkparser_ext/linkparser.c

@@ -90,7 +90,7 @@ rlink_log( const char *level, const char *fmt, va_dcl )
  * somewhere useful.
  */
 _Noreturn void
-rlink_raise_lp_error()
+rlink_raise_lp_error( void )
 {
 	rb_raise( rlink_eLpError, "Unknown error" );
 }
@@ -152,7 +152,7 @@ rlink_link_grammar_config( VALUE self )
  * LinkParser extension init function
  */
 void
-Init_linkparser_ext()
+Init_linkparser_ext( void )
 {
 	rlink_mLinkParser = rb_define_module( "LinkParser" );
 

data/ext/linkparser_ext/parseoptions.c

@@ -726,7 +726,7 @@ rlink_parseopts_reset_resources( VALUE self )
 
 
 void
-rlink_init_parseoptions()
+rlink_init_parseoptions( void )
 {
 	rlink_cParseOptions = rb_define_class_under( rlink_mLinkParser,
 		"ParseOptions", rb_cObject );

data/ext/linkparser_ext/sentence.c

@@ -30,7 +30,7 @@
  * Allocation function
  */
 static struct rlink_sentence *
-rlink_sentence_alloc()
+rlink_sentence_alloc( void )
 {
 	struct rlink_sentence *ptr = ALLOC( struct rlink_sentence );
 
@@ -459,7 +459,7 @@ rlink_sentence_disjunct_cost( VALUE self, VALUE i )
  *
  */
 void
-rlink_init_sentence()
+rlink_init_sentence( void )
 {
 	rlink_cSentence = rb_define_class_under( rlink_mLinkParser, "Sentence",
 		rb_cObject );

data/lib/linkparser.rb

@@ -9,7 +9,7 @@ module LinkParser
 
 
 	# Release version
-	VERSION = '2.2.0'
+	VERSION = '2.3.0'
 
 
 	# Loggability API -- set up a logger
@@ -31,11 +31,11 @@ module LinkParser
 	end
 
 	require 'linkparser/mixins'
+
 	require 'linkparser/dictionary'
 	require 'linkparser/sentence'
 	require 'linkparser/linkage'
 	require 'linkparser/parseoptions'
 
-
 end # class LinkParser
 

data/spec/linkparser/linkage_spec.rb

@@ -333,17 +333,18 @@ describe LinkParser::Linkage do
 
 
 	it "should know that it's not an imperative sentence" do
-		expect( linkage.imperative? ).to be_falsey()
+		expect( linkage ).to_not be_imperative()
 	end
 
 
 	context "from an imperative sentence" do
 
 		let( :text ) { "Go to the store!" }
+	  let( :linkage ) { sentence.linkages.find {|l| l.links.detect {|link| link.label == 'Wi' } } }
 
 
 		it "knows that it's an imperative sentence" do
-			expect( linkage.imperative? ).to be_truthy()
+			expect( linkage ).to be_imperative()
 		end
 
 

data/spec/linkparser/parseoptions_spec.rb

@@ -15,7 +15,7 @@ describe LinkParser::ParseOptions do
 	it "starts out with documented defaults" do
 		expect( opts.verbosity ).to eq( 1 )             # Docs say this is 0
 		expect( opts.linkage_limit ).to eq( 100 )       # Docs say this is 10000
-		expect( opts.disjunct_cost ).to eq( 2 )
+		expect( opts.disjunct_cost ).to eq( -10000 )    # Docs say this is 2.8
 		expect( opts.min_null_count ).to eq( 0 )
 		expect( opts.max_null_count ).to eq( 0 )
 		expect( opts.islands_ok? ).to eq( false )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linkparser
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Michael Granger
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIID+DCCAmCgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0yMDEyMjQyMDU1MjlaFw0yMTEyMjQyMDU1
-  MjlaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  MIID+DCCAmCgAwIBAgIBBDANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0yMjAxMDcyMzU4MTRaFw0yMzAxMDcyMzU4
+  MTRaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
   hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
   L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
   M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
@@ -23,17 +23,17 @@ cert_chain:
   ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
   N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYD
   VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DANBgkqhkiG
-  9w0BAQsFAAOCAYEAMYegZanJi8zq7QKPT7wqXefX4C88I5JWeBHR3PvvWK0CwyMV
-  peyiu5I13w/lYX+HUZjE4qsSpJMJFXWl4WZCOo+AMprOcf0PxfuJpxCej5D4tavf
-  vRfhahSw7XJrcZih/3J+/UgoH7R05MJ+8LTcy3HGrB3a0vTafjm8OY7Xpa0LJDoN
-  JDqxK321VIHyTibbKeA1hWSE6ljlQDvFbTqiCj3Ulp1jTv3TOlvRl8fqcfhxUJI0
-  +5Q82jJODjEN+GaWs0V+NlrbU94cXwS2PH5dXogftB5YYA5Ex8A0ikZ73xns4Hdo
-  XxdLdd92F5ovxA23j/rKe/IDwqr6FpDkU3nPXH/Qp0TVGv9zZnVJc/Z6ChkuWj8z
-  pW7JAyyiiHZgKKDReDrA2LA7Zs3o/7KA6UtUH0FHf8LYhcK+pfHk6RtjRe65ffw+
-  MCh97sQ/Z/MOusb5+QddBmB+k8EicXyGNl4b5L4XpL7fIQu+Y96TB3JEJlShxFD9
-  k9FjI4d9EP54gS/4
+  9w0BAQsFAAOCAYEASrm1AbEoxACZ9WXJH3R5axV3U0CA4xaETlL2YT+2nOfVBMQ9
+  0ZlkPx6j4ghKJgAIi1TMfDM2JyPJsppQh8tiNccDjWc62UZRY/dq26cMqf/lcI+a
+  6YBuEYvzZfearwVs8tHnXtwYV3WSCoCOQaB+nq2lA1O+nkKNl41WOsVbNama5jx3
+  8cQtVSEEmZy6jIDJ8c5TmBJ7BQUDEUEWA/A3V42Xyctoj7DvUXWE0lP+X6ypAVSr
+  lFh3TS64D7NTvxkmg7natUoCvobl6kGl4yMaqE4YRTlfuzhpf91TSOntClqrAOsS
+  K1s56WndQj3IoBocdY9mQhDZLtLHofSkymoP8btBlj5SsN24TiF0VMSZlctSCYZg
+  GKyHim/MMlIfGOWsgfioq5jzwmql7W4CDubbb8Lkg70v+hN2E/MnNVAcNE3gyaGc
+  P5YP5BAbNW+gvd3QHRiWTTuhgHrdDnGdXg93N2M5KHn1ug8BtPLQwlcFwEpKnlLn
+  btEP+7EplFuoiMfd
   -----END CERTIFICATE-----
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2023-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -55,58 +55,44 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
-  name: rdoc-generator-fivefish
+  name: rdoc-generator-sixfish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-description: This module is a Ruby binding for the Abiword version of CMU's Link
-  Grammar, a syntactic parser of English.
+        version: '0.2'
+description: This module is a Ruby binding for the Abiword version of CMU’s Link Grammar,
+  a syntactic parser of English.
 email:
 - ged@faeriemud.org
 executables: []
@@ -161,9 +147,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
-summary: This module is a Ruby binding for the Abiword version of CMU's Link Grammar,
+summary: This module is a Ruby binding for the Abiword version of CMU’s Link Grammar,
   a syntactic parser of English.
 test_files: []