opener-tree-tagger 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f02a0878183c9f6df7ed50944257698ff369a130
-  data.tar.gz: 101a607039771002fdcf962b7e11ef8bcc863387
+  metadata.gz: f40d6a7240dc070760cff4cc37db4bc379446dc4
+  data.tar.gz: fae0e536b213f291847f8ce12f4e47f188aa5247
 SHA512:
-  metadata.gz: 2b6c0d06f37d18d94bcf74cf9b61f671b995e2296bdbb6ae2c832f491b7169619186c6d1f591c1470dc90c1a998106124ef3afd5ca278c1d346313aaaa999fab
-  data.tar.gz: 80e5eb90d1012ac73aa0fe00a19471e632d0cf72d5e16191ced19ca833182cdd139810f0a3c2294229d16a085202745709058193676366a88332f85a3340c985
+  metadata.gz: c37d73ad22dce5020e8f78ab839d929585b3637f4b7a7487b315c0f5895bc03772c8a5b0c08c97004c7eb6675bf5fb03879b50f25a08401fba877d5f7e2ae181
+  data.tar.gz: bd345fe22dfd8fd2412f00c2ce740ce9bcb27a6d95b72fd1866edffcee9d8a43803b549d1dbad3289ef15479285326e8acdc9d819a10ffc2e55ac5e3042dd704

data/lib/opener/tree_tagger.rb

@@ -4,7 +4,6 @@ require 'nokogiri'
 
 require_relative 'tree_tagger/version'
 require_relative 'tree_tagger/cli'
-require_relative 'tree_tagger/error_layer'
 
 module Opener
   class TreeTagger
@@ -36,7 +35,7 @@ module Opener
         raise stderr unless process.success?
         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/tree_tagger/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class TreeTagger
-    VERSION = "3.2.4"
+    VERSION = "3.2.5"
   end
 end

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

@@ -18,7 +18,7 @@
     <p>* required</p>
     <p>** 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"/>Type your text here*</label>
         <br/>

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 'opener-core', '~> 1.0.2'
   gem.add_dependency 'nokogiri'
   gem.add_dependency 'cliver'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opener-tree-tagger
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - rubenIzquierdo
@@ -9,7 +9,7 @@ authors:
 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: opener-daemons
@@ -95,6 +95,20 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-core
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
@@ -175,12 +189,12 @@ files:
 - core/italian.map.treetagger.kaf.csv
 - core/spanish.map.treetagger.kaf.csv
 - core/token_matcher.py
+- core/token_matcher.pyo
 - core/tt_from_kaf_to_kaf.py
 - exec/tree-tagger.rb
 - ext/hack/Rakefile
 - 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

data/lib/opener/tree_tagger/error_layer.rb

@@ -1,89 +0,0 @@
-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
-        error_node['version'] = klass::VERSION
-        error_node.inner_html = error
-        node.add_child(error_node)
-      end     
-      
-    end # ErrorLayer
-  end # TreeTagger
-end # Opener