opener-tokenizer 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13496247ba47f692c80f12993485a57bd0e0a72b
-  data.tar.gz: fcaa9ee31dad9c1f060c82acad59f9742575e3d7
+  metadata.gz: 275fb27a8f2ed178e9b28406471d29a086f6b9f4
+  data.tar.gz: 2f7c7531e54f72406263b9bf0d25ff82c0a46007
 SHA512:
-  metadata.gz: 2512639dd4ff6a4c9bfc8d266428d92f466d49032132fbfaa24f2f8770ac0141225d065af02f4d518c167354356bd4617c11eb9bcd3b61b5e913e92a28ce599f
-  data.tar.gz: deb1510b4f54a4f5a411eaca399db5bc553b25870f433dedefa6e8d1eb064c74a0bde95314dd48305215cac43d9b197b83c16b240a67559959c9d9afe002a9ae
+  metadata.gz: 6b5ee46d17b89684504a92dcc19b31c7d327088dabee5a4b751351dce1f287ee0191ec1051cc519c1d306c271fdd9f06f5d688e210fdc6d1fec16eef3450f33a
+  data.tar.gz: d3302b2bb53eecc52022a58027f315db0c9894fb208cb64c01489249916f3d2468d5cde7b9d2f67352b99d5dc827ab4c7894b52b683be5d7950486e09889652e

data/lib/opener/tokenizer/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class Tokenizer
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

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

@@ -61,7 +61,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/lib/opener/tokenizer.rb

@@ -5,7 +5,6 @@ require 'optparse'
 
 require_relative 'tokenizer/version'
 require_relative 'tokenizer/cli'
-require_relative 'tokenizer/error_layer'
 
 module Opener
   ##
@@ -76,7 +75,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/opener-tokenizer.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sinatra', '~>1.4.2'
   gem.add_dependency 'httpclient'
   gem.add_dependency 'opener-daemons'
+  gem.add_dependency 'opener-core', '~>1.0.2'
   gem.add_dependency 'puma'
 
   gem.add_development_dependency 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-tokenizer
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 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: opener-tokenizer-base
@@ -94,6 +94,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: puma
   version_requirements: !ruby/object:Gem::Requirement
@@ -181,7 +195,6 @@ files:
 - exec/tokenizer.rb
 - lib/opener/tokenizer.rb
 - lib/opener/tokenizer/cli.rb
-- lib/opener/tokenizer/error_layer.rb
 - lib/opener/tokenizer/public/markdown.css
 - lib/opener/tokenizer/server.rb
 - lib/opener/tokenizer/version.rb

data/lib/opener/tokenizer/error_layer.rb

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