lingo 1.8.3 → 1.8.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1d421a91c70b5c7264e741720987a83fbfabf2a0
+  data.tar.gz: cd3ffe0052580f9f5272ed46e9d745331f208f1c
+SHA512:
+  metadata.gz: 6db7cea54eac2afbf05403505826dde4007ef9734adfcf75667767e0743f37e24197240c78b2e55377758c6e38b00a8f32de43cfa3c066993a224c7e09c885f9
+  data.tar.gz: f55b0a26ed92b4a7f4362ee376fffb3d3dd7ae907467932a084cc0ab796ba4e06eaf9b4f9db90511592a4af27880c67c8da4c50812523f86699619b1f57f3399

data/ChangeLog

@@ -1,5 +1,27 @@
+# markup: rd
+
 = Revision history for Lingo
 
+== 1.8.4 [2013-10-18]
+
+* Attendee::Sequencer accepts regular expression patterns.
+* Attendee::Sequencer substitutes +0+ in the format string for the matched
+  pattern.
+* Attendee::NonewordFilter learned +dict+ option to print nonewords in
+  dictionary format.
+* Added progress reporting to Attendee::TextReader for STDIN.
+* <tt>lingoctl demo</tt> reports successful initialization.
+* Russian localization for Lingo Web. (Yulia Dorokhova, Thomas Müller)
+* Lingo Web learned parameter +hl+ to set UI language.
+* Lingo Web displays the configuration in use.
+* Lingo Srv accepts array of query strings in addition to single query string.
+* Meeting config takes precedence over language config.
+* When dictionary entries are rejected during conversion, the location of the
+  reject file will be shown.
+* LIR record number defaults to match string in absence of capture group.
+* Optionally prevent Lingo from sorting any results by setting the
+  +LINGO_NO_SORT+ environment variable.
+
 == 1.8.3 [2012-09-20]
 
 * Fixed regression introduced in 1.8.2 where reading input from STDIN was no
@@ -9,14 +31,14 @@
 * Fixed length limit handling for multibyte characters in SDBM store.
 * Fixed encoding issue in SDBM store.
 * Fixed issue with BOM in config files.
-* Modified character handling to accept *any* Unicode letter (_Alphabetical_)
+* Modified character handling to accept *any* Unicode letter (_Alphabetic_)
   and digit (<i>Decimal Number</i>).
 * Modified Attendee::Tokenizer to use only hard-coded tokenization rules.
 * Modified Attendee::VectorFilter's +lexicals+ option to be case-sensitive.
 * Improved overall performance and memory usage; Attendee::Sequencer changed
   the order sequences are inserted into the stream.
 * Eliminated performance penalty caused by Attendee::Abbreviator.
-* Added Russian language support (Yulia Dorokhova, Thomas Müller).
+* Added Russian language support. (Yulia Dorokhova, Thomas Müller)
 * Added +fields+ option to Attendee::TextReader to cut off field labels;
   defaults to +true+ in record (LIR) mode.
 * Added +skip+ option to Attendee::TextReader to skip lines matching the given

data/README

@@ -25,7 +25,7 @@
 
 == VERSION
 
-This documentation refers to Lingo version 1.8.3
+This documentation refers to Lingo version 1.8.4
 
 
 == DESCRIPTION
@@ -85,7 +85,7 @@ a file begins and when it ends. This can (and will) be an important piece of
 information for other attendees that will be added later.
 
 To try out Lingo's functionality without installing it first, have a look at
-{Lingo Web}[http://linux2.fbi.fh-koeln.de/lingoweb]. There you can enter some
+{Lingo Web}[http://ixtrieve.fh-koeln.de/lingoweb]. There you can enter some
 text and see the debug output Lingo generated, including tokenization, word
 identification, decomposition, etc.
 
@@ -173,15 +173,21 @@ to run that command with administrator privileges, depending on your
 environment). Then you can call the +lingo+ executable to process your
 data. See <tt>lingo --help</tt> for starters.
 
-Please note that Lingo requires Ruby version 1.9 to run (1.9.2 or greater;
-1.9.3[http://ruby-lang.org/en/downloads/] is the currently recommended
+Please note that Lingo requires Ruby version 1.9.2 or higher to run
+(2.0.0[http://ruby-lang.org/en/downloads/] is the currently recommended
 version). If you want to use Lingo on Ruby 1.8, please refer to the legacy
 version (see below).
 
+Since Lingo depends on native extensions, you need to make sure that
+development files for your Ruby version are installed. On Debian-based
+Linux platforms they are included in the package <tt>ruby1.9.1-dev</tt>;
+other distributions may have a similarly named package. On Windows those
+development files are currently not required.
+
 Prior to version 1.8.0, Lingo expected to be run from its installation
 directory. This is no longer necessary. But if you prefer that use case,
 you can either download and extract an
-{archive file}[http://github.com/lex-lingo/lingo/tags] or unpack the
+{archive file}[http://github.com/lex-lingo/lingo/releases] or unpack the
 Gem archive (<tt>gem unpack lingo</tt>); or you can install the legacy
 version of Lingo (see below).
 
@@ -224,8 +230,8 @@ the development efforts will be directed towards Lingo 1.8+.
 
 To install the legacy version, download and extract the ZIP archive from
 RubyForge[http://rubyforge.org/frs/?group_id=5663]. No additional dependencies
-are required. This version of Lingo works with both Ruby 1.8 (1.8.5 or greater)
-and 1.9 (1.9.2 or greater).
+are required. This version of Lingo works with both Ruby 1.8 (1.8.5 or higher)
+and 1.9 (1.9.2 or higher).
 
 The executable is named +lingo.rb+. It's located at the root of the installation
 directory and may only be run from there. See <tt>ruby lingo.rb -h</tt> for
@@ -285,7 +291,7 @@ the full test suite.
 
 <b></b>
 Website::           http://lex-lingo.de
-Demo::              http://linux2.fbi.fh-koeln.de/lingoweb
+Demo::              http://ixtrieve.fh-koeln.de/lingoweb
 Documentation::     http://lex-lingo.github.com/lingo
 Source code::       http://github.com/lex-lingo/lingo
 RubyGem::           http://rubygems.org/gems/lingo
@@ -314,7 +320,7 @@ Lingo is based on a collective development by Klaus Lepsky and John Vorhauer.
 === Authors
 
 * John Vorhauer <mailto:lingo@vorhauer.de>
-* Jens Wille <mailto:jens.wille@uni-koeln.de>
+* Jens Wille <mailto:jens.wille@gmail.com>
 
 === Contributors
 
@@ -327,7 +333,7 @@ Lingo is based on a collective development by Klaus Lepsky and John Vorhauer.
 == LICENSE AND COPYRIGHT
 
 Copyright (C) 2005-2007 John Vorhauer
-Copyright (C) 2007-2012 John Vorhauer, Jens Wille
+Copyright (C) 2007-2013 John Vorhauer, Jens Wille
 
 Lingo is free software: you can redistribute it and/or modify it under the
 terms of the GNU Affero General Public License as published by the Free

data/Rakefile

@@ -3,7 +3,7 @@
 __DIR__ = File.expand_path('..', __FILE__)
 
 require 'rake/clean'
-require 'nuggets/util/ruby'
+require 'nuggets/ruby'
 require File.join(__DIR__, %w[lib lingo version])
 
 PACKAGE_NAME = 'lingo'
@@ -25,7 +25,8 @@ begin
       version:      Lingo::VERSION,
       summary:      'The full-featured automatic indexing system',
       authors:      ['John Vorhauer', 'Jens Wille'],
-      email:        ['lingo@vorhauer.de', 'jens.wille@uni-koeln.de'],
+      email:        ['lingo@vorhauer.de', 'jens.wille@gmail.com'],
+      license:      'AGPL',
       homepage:     'http://lex-lingo.de',
       description:  <<-EOT,
 Lingo is an open source indexing system for research and teachings.
@@ -43,10 +44,18 @@ The main functions of Lingo are:
         '{de,en,ru}.lang', '{de,en,ru}/{lingo-*,user-dic,test_*}.txt',
         'txt/{artikel{,-en,-ru},lir}.txt', 'lib/lingo/{srv,web}/**/*'
       ].to_a,
-      required_ruby_version:    '>= 1.9.2',
-      dependencies:             [['ruby-nuggets', '>= 0.8.5'],
-                                 'unicode', 'highline', 'sinatra'],
-      development_dependencies: [['diff-lcs', '>= 1.1.3'], 'open4']
+      required_ruby_version: '>= 1.9.2',
+      dependencies: [
+        'highline',
+        ['ruby-nuggets', '>= 0.9.2'],
+        'sinatra',
+        'sinatra-contrib',
+        'unicode'
+      ],
+      development_dependencies: [
+        ['diff-lcs', '>= 1.1.3'],
+        'open4'
+      ]
     }
   }}
 rescue LoadError => err

data/en/lingo-irr.txt

@@ -6,14 +6,18 @@
 ate=eat #v
 awoke=awake #v
 awoken=awake #v
+bade=bid #v
 beat=beat #v
 became=become #v
 become=become #v
+been=be #v
 began=begin #v
 begun=begin #v
 bent=bend #v
 beset=beset #v
 bet=bet #v
+bid=bid #v
+bidden=bid #v
 bit=bite #v
 bitten=bite #v
 bled=bleed #v
@@ -29,6 +33,8 @@ broke=break #v
 broken=break #v
 brought=bring #v
 built=build #v
+burned=burn #v
+burnt=burn #v
 burst=burst #v
 came=come #v
 cast=cast #v
@@ -42,9 +48,13 @@ crept=creep #v
 cut=cut #v
 dealt=deal #v
 did=do #v
+dived=dive #v
 done=do #v
+dove=dive #v
 drank=drink #v
 drawn=draw #v
+dreamed=dream #v
+dreamt=dream #v
 drew=draw #v
 driven=drive #v
 drove=drive #v
@@ -62,6 +72,8 @@ flown=fly #v
 flung=fling #v
 forbade=forbid #v
 forbidden=forbid #v
+foregone=forego #v
+forewent=forego #v
 forgave=forgive #v
 forgiven=forgive #v
 forgot=forget #v
@@ -82,8 +94,8 @@ ground=grind #v
 grown=grow #v
 heard=hear #v
 held=hold #v
-hidden=hide #v
 hid=hide #v
+hidden=hide #v
 hit=hit #v
 hung=hang #v
 hurt=hurt #v
@@ -95,16 +107,26 @@ know=know #v
 laid=lay #v
 lain=lie #v
 lay=lie #v
+leaped=leap #v
+learned=learn #v
+learnt=learn #v
 led=lead #v
 left=leave #v
 lent=lend #v
+lept=leap #v
 let=let #v
+lighted=light #v
+lit=light #v
 lost=lose #v
 made=make #v
 meant=mean #v
 met=meet #v
+misspelled=misspell #v
+misspelt=misspell #v
 mistaken=mistake #v
 mistook=mistake #v
+mowed=mow #v
+mown=mow #v
 overcame=overcome #v
 overcome=overcome #v
 overdid=overdo #v
@@ -115,33 +137,45 @@ overthrown=overthrow #v
 overtook=overtake #v
 paid=pay #v
 pled=plead #v
+proved=prove #v
+proven=prove #v
 put=put #v
 quit=quit #v
-rang=ring #v
 ran=run #v
+rang=ring #v
 read=read #v
-ridden=ride #v
 rid=rid #v
+ridden=ride #v
 risen=rise #v
 rode=ride #v
 rose=rise #v
-rung=ring #v
 run=run #v
+rung=ring #v
 said=say #v
 sang=sing #v
 sank=sink #v
 sat=sit #v
 saw=see #v
+sawed=saw #v
+sawn=saw #v
 seen=see #v
 sent=send #v
 set=set #v
+sewed=sew #v
+sewn=sew #v
 shaken=shake #v
+shaved=shave #v
+shaven=shave #v
 shed=shed #v
+shod=shoe #v
+shoed=shoe #v
 shone=shine #v
 shook=shake #v
 shore=shear #v
 shorn=shear #v
 shot=shoot #v
+showed=show #v
+shown=show #v
 shrank=shrink #v
 shrunk=shrink #v
 shut=shut #v
@@ -155,16 +189,24 @@ smitten=smite #v
 smote=smite #v
 sold=sell #v
 sought=seek #v
+sowed=sow #v
+sown=sow #v
+spat=spit #v
 sped=speed #v
 spent=spend #v
+spilled=spill #v
+spilt=spill #v
+spit=spit #v
 split=split #v
-spoken=speak #v
 spoke=speak #v
+spoken=speak #v
+sprang=spring #v
 spread=spread #v
+sprung=spring #v
 spun=spin #v
 stank=stink #v
-stolen=steal #v
 stole=steal #v
+stolen=steal #v
 stood=stand #v
 stridden=stride #v
 striven=strive #v
@@ -178,7 +220,9 @@ stunk=stink #v
 sung=sing #v
 sunk=sink #v
 swam=swim #v
+swelled=swell #v
 swept=sweep #v
+swollen=swell #v
 swore=swear #v
 sworn=swear #v
 swum=swim #v
@@ -187,80 +231,36 @@ taken=take #v
 taught=teach #v
 thought=think #v
 threw=throw #v
+thrived=thrive #v
+thriven=thrive #v
+throve=thrive #v
 thrown=throw #v
 thrust=thrust #v
 told=tell #v
 took=take #v
 tore=tear #v
 torn=tear #v
-trodden=tread #v
 trod=tread #v
+trodden=tread #v
 understood=understand #v
 upheld=uphold #v
 upset=upset #v
+was=be #v
+weaved=weave #v
 wed=wed #v
 went=go #v
 wept=weep #v
+were=be #v
 withheld=withhold #v
 withstood=withstand #v
-woken=wake #v
 woke=wake #v
+woken=wake #v
 won=win #v
 wore=wear #v
 worn=wear #v
 wound=wind #v
+wove=weave #v
+woven=weave #v
 written=write #v
 wrote=write #v
 wrung=wring #v
-bade=bid #v
-been=be #v
-bid=bid #v
-bidden=bid #v
-burned=burn #v
-burnt=burn #v
-dived=dive #v
-dove=dive #v
-dreamed=dream #v
-dreamt=dream #v
-foregone=forego #v
-forewent=forego #v
-leaped=leap #v
-learned=learn #v
-learnt=learn #v
-lept=leap #v
-lighted=light #v
-lit=light #v
-misspelled=misspell #v
-misspelt=misspell #v
-mowed=mow #v
-mown=mow #v
-proved=prove #v
-proven=prove #v
-sawed=saw #v
-sawn=saw #v
-sewed=sew #v
-sewn=sew #v
-shaved=shave #v
-shaven=shave #v
-shod=shoe #v
-shoed=shoe #v
-showed=show #v
-shown=show #v
-sowed=sow #v
-sown=sow #v
-spat=spit #v
-spilled=spill #v
-spilt=spill #v
-spit=spit #v
-sprang=spring #v
-sprung=spring #v
-swelled=swell #v
-swollen=swell #v
-thrived=thrive #v
-thriven=thrive #v
-throve=thrive #v
-was=be #v
-weaved=weave #v
-were=be #v
-woven=weave #v
-wove=weave #v

data/lib/lingo.rb

@@ -65,6 +65,14 @@ class Lingo
 
   class << self
 
+    if ENV['LINGO_NO_SORT']
+      def sort!(x) x       end
+      def sort(x)  x.dup   end
+    else
+      def sort!(x) x.sort! end
+      def sort(x)  x.sort  end
+    end
+
     def talk(*args)
       new(*args).talk
     end
@@ -271,8 +279,10 @@ class Lingo
     last_link, auto_link = '', 0
 
     list.each { |hash|
-      # {'attendee' => {'name'=>'Attendee', 'in'=>'nase', 'out'=>'ohr', 'param'=>'hase'}}
-      cfg = hash.values.first.merge('name' => name = hash.keys.first.camelcase)
+      name = hash.keys.first.camelcase
+
+      cfg = (config["language/attendees/#{name.downcase}"] || {})
+        .merge(hash.values.first).update('name' => name)
 
       %w[in out].each { |key| (cfg[key] ||= '').downcase! }
 
@@ -280,8 +290,6 @@ class Lingo
       cfg['out'] = "auto_link-#{auto_link += 1}" if cfg['out'].empty?
       last_link  = cfg['out']
 
-      cfg.update(config["language/attendees/#{name.downcase}"] || {})
-
       @attendees << attendee = Attendee.const_get(name).new(cfg, self)
 
       { 'in' => subscriber, 'out' => supplier }.each { |key, target|
@@ -325,5 +333,5 @@ require_relative 'lingo/language'
 require_relative 'lingo/attendee'
 require_relative 'lingo/version'
 
-require 'nuggets/util/pluggable'
-Util::Pluggable.load_plugins_for(Lingo)
+require 'nuggets/pluggable'
+Nuggets::Pluggable.load_plugins_for(Lingo)