opener-coreference 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97eefd07dde025888ddd445eaa65d3c8bb7192b7
-  data.tar.gz: c8486ea3f2791c021c8ce4b573ecde5555a51d63
+  metadata.gz: 75b674db39fc6526194b40c85b934880cbbf0a57
+  data.tar.gz: 73e72b709fc2c20ab8928dc406fcb4dadd97cfcf
 SHA512:
-  metadata.gz: 3088f5141b323c2479119a2defa3e9186203d1fae4a26714e09950a101ee7a6ff2fbcfcde4c69ec13be1d7945a8c41ccbe10ff727979743fae1e7afee9a565f4
-  data.tar.gz: 26a3692f9a7d3c47ecaa33fafa915f6698ce763ad41c9539db04e678a21503ce9826d487167e404ed0eb230d98b74e7831f78744e8b9d8c44adb9bd2fe56a4db
+  metadata.gz: fe4f25138b31ed7223f636a9929418b408d2744e98189f3eed5c010dffa614b93728d2029930154a3a80717fbd27c026847e6c787c3d318e33aad84f0e7a13af
+  data.tar.gz: d89a035434f1a1e59cd8bdc48ca1f81f885a1c4ddc069f7a542a08b4487aab1de840ec563d4d1c7a730264a0b411cc7055107a03ae6dfe59eac8f33f1a02e1ec

data/lib/opener/coreference.rb

@@ -4,7 +4,6 @@ require 'nokogiri'
 
 require_relative 'coreference/version'
 require_relative 'coreference/cli'
-require_relative 'coreference/error_layer'
 
 module Opener
   class Coreference
@@ -52,7 +51,7 @@ module Opener
         return stdout
         
       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/coreference/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class Coreference
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/opener/coreference/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-coreference.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'opener-webservice'
   gem.add_dependency 'puma'
   gem.add_dependency 'opener-daemons'
-  gem.add_dependency 'opener-core', '~> 1.0'
+  gem.add_dependency 'opener-core', '~> 1.0.2'
 
   gem.add_development_dependency "rake"
 end

metadata

@@ -1,147 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: opener-coreference
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - development@olery.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: httpclient
+  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'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-coreference-base
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: opener-coreference-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-webservice
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: opener-webservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: puma
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-daemons
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: opener-daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: opener-core
+        version: 1.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: 1.0.2
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 description: Gem that wraps the coreference code
-email: 
+email:
 executables:
 - coreference
-- coreference-server
 - coreference-daemon
+- coreference-server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -153,34 +153,32 @@ files:
 - exec/coreference.rb
 - lib/opener/coreference.rb
 - lib/opener/coreference/cli.rb
-- lib/opener/coreference/error_layer.rb
 - lib/opener/coreference/public/markdown.css
 - lib/opener/coreference/server.rb
 - lib/opener/coreference/version.rb
 - lib/opener/coreference/views/index.erb
 - opener-coreference.gemspec
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.2.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Gem that wraps the coreference code
 test_files: []
-has_rdoc: yard

data/lib/opener/coreference/error_layer.rb

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