opener-ned 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7555399cec5942f6c40e3153c895167a12b326a
-  data.tar.gz: 8a35994ccb1d85171281b4114af842db52bf6099
+  metadata.gz: e0014a7b406f5acdc1a27604a7ba36d4f5a33534
+  data.tar.gz: 8c460b6b95deacea616d12be9dea6288db025b6e
 SHA512:
-  metadata.gz: 42dd20c33ebc66b472ae3d343df1f0837c380e939bcf2dcd19d8b72b5fbf26c95d37edea792a9c348adbb6c4ddabedcae850ab39656545ec7b8e65cfea3751e5
-  data.tar.gz: 651ee179eab6c0a6996f63623a8e0f57fa1cebf861dae08e45dc26c390dd338d980c79c6ab9cd9cd7699f567fec913fdbe5c1459190fb9017759f5d95a5dfbe9
+  metadata.gz: 348a303a62d45c87e08317585bdf55f8e3f27de0fd6a5f353894fc6c943e618fbadee44635d850d25e831d637a4648ad51306a948c75011d22690e1ffa78ee48
+  data.tar.gz: 5505776c3984193286e463bbbf57b69f83316528dae2fbb5caf92ff0d0ef80404bcdd308a60479e606ef779108d22660607538f89dfd1647d7bfc7ce5a965f2f

data/lib/opener/ned.rb

@@ -3,6 +3,7 @@ require 'stringio'
 
 require 'slop'
 require 'nokogiri'
+require 'opener/core'
 
 require File.expand_path('../../../core/target/ehu-ned-1.0.jar', __FILE__)
 
@@ -26,9 +27,9 @@ module Opener
     #
     LANGUAGE_ENDPOINTS = {
       "en" => "http://spotlight.sztaki.hu:2222",
-      "nl" => "http://nl.dbpedia.org/spotlight",
+      "nl" => "http://spotlight.sztaki.hu:2232",
       "fr" => "http://spotlight.sztaki.hu:2225",
-      "de" => "http://de.dbpedia.org/spotlight",
+      "de" => "http://spotlight.sztaki.hu:2226",
       "es" => "http://spotlight.sztaki.hu:2231",
       "it" => "http://spotlight.sztaki.hu:2230",
       "ru" => "http://spotlight.sztaki.hu:2227",
@@ -76,21 +77,36 @@ module Opener
         raise ArgumentError, 'No input specified'
       end
 
-      language  = language_from_kaf(input)
+      language = language_from_kaf(input)
+
+      unless LANGUAGE_ENDPOINTS[language]
+        raise Core::UnsupportedLanguageError, language
+      end
+
+      endpoint  = uri_for_language(language)
       input_io  = StringIO.new(input)
       reader    = Java::java.io.InputStreamReader.new(input_io.to_inputstream)
       document  = Java::ixa.kaflib.KAFDocument.create_from_stream(reader)
       annotator = new_annotator
-      endpoint  = options.fetch(:endpoint, uri_for_language(language))
 
-      annotator.disambiguateNEsToKAF(
-        document,
-        endpoint.to_s
-      )
+      annotator.disambiguateNEsToKAF(document, endpoint)
 
       return document.to_string
     end
 
+    ##
+    # Returns the language from the KAF document.
+    #
+    # @param [String] input The input KAF document.
+    # @return [String]
+    #
+    def language_from_kaf(input)
+      document = Nokogiri::XML(input)
+      language = document.xpath('KAF/@xml:lang')[0]
+
+      return language ? language.to_s : nil
+    end
+
     private
 
     ##
@@ -112,18 +128,6 @@ module Opener
       return annotator
     end
 
-    ##
-    # Returns the language from the KAF document.
-    #
-    # @param [String] input The input KAF document.
-    # @return [String]
-    #
-    def language_from_kaf(input)
-      document = Nokogiri::XML(input)
-
-      return document.at('KAF').attr('xml:lang')
-    end
-
     ##
     # Returns the endpoint URL for the given language.
     #

data/lib/opener/ned/cli.rb

@@ -25,7 +25,7 @@ module Opener
       #
       def configure_slop
         return Slop.new(:strict => false, :indent => 2, :help => true) do
-          banner 'Usage: ner [OPTIONS]'
+          banner 'Usage: ned [OPTIONS]'
 
           separator <<-EOF.chomp
 

data/lib/opener/ned/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class Ned
-    VERSION = '3.0.0'
+    VERSION = '3.0.1'
   end # Ned
 end # Opener

data/opener-ned.gemspec

@@ -25,11 +25,13 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'opener-daemons', '~> 2.2'
   gem.add_dependency 'opener-webservice', '~> 2.1'
-  gem.add_dependency 'opener-core', '~> 2.2'
+  gem.add_dependency 'opener-core', '~> 2.3'
 
   gem.add_dependency 'nokogiri'
   gem.add_dependency 'slop', '~> 3.5'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'cliver'
+  gem.add_development_dependency 'cucumber'
+  gem.add_development_dependency 'rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-ned
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opener-daemons
@@ -44,12 +44,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -108,6 +108,34 @@ dependencies:
         version: '0'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  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: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: :development
 description: NED client using DBpedia
 email:
 executables: