opener-constituent-parser 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae57ceef64bb3e1ce2c766652fd6b476b0a024c
-  data.tar.gz: 7070cade2986bad758ad59c14187b71290c702a5
+  metadata.gz: e5506deaf6d8ebefd3dd12e06dddd200cb9472ff
+  data.tar.gz: 4954e4e2d72c7bca37921a482009f5d2277a016d
 SHA512:
-  metadata.gz: 7856fc3804f5773dd74eaa48c0868c97c43b474f280ce99a94c486faac3341ea5dc8fd0db6e80607faacf74a363c27ae90c0c5084c1dc23a8e080f6e91c737ea
-  data.tar.gz: e47a15d0bb98b0a9b5d7f6c69628d6b4e75a93356d63138bf6fda1dbff5a63b100b12ab38d277981f21556bc0fe7550ba0927e9341c7b0881d5e8aa82fc1f17a
+  metadata.gz: b0f5be32685632f257a600d495cec2946fa31cc8ceecce5d7eac03dc223d1dbdc3d8cb87172e076f60591244f7569fb5aa682337ed63953e778291fef8aee279
+  data.tar.gz: 62663585a33047e15df4be0f2292fc4c86c75006e90e17decd824e63f32d9f66279c22e4f06826f770212442198a3a90404f8696b217c43056ff5fca2db6ace0

data/bin/constituent-parser-daemon

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'opener/daemons'
+
+exec_path = File.expand_path('../../exec/constituent-parser.rb', __FILE__)
+
+Opener::Daemons::Controller.new(
+  :name      => 'constituent-parser',
+  :exec_path => exec_path
+)

data/exec/constituent-parser.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'opener/daemons'
+require_relative '../lib/opener/constituent_parser'
+
+options = Opener::Daemons::OptParser.parse!(ARGV)
+daemon  = Opener::Daemons::Daemon.new(Opener::ConstituentParser, options)
+
+daemon.start

data/lib/opener/constituent_parser.rb

@@ -1,5 +1,6 @@
 require 'open3'
 require 'optparse'
+require 'nokogiri'
 require 'opener/constituent_parsers/base'
 
 require_relative 'constituent_parser/version'
@@ -15,13 +16,6 @@ module Opener
   class ConstituentParser
     attr_reader :options
 
-    ##
-    # Returns the default language to use.
-    #
-    # @return [String]
-    #
-    DEFAULT_LANGUAGE = 'en'.freeze
-
     ##
     # Hash containing the default options to use.
     #
@@ -29,7 +23,6 @@ module Opener
     #
     DEFAULT_OPTIONS = {
       :args     => [],
-      :language => DEFAULT_LANGUAGE
     }.freeze
 
     ##
@@ -49,13 +42,13 @@ module Opener
     #
     def run(input)
       args = options[:args].dup
-
-      if language_constant_defined?
-        kernel = language_constant.new(:args => args)
+      language = language(input)
+      if language_constant_defined?(language)
+        kernel = language_constant(language).new(:args => args)
       else
         kernel = ConstituentParsers::Base.new(
           :args     => args,
-          :language => options[:language]
+          :language => language
         )
       end
 
@@ -66,7 +59,7 @@ module Opener
     # @return [String]
     #
     def output_type
-      return 'text/plain'
+      return :xml
     end
 
     protected
@@ -77,22 +70,25 @@ module Opener
     #
     # @return [TrueClass|FalseClass]
     #
-    def language_constant_defined?
-      return ConstituentParsers.const_defined?(language_constant_name)
+    def language_constant_defined?(language)
+      return ConstituentParsers.const_defined?(language.upcase)
     end
 
     ##
-    # @return [String]
+    # @return [Class]
     #
-    def language_constant_name
-      return options[:language].upcase
+    def language_constant(language)
+      return ConstituentParsers.const_get(language.upcase)
     end
-
+    
     ##
-    # @return [Class]
+    # @return the language from the KAF
     #
-    def language_constant
-      return ConstituentParsers.const_get(language_constant_name)
+    def language(input)
+      document = Nokogiri::XML(input)
+      language = document.at('KAF').attr('xml:lang')
+
+      return language
     end
   end # ConstituentParser
 end # Opener

data/lib/opener/constituent_parser/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class ConstituentParser
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end # ConstituentParser
 end # Opener

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

@@ -24,20 +24,6 @@
                 <textarea id="input" name="input" cols="50" rows="10"></textarea>
             </div>
 
-            <div>
-                <label for="language">Language</label>
-                <br />
-
-                <select id="language" name="language">
-                    <option value="nl">Dutch</option>
-                    <option value="en">English</option>
-                    <option value="fr">French</option>
-                    <option value="de">German</option>
-                    <option value="it">Italian</option>
-                    <option value="es">Spanish</option>
-                </select>
-            </div>
-
             <% 5.times do |number| %>
 
             <div>
@@ -75,9 +61,6 @@
             <dt>text *</dt>
             <dd>The KAF document to process.</dd>
 
-            <dt>language</dt>
-            <dd>The language (code) to use, e.g. "en" or "fr".</dd>
-
             <dt>callbacks</dt>
             <dd>A collection of callback URLs that are processed as a chain.</dd>
 

data/opener-constituent-parser.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
     'lib/**/*.*',
     '*.gemspec',
     'README.md',
+    'exec/**/*',
     'config.ru'
   ])
 
@@ -22,6 +23,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'opener-webservice'
   gem.add_dependency 'opener-constituent-parser-base', '>= 0.1.0'
   gem.add_dependency 'puma'
+  gem.add_dependency 'nokogiri'
+  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'

metadata

@@ -1,97 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: opener-constituent-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - development@olery.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opener-webservice
-  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-constituent-parser-base
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: puma
+  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: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: opener-build-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-daemons
   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: rake
+  name: opener-core
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
+      - !ruby/object:Gem::Version
+        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'
-  type: :development
   prerelease: false
+  type: :development
+- !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'
+  prerelease: false
+  type: :development
 description: Constituent parser including a webservice.
-email: 
+email:
 executables:
 - constituent-parser
+- constituent-parser-daemon
 - constituent-parser-server
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/constituent-parser
+- bin/constituent-parser-daemon
 - bin/constituent-parser-server
 - config.ru
+- exec/constituent-parser.rb
 - lib/opener/constituent_parser.rb
 - lib/opener/constituent_parser/cli.rb
 - lib/opener/constituent_parser/public/markdown.css
@@ -99,28 +144,27 @@ files:
 - lib/opener/constituent_parser/version.rb
 - lib/opener/constituent_parser/views/index.erb
 - opener-constituent-parser.gemspec
-homepage: 
+homepage:
 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: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.2.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Constituent parser including a webservice.
 test_files: []
-has_rdoc: yard