opener-constituent-parser 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e46a0e3ff2692b16062a9d28002b1963b18205c2
-  data.tar.gz: 1d3a0b8b5ac236e85408d28653c8b784c538c17d
+  metadata.gz: 98b8cef4632872ab1528b8212730436393bdb53f
+  data.tar.gz: f27400f191b588f9ed7f30d6f2725f56c7cca0ce
 SHA512:
-  metadata.gz: 89f9f7274f3c231ba0a242d995c7c7db3f83483d4cdd870ac9a2a3aa03cd9f20dcbc8881b06d4926e653970bed90b13a516eba944811c261a6a278fd998aea52
-  data.tar.gz: f5b5a91cb60cb1bfcc64650805a9e7bc7c51d8a8752a259d9c4c5351666625a6555e602618a5cf9619b4b9d76b13291e68bfd2e1f194ae6d92e0f082730dd93c
+  metadata.gz: e01b010041e9318023958f7eea147822169d0044e0c56e2cf2b3b0259403f020d2f30e9bf9b37cae2c81d423271c8c35dc3f00e2baa9eee69e09de82d3e67aa7
+  data.tar.gz: a6e55ffd545526ca935ab65a6f792bc009d22882dc4c15aea89713af5e489084e36c3ed0c5d9e0e6ca24ff93640ba998e094a6b952a8f667d50674ed2bfc5c60

data/README.md

@@ -111,7 +111,7 @@ Language Extension
 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/constituent-parser)
 
 Report problem/Get help

data/lib/opener/constituent_parser/error_layer.rb

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

data/lib/opener/constituent_parser/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class ConstituentParser
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
   end # ConstituentParser
 end # Opener

data/lib/opener/constituent_parser.rb

@@ -5,6 +5,7 @@ require 'opener/constituent_parsers/base'
 
 require_relative 'constituent_parser/version'
 require_relative 'constituent_parser/cli'
+require_relative 'constituent_parser/error_layer'
 
 module Opener
   ##
@@ -41,18 +42,22 @@ module Opener
     # @return [Array]
     #
     def run(input)
+      begin
       args = options[:args].dup
-      language = language(input)
-      if language_constant_defined?(language)
-        kernel = language_constant(language).new(:args => args)
-      else
-        kernel = ConstituentParsers::Base.new(
-          :args     => args,
-          :language => language
-        )
-      end
+        language = language(input)
+        if language_constant_defined?(language)
+          kernel = language_constant(language).new(:args => args)
+        else
+          kernel = ConstituentParsers::Base.new(
+            :args     => args,
+            :language => language
+          )
+        end
 
-      return kernel.run(input)
+        return kernel.run(input)
+      rescue Exception => error
+        return ErrorLayer.new(input, error.message, self.class).add
+      end
     end
 
     ##

data/opener-constituent-parser.gemspec

@@ -11,14 +11,14 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.2'
 
   gem.files = Dir.glob([
-    'lib/**/*.*',
+    'lib/**/*',
     '*.gemspec',
     'README.md',
     'exec/**/*',
     'config.ru'
-  ])
+  ]).select { |file| File.file?(file) }
 
-  gem.executables = Dir.glob('bin/*').map { |f| File.basename(f) }
+  gem.executables = Dir.glob('bin/*').map { |file| File.basename(file) }
 
   gem.add_dependency 'opener-webservice'
   gem.add_dependency 'sinatra', '~>1.4.2'
@@ -29,6 +29,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'opener-daemons'
   gem.add_dependency 'opener-core', ['>= 0.1.2']
 
-  gem.add_development_dependency 'opener-build-tools'
   gem.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-constituent-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opener-webservice
@@ -122,20 +122,6 @@ dependencies:
         version: 0.1.2
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: opener-build-tools
-  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: :development
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
@@ -167,6 +153,7 @@ files:
 - exec/constituent-parser.rb
 - lib/opener/constituent_parser.rb
 - lib/opener/constituent_parser/cli.rb
+- lib/opener/constituent_parser/error_layer.rb
 - lib/opener/constituent_parser/public/markdown.css
 - lib/opener/constituent_parser/server.rb
 - lib/opener/constituent_parser/version.rb