opener-ner 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a4a8aef36d827b9811f412d1d95274baa7231a2
-  data.tar.gz: 3db1738f90157c90d2e1ef450bdd3128bf580b11
+  metadata.gz: f917036a207b771bcfb9cd7fbc3c919ca1af27e7
+  data.tar.gz: ad4f73cf0beac4996101555cddc6621e8de3722a
 SHA512:
-  metadata.gz: feecd33fcb6a097507051fdcce95e14be12f1f622de7573831fa21dd3906f44663285d01f1fe17072f180900a3fd9e7373eb9515110c2792af63014f547e3fb1
-  data.tar.gz: 000d6253fe93afc61e1360fadbc25484877705a41bd7e43b4c54355a92bf56e51d7cb4ad6cabec969ec5000ca4e0d5100d19b29cc87dc15601d7b9270cd62611
+  metadata.gz: 1fea3cc0f29490165b5d0b55f5ff91ed8c0a69536df30c3fa4adc3c54530e96b13be8ed5a6f22360eb1e5f3cd653a05ba9e1eeb81e58d13c8674d18b1f5e63a8
+  data.tar.gz: 261f724b82aa36317b9564b31399bb13f0b881b0e19224308b60de38ff5dc3e7b3f52570c7620a8c1325c60dc367963b19eb0f73e79bc10db377fd1f24db861a

data/lib/opener/ner.rb

@@ -4,7 +4,6 @@ require 'nokogiri'
 
 require_relative 'ner/version'
 require_relative 'ner/cli'
-require_relative 'ner/error_layer'
 
 module Opener
   ##
@@ -65,7 +64,7 @@ module Opener
 
         return kernel.run(input)
       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/ner/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class Ner
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
   end # NER
 end # Opener

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

@@ -16,7 +16,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-ner.gemspec

@@ -25,9 +25,9 @@ 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-ner-base'
   gem.add_dependency 'opener-webservice'
+  gem.add_dependency 'opener-core', '~> 1.0'
 
   gem.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-ner
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -81,21 +81,21 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: opener-core
+  name: opener-ner-base
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: opener-ner-base
+  name: opener-webservice
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -109,17 +109,17 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: opener-webservice
+  name: opener-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -153,7 +153,6 @@ files:
 - exec/ner.rb
 - lib/opener/ner.rb
 - lib/opener/ner/cli.rb
-- lib/opener/ner/error_layer.rb
 - lib/opener/ner/public/markdown.css
 - lib/opener/ner/server.rb
 - lib/opener/ner/version.rb

data/lib/opener/ner/error_layer.rb

@@ -1,89 +0,0 @@
-module Opener
-  class Ner
-    ##
-    # 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 # Ner
-end # Opener