opener-kaf2json 1.0.6-java → 1.0.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7760c83a5ff35f56412e0828f6234912b304378f
-  data.tar.gz: 8a24fef977bb9966202796a3f9066ab1b31469f1
+  metadata.gz: 0b118beaf31c6aee85706eae29cb86c0955d4f88
+  data.tar.gz: 00331c7616df86de908012522b6d20b0c6e625e7
 SHA512:
-  metadata.gz: 3517429f1212c0c70cccc042d3f43706277c83db5b623dddd3fa7aeb0da973d34fc67e738e3681caaab3e42676f4ffa12c90e36b64e393aef9e311a39041986b
-  data.tar.gz: 76cb00baa6df22e33470145b78cf1d16c7a9080349aebf38a77cb7441f75432c814eff6829c3c05f73d9e532d946c373abc7248f80017ee7c41fbc6496057198
+  metadata.gz: 245ac3d40b4b97bb7fc2ff61f1f78e0705fe191d329736e3b9e1ee62af71179d8343cbd5234553b308e5a477cdfa43f58a8a95f9e5e5cd99c26feb8782ac310e
+  data.tar.gz: 52874be1c94d65b512cf97aa686b1252459ffdb07df98bb769c3d20ca48174452675e87f305d9a862bcbf1f21fbc648378c5d884fc647cdaa238e3455566fc61

data/README.md

@@ -75,16 +75,6 @@ At least you need the following system setup:
 
 * JRuby 1.7.9 or newer
 
-Domain Adaption
----------------
-
-  TODO
-
-Language Extension
-------------------
-
-  TODO
-
 The Core
 --------
 
@@ -95,7 +85,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/kaf2json)
 
 Report problem/Get help

data/lib/opener/kaf_to_json.rb

@@ -1,7 +1,8 @@
+require 'saxon-xslt'
+
 require_relative 'kaf_to_json/version'
 require_relative 'kaf_to_json/server'
-
-require 'saxon-xslt'
+require_relative 'kaf_to_json/error_layer'
 
 
 
@@ -43,9 +44,14 @@ module Opener
     # @return [Array]
     #
     def run(input)
-      doc = Saxon::XML(input)
-      xslt = Saxon::XSLT(File.read(xsl))
-      xslt.transform(doc).to_string
+      begin
+        doc = Saxon::XML(input)
+        xslt = Saxon::XSLT(File.read(xsl))
+        return xslt.transform(doc).to_string
+        
+      rescue Exception => error
+        return ErrorLayer.new(input, error.message, self.class).add
+      end
     end
     
     alias tag run

data/lib/opener/kaf_to_json/error_layer.rb

@@ -0,0 +1,90 @@
+require 'nokogiri'
+
+module Opener
+  class KafToJson
+    ##
+    # 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 # KafToJson
+end # Opener

data/lib/opener/kaf_to_json/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class KafToJson
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

data/opener-kaf2json.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'builder'
   gem.add_dependency 'sinatra', '~>1.4.2'
-  #gem.add_dependency 'nokogiri'
+  gem.add_dependency 'nokogiri'
   gem.add_dependency 'saxon-xslt'
   gem.add_dependency 'puma'
   gem.add_dependency 'opener-daemons'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-kaf2json
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: java
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -38,6 +38,20 @@ dependencies:
         version: 1.4.2
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: saxon-xslt
   version_requirements: !ruby/object:Gem::Requirement
@@ -181,6 +195,7 @@ files:
 - config/kaf2json.xsl
 - exec/kaf-to-json.rb
 - lib/opener/kaf_to_json.rb
+- lib/opener/kaf_to_json/error_layer.rb
 - lib/opener/kaf_to_json/public/markdown.css
 - lib/opener/kaf_to_json/server.rb
 - lib/opener/kaf_to_json/version.rb