opener-tree-tagger 3.0.1 → 3.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWI0Y2U0NjQzNjY4NTQ0ZGMxNGVhMDUwNTk2NjUwN2I4ZDRjNWY5Mw==
-  data.tar.gz: !binary |-
-    Y2UxNjJjNGRkYTk2NzgwYzdmYWU0NmIzMTI5MjEyYjA0YzY0N2MzOQ==
+SHA1:
+  metadata.gz: d54024e12317abbe3e3e0f11aae1247dc716d22c
+  data.tar.gz: a09740aaf6aa89d485aa4cd3979c181bfbcde4f0
 SHA512:
-  metadata.gz: !binary |-
-    NWY3ZjcxZWI5ZGNkNzY3ZWRhYzQxZTY0MWM0YzE1OTBkZWE3Njk0ZWY5ZmZi
-    ZTdiMzkyZjFiMTgwNzZlYWEyNGE5ZWJiNjY5NTVlNmQ0Mjg2Mzg4ZDJkZTAz
-    ZjE5MDkwNGY0NDRkYWU4ODBlYmIyYzQ3MDY3ODkxYjRkMmQyZjc=
-  data.tar.gz: !binary |-
-    NDUzNDRmOWRjMzYxYWQxYjc3ZTdiZTEyMGVlZGFmZDFlZGQwYjUxNDMxNjU5
-    NDZiMDQ3ODA5YmRmN2Q2YjJhNmIyOGM5ODE3NWYwNjVkMGYyNGE4YjY3NTA5
-    M2MyNzBhYmU1M2E1NTliNWQzNTRjOTk0MWVmZDBkNDE5ZGE3NzE=
+  metadata.gz: 98443d1157140fbd3e09f68b4b3c197a5b71c8f56cc44cfb12de78497a936c8adb46f3d0f96861eaf2418f11aa2cf3693a92c0f83d99c4c310f2757755cfb8d7
+  data.tar.gz: 303e26f30155295957db217e581a3902be96d35af9386c9993dbf3df4fe3160aff4c9db577316be4c3d841e6fe5c0bfe7b27ee4a503b3485c653cd276fda2842

data/README.md

@@ -101,7 +101,7 @@ The component is a fat wrapper around the actual language technology core. You c
 Where to go from here
 ---------------------
 
-* [Check the project websitere](http://opener-project.github.io)
+* [Check the project website](http://opener-project.github.io)
 * [Checkout the webservice](http://opener.olery.com/tree-tagger)
 
 Report problem/Get help

data/lib/opener/tree_tagger.rb

@@ -1,8 +1,10 @@
 require 'open3'
 require 'optparse'
+require 'nokogiri'
 
 require_relative 'tree_tagger/version'
 require_relative 'tree_tagger/cli'
+require_relative 'tree_tagger/error_layer'
 
 module Opener
   class TreeTagger
@@ -29,15 +31,13 @@ module Opener
     end
 
     def run(input)
-      stdout, stderr, process = capture(input)
-
-      if process.success?
-        STDERR.puts(stderr) unless stderr.empty?
-      else
-        abort stderr
-      end
-
-      return stdout, stderr, process
+      begin
+        stdout, stderr, process = capture(input)
+        raise stderr unless process.success?
+        return stdout
+      rescue Exception => error
+        return ErrorLayer.new(input, error.message, self.class).add
+      end        
     end
 
     def capture(input)

data/lib/opener/tree_tagger/error_layer.rb

@@ -0,0 +1,88 @@
+module Opener
+  class TreeTagger
+    ##
+    # 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} #{klass::VERSION}"
+        error_node.inner_html = error
+        node.add_child(error_node)
+      end     
+      
+    end # ErrorLayer
+  end # TreeTagger
+end # Opener

data/lib/opener/tree_tagger/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class TreeTagger
-    VERSION = "3.0.1"
+    VERSION = "3.0.2"
   end
 end

data/opener-tree-tagger.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'httpclient'
   gem.add_dependency 'puma'
   gem.add_dependency 'opener-webservice'
+  gem.add_dependency 'nokogiri'
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'cucumber'

metadata

@@ -1,143 +1,157 @@
 --- !ruby/object:Gem::Specification
 name: opener-tree-tagger
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - rubenIzquierdo
 - sparkboxx
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opener-daemons
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: opener-build-tools
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.7
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
+  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: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: httpclient
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: httpclient
   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-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: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   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'
-description: ! 'Ruby wrapped KAF based Tree Tagger for 6 languages '
+  prerelease: false
+  type: :development
+description: 'Ruby wrapped KAF based Tree Tagger for 6 languages '
 email:
 - ruben.izquierdobevia@vu.nl
 - wilco@olery.com
@@ -149,6 +163,11 @@ extensions:
 - ext/hack/Rakefile
 extra_rdoc_files: []
 files:
+- README.md
+- bin/tree-tagger
+- bin/tree-tagger-daemon
+- bin/tree-tagger-server
+- config.ru
 - core/dutch.map.treetagger.kaf.csv
 - core/english.map.treetagger.kaf.csv
 - core/french.map.treetagger.kaf.csv
@@ -160,41 +179,37 @@ files:
 - exec/tree-tagger.rb
 - ext/hack/Rakefile
 - ext/hack/support.rb
+- lib/opener/tree_tagger.rb
 - lib/opener/tree_tagger/cli.rb
+- lib/opener/tree_tagger/error_layer.rb
 - lib/opener/tree_tagger/public/markdown.css
 - lib/opener/tree_tagger/server.rb
 - lib/opener/tree_tagger/version.rb
 - lib/opener/tree_tagger/views/index.erb
 - lib/opener/tree_tagger/views/result.erb
-- lib/opener/tree_tagger.rb
-- config.ru
 - opener-tree-tagger.gemspec
 - pre_install_requirements.txt
-- README.md
-- bin/tree-tagger
-- bin/tree-tagger-daemon
-- bin/tree-tagger-server
 homepage: http://opener-project.github.com/
 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: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.11
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.2.2
+signing_key:
 specification_version: 4
 summary: Ruby wrapped KAF based Tree Tagger for 6 languages
 test_files: []