opener-ned 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b3f47e84d065fd802d47943ae7a506a06d6b6ba
-  data.tar.gz: 88c4921c36cf5b5c5e8660cc966a5c0ae412dc5a
+  metadata.gz: f455dcd18c5c9af58539968e2488a4227146164f
+  data.tar.gz: edbd9185e2293a6ef4636e0d259269c6e7201604
 SHA512:
-  metadata.gz: a92ff540c2377590d52352f8d8dbb0e4b0a0366d74749ec7491df1416c20b792c9d5e5227994e6b36082948dbefcc3e9e758eb1613b05ac6213b1d1cede0a219
-  data.tar.gz: 8a386f5a65e565fe03fd820445b27f50163ba7f01095aaeb6eba94fa68e2d24017a60674db41953919f51b4dfb369179f6cdd816e7d41c419db0b7af3ef39e15
+  metadata.gz: 3fb57fb253068c1f0f899cf0b4b73944497f4ffac8a9a00bde1230259fec980e39853c15425b50da2fb65d2266efc6279ee622738cecb7107e1d11d32261c6af
+  data.tar.gz: 4afc7fa154aa074c4f408853a3647be5494dea933375ab78b9cf52196c31d0bcf1c211f9a77d3bc491c0888d5296e15140a24bda77312633c2caaf0e0053859c

data/lib/opener/ned.rb

@@ -7,11 +7,9 @@ require File.expand_path('../../../core/target/ehu-ned-1.0.jar', __FILE__)
 
 require_relative 'ned/version'
 require_relative 'ned/cli'
-require_relative 'ned/error_layer'
 
 import 'java.io.InputStreamReader'
 
-import 'ehu.ned.Annotate'
 import 'ixa.kaflib.KAFDocument'
 
 module Opener
@@ -81,9 +79,9 @@ module Opener
         )
 
         return document.to_string
-        
+
       rescue Exception => error
-        return ErrorLayer.new(input, error.message, self.class).add
+        return Opener::Core::ErrorLayer.new(input, error.message, self.class).add
       end
     end
 

data/lib/opener/ned/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class Ned
-    VERSION = '2.3.0'
+    VERSION = '2.3.2'
   end # Ned
 end # Opener

data/lib/opener/ned/views/index.erb

@@ -17,7 +17,7 @@
         ** When entering a value no response will be displayed in the browser.
         </p>
 
-        <form action="<%=url("/")%>" method="POST">
+        <form action="" method="POST">
             <div>
                 <label for="input">KAF input *</label>
                 <br />

data/opener-ned.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'nokogiri'
   gem.add_dependency 'puma'
   gem.add_dependency 'opener-daemons'
-  gem.add_dependency 'opener-core', ['>= 0.1.2']
+  gem.add_dependency 'opener-core', '~> 1.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'cliver'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-ned
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -98,14 +98,14 @@ dependencies:
   name: opener-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '1.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -139,27 +139,26 @@ dependencies:
 description: NED client using DBpedia
 email:
 executables:
-- ned
 - ned-daemon
 - ned-server
+- ned
 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/version.rb
+- lib/opener/ned/server.rb
 - lib/opener/ned/cli.rb
-- lib/opener/ned/error_layer.rb
 - lib/opener/ned/public/markdown.css
-- lib/opener/ned/server.rb
-- lib/opener/ned/version.rb
 - lib/opener/ned/views/index.erb
 - opener-ned.gemspec
+- config.ru
+- README.md
+- exec/ned.rb
+- bin/ned-daemon
+- bin/ned-server
+- bin/ned
 homepage:
 licenses: []
 metadata: {}
@@ -179,8 +178,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: NED client using DBpedia
 test_files: []
+has_rdoc: yard

data/lib/opener/ned/error_layer.rb

@@ -1,89 +0,0 @@
-module Opener
-  class Ned
-    ##
-    # Add Error Layer to KAF file instead of throwing an error.
-    #
-    class ErrorLayer
-      attr_accessor :input, :document, :error, :klass
-      
-      def initialize(input, error, klass)
-        @input    = input.to_s
-        # Make sure there is always a document, even if it is empty.
-        @document = Nokogiri::XML(input) rescue Nokogiri::XML(nil)
-        @error    = error
-        @klass    = klass
-      end
-      
-      def add
-        if is_xml?
-          unless has_errors_layer?
-            add_errors_layer
-          end
-        else
-          add_root
-          add_text
-          add_errors_layer
-        end
-        add_error
-        
-        xml = !!document.encoding ? document.to_xml : document.to_xml(:encoding => "UTF-8")
-        
-        return xml
-      end
-      
-      ##
-      # Check if the document is a valid XML file.
-      #
-      def is_xml?
-        !!document.root
-      end
-      
-      ##
-      # Add root element to the XML file.
-      #
-      def add_root
-        root = Nokogiri::XML::Node.new "KAF", document
-        document.add_child(root)
-      end
-      
-      ##
-      # Check if the document already has an errors layer.
-      #
-      def has_errors_layer?
-        !!document.at('errors')
-      end
-      
-      ##
-      # Add errors element to the XML file.
-      #
-      def add_errors_layer
-        node = Nokogiri::XML::Node.new "errors", document
-        document.root.add_child(node)
-      end
-      
-      ##
-      # Add the text file incase it is not a valid XML document. More
-      # info for debugging.
-      #
-      def add_text
-        node = Nokogiri::XML::Node.new "raw", document
-        node.inner_html = input
-        document.root.add_child(node)
-        
-      end
-      
-      ##
-      # Add the actual error to the errors layer.
-      #
-      def add_error
-        node = document.at('errors')
-        error_node = Nokogiri::XML::Node.new "error", node
-        error_node['class']   = klass.to_s
-        error_node['version'] = klass::VERSION
-        error_node.inner_html = error
-        node.add_child(error_node)
-      end     
-      
-    end # ErrorLayer
-  end # Ned
-end # Opener