opener-ned 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a32557f4c5975993619a7c34fd8445c4a34c2772
-  data.tar.gz: a1bf198c6c521deb21c295b6570e772ff2444cb6
+  metadata.gz: 2f8e7e7e81902565ee4114306df8d65bcd309aea
+  data.tar.gz: d9e7e2c4794392f6022ee7920c8218db4b0e215b
 SHA512:
-  metadata.gz: 39f0013bf01f194047ecdd5921bca6618201045dd8197635fb2a34a023cbe4bf7a2d5a4365b338e9052b05c7fc8b6e57b7b6337b96105abca3231f5469b8adf3
-  data.tar.gz: 56facef0fb80a8b52e50b7337ac82c3901f2a8938edce8a4f662ef593033658c8e25a04f7a39327f9fee65629b81eabdef8506500818e2f9455dd68de695d404
+  metadata.gz: 9b6990d7b5f33a154530298273406745ecefd326709c954ca4a6f7716f76a569a3ad8e0494e844a000988b1a1d816338dbfc09d1466221a31dbc5d9169333c57
+  data.tar.gz: a5680d80805c2999ca5da6bd8f8bf397cffeffebb190d5f410585e637a82f25de00912b9459c92dcabc6a739ce47b64ff29ec003bad5e7b8c298e7628855492d

data/README.md

@@ -1,17 +1,12 @@
 Introduction
 ------------
 
-This repository contains a Named Entity Disambiguation tool that queries a
-DBpedia spotlight server. The client takes KAF as input (containing
-`<entities>` nodes).
+This repository contains a Named Entity Disambiguation tool that queries a DBpedia spotlight server. The client takes KAF as input (containing `<entities>` nodes).
 
 ### Confused by some terminology?
 
-This software is part of a larger collection of natural language processing
-tools known as "the OpeNER project". You can find more information about the
-project at (the OpeNER portal)[http://opener-project.github.io]. There you can
-also find references to terms like KAF (an XML standard to represent linguistic
-annotations in texts), component, cores, scenario's and pipelines.
+This software is part of a larger collection of natural language processing tools known as "the OpeNER project". You can find more information about the project at [the OpeNER portal](http://opener-project.github.io). There you can also find references to terms like KAF (an XML standard to represent linguistic annotations in texts), component, cores, scenario's and pipelines.
+
 
 Quick Use Example
 -----------------
@@ -20,13 +15,12 @@ Installing the ned can be done by executing:
 
     gem install opener-ned
 
-Please bare in mind that all components in OpeNER take KAF as an input and
-output KAF by default.
+Please bare in mind that all components in OpeNER take KAF as an input and output KAF by default.
 
 
 ### Command line interface
 
-The NED client connects to the (DBPedia spotlight demo servers)[http://dbpedia-spotlight.github.io/demo/].
+The NED client connects to the [DBPedia spotlight demo servers](http://dbpedia-spotlight.github.io/demo/).
 
 A simple example:
 
@@ -56,26 +50,20 @@ You can launch a language identification webservice by executing:
 
     ned-server
 
-This will launch a mini webserver with the webservice. It defaults to port 9292,
-so you can access it at <http://localhost:9292>.
+This will launch a mini webserver with the webservice. It defaults to port 9292, so you can access it at <http://localhost:9292>.
 
-To launch it on a different port provide the `-p [port-number]` option like
-this:
+To launch it on a different port provide the `-p [port-number]` option like this:
 
     ned-server -p 1234
 
 It then launches at <http://localhost:1234>
 
-Documentation on the Webservice is provided by surfing to the urls provided
-above. For more information on how to launch a webservice run the command with
-the ```-h``` option.
+Documentation on the Webservice is provided by surfing to the urls provided above. For more information on how to launch a webservice run the command with the ```-h``` option.
 
 
 ### Daemon
 
-Last but not least the NED comes shipped with a daemon that
-can read jobs (and write) jobs to and from Amazon SQS queues. For more
-information type:
+Last but not least the NED comes shipped with a daemon that can read jobs (and write) jobs to and from Amazon SQS queues. For moreinformation type:
 
     ned-daemon -h
 
@@ -83,11 +71,8 @@ information type:
 Description of dependencies
 ---------------------------
 
-This component runs best if you run it in an environment suited for OpeNER
-components. You can find an installation guide and helper tools in the (OpeNER
-installer)[https://github.com/opener-project/opener-installer] and (an
-installation guide on the Opener
-Website)[http://opener-project.github.io/getting-started/how-to/local-installation.html]
+This component runs best if you run it in an environment suited for OpeNER components. You can find an installation guide and helper tools in the [OpeNER installer](ttps://github.com/opener-project/opener-installer) and an
+[installation guide on the Opener Website](http://opener-project.github.io/getting-started/how-to/local-installation.html)
 
 At least you need the following system setup:
 
@@ -102,9 +87,7 @@ At least you need the following system setup:
 
 ### Structure
 
-This repository comes in two parts: a collection of Java source files and Ruby
-source files. The Java code can be found in the `core/` directory, everything
-else will be Ruby source code.
+This repository comes in two parts: a collection of Java source files and Ruby source files. The Java code can be found in the `core/` directory, everything else will be Ruby source code.
 
 Language Extension
 ------------------
@@ -114,20 +97,20 @@ Language Extension
 Where to go from here
 ---------------------
 
-* Check (the project websitere)[http://opener-project.github.io]
-* (Checkout the webservice)[http://opener.olery.com/ned]
+* [Check the project websitere](http://opener-project.github.io)
+* [Checkout the webservice](http://opener.olery.com/ned)
 
 Report problem/Get help
 -----------------------
 
-If you encounter problems, please email support@opener-project.eu or leave an
-issue in the (issue tracker)[https://github.com/opener-project/ned/issues].
+If you encounter problems, please email <support@opener-project.eu> or leave an issue in the 
+[issue tracker](https://github.com/opener-project/ned/issue).
 
 
 Contributing
 ------------
 
-1. Fork it ( http://github.com/opener-project/ned/fork )
+1. Fork it <http://github.com/opener-project/ned/fork>
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/ned-daemon

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'opener/daemons'
+
+exec_path = File.expand_path('../../exec/ned.rb', __FILE__)
+
+Opener::Daemons::Controller.new(
+  :name      => 'ned',
+  :exec_path => exec_path
+)

data/bin/ned-server

@@ -1,10 +1,8 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/opener/ned/server'
+require 'puma/cli'
 
-# Without calling `Rack::Server#options` manually the CLI arguments will never
-# be passed, thus the application can't be specified as a constructor argument.
-server                  = Rack::Server.new
-server.options[:config] = File.expand_path('../../config.ru', __FILE__)
+rack_config = File.expand_path('../../config.ru', __FILE__)
 
-server.start
+cli = Puma::CLI.new([rack_config] + ARGV)
+cli.run

data/exec/ned.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'opener/daemons'
+require_relative '../lib/opener/ned'
+
+options = Opener::Daemons::OptParser.parse!(ARGV)
+daemon  = Opener::Daemons::Daemon.new(Opener::Ned, options)
+
+daemon.start

data/lib/opener/ned/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class Ned
-    VERSION = '2.1.0'
+    VERSION = '2.2.0'
   end # Ned
 end # Opener

data/opener-ned.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
     'lib/**/*',
     '*.gemspec',
     'config.ru',
-    'README.md'
+    'README.md',
+    'exec/**/*'
   ]).select { |file| File.file?(file) }
 
   gem.executables = Dir.glob('bin/*').map { |file| File.basename(file) }
@@ -24,6 +25,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'httpclient'
   gem.add_dependency 'opener-webservice'
   gem.add_dependency 'nokogiri'
+  gem.add_dependency 'puma'
+  gem.add_dependency 'opener-daemons'
+  gem.add_dependency 'opener-core', ['>= 0.1.2']
 
   gem.add_development_dependency 'opener-build-tools'
   gem.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-ned
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -66,6 +66,48 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: puma
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-daemons
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-core
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: opener-build-tools
   version_requirements: !ruby/object:Gem::Requirement
@@ -98,15 +140,18 @@ description: NED client using DBpedia
 email:
 executables:
 - ned
+- ned-daemon
 - ned-server
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/ned
+- bin/ned-daemon
 - bin/ned-server
 - config.ru
 - core/target/ehu-ned-1.0.jar
+- exec/ned.rb
 - lib/opener/ned.rb
 - lib/opener/ned/cli.rb
 - lib/opener/ned/public/markdown.css
@@ -138,3 +183,4 @@ signing_key:
 specification_version: 4
 summary: NED client using DBpedia
 test_files: []
+has_rdoc: yard