opener-outlet 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f930e8c0a3a29dc5249d6a5482a42dc4b1e78330
-  data.tar.gz: 0827a2ca99d274b15f63aef6a379847922ba6a69
+  metadata.gz: 7ff341e7b4b21951e449c53856b4206632f732a1
+  data.tar.gz: 0b8235e5b7d745c8406c870e400075a2827b1d63
 SHA512:
-  metadata.gz: f3e4196ee9495bff4b482d225b4baa19f4c1bbe818b248a662d90cd86f4805c82c307b211e7415a3deac4cfcf340634c5ede562812d809e9382ac9c5e387bb41
-  data.tar.gz: 6abd0fd15cccf9396dd4f620526e6324f21676ce28c34d81581563988f408a4861551d682057f8144b85d4b384f6284da3cb364a8102399c2ced5a1bb8b350ad
+  metadata.gz: fb31383fb0f9921d118eef0a4df0aa2c222132b7e401931ad74addda9c1745b2f0caed2dc97fcfa348462bfcca1c65e054ba4393a00ff97b5ec3c1d80710f506
+  data.tar.gz: df9e66b1f1afe9803aa1e9f5e78404af863797a476c86d8e4652f8b4f9b4dcc1c9138c9eabfd648c25803284fec5af24826d17f3a482e76ac3a6da385eb8c997

data/README.md

@@ -8,7 +8,7 @@ Database and shows them into your browser.
 
 This software is part of a larger collection of natural language processing
 tools known as "the OpeNER project". You can find more information about the
-project at (the OpeNER portal)[http://opener-project.github.io]. There you can
+project at the [OpeNER portal](http://opener-project.github.io). There you can
 also find references to terms like KAF (an XML standard to represent linguistic
 annotations in texts), component, cores, scenario's and pipelines.
 
@@ -56,10 +56,8 @@ Description of dependencies
 ---------------------------
 
 This component runs best if you run it in an environment suited for OpeNER
-components. You can find an installation guide and helper tools in the (OpeNER
-installer)[https://github.com/opener-project/opener-installer] and (an
-installation guide on the Opener
-Website)[http://opener-project.github.io/getting-started/how-to/local-installation.html]
+components. You can find an installation guide and helper tools in the [OpeNER installer](https://github.com/opener-project/opener-installer) and an
+installation guide on the [Opener Website](http://opener-project.github.io/getting-started/how-to/local-installation.html)
 
 At least you need the following system setup:
 
@@ -89,21 +87,21 @@ can find the core technolies in the following repositories:
 Where to go from here
 ---------------------
 
-* Check (the project websitere)[http://opener-project.github.io]
-* (Checkout the webservice)[http://opener.olery.com/outlet]
+* [Check the project websitere](http://opener-project.github.io)
+* [Checkout the webservice](http://opener.olery.com/outlet)
 
 Report problem/Get help
 -----------------------
 
 If you encounter problems, please email support@opener-project.eu or leave an
-issue in the (issue tracker)[https://github.com/opener-project/outlet/issues].
+issue in the [issue tracker](https://github.com/opener-project/outlet/issues).
 
 
 Contributing
 ------------
 
-1. Fork it ( http://github.com/opener-project/outlet/fork )
+1. Fork it <http://github.com/opener-project/outlet/fork>
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/lib/opener/outlet/server.rb

@@ -23,12 +23,33 @@ module Opener
           erb :index
         end
       end
+      
+      get '/:request_id.json' do
+        unless params[:request_id] == 'favicon.ico'
+          begin
+            output = Output.find_by_uuid(params[:request_id])
+            if output
+              content_type('text/json')
+              kj = Opener::KafToJson.new
+              json = kj.run(output.text) rescue output.text
+              body(json)
+            else
+              halt(404, "No record found for ID #{params[:request_id]}")
+            end
+          rescue => error
+            error_callback = params[:error_callback]
+
+            submit_error(error_callback, error.message) if error_callback
+
+            raise(error)
+          end
+        end
+      end
 
       get '/:request_id' do
         unless params[:request_id] == 'favicon.ico'
           begin
             output = Output.find_by_uuid(params[:request_id])
-
             if output
               content_type(:xml)
               body(output.text)

data/lib/opener/outlet/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class Outlet
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

data/lib/opener/outlet.rb

@@ -1,6 +1,7 @@
 require_relative 'outlet/output'
 require_relative 'outlet/version'
 require_relative 'outlet/server'
+require 'opener/kaf_to_json'
 
 module Opener
   class Outlet

data/opener-outlet.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activerecord', '~>3.2'
   gem.add_dependency 'activesupport', '~>3.2'
   gem.add_dependency 'opener-webservice'
+  gem.add_dependency 'opener-kaf2json'
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'cucumber'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opener-outlet
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - development@olery.com
@@ -192,6 +192,20 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-kaf2json
+  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: rspec
   version_requirements: !ruby/object:Gem::Requirement
@@ -251,28 +265,28 @@ dependencies:
 description: Database storing for the web services output when using callbacks.
 email:
 executables:
-- outlet-server
 - outlet-daemon
+- outlet-server
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- bin/outlet-daemon
+- bin/outlet-server
+- config.ru
 - config/database.rb
+- exec/outlet.rb
 - lib/opener/outlet.rb
-- lib/opener/outlet/visualizer.rb
-- lib/opener/outlet/version.rb
 - lib/opener/outlet/output.rb
-- lib/opener/outlet/server.rb
 - lib/opener/outlet/public/outlet.css
-- lib/opener/outlet/views/show.erb
+- lib/opener/outlet/server.rb
+- lib/opener/outlet/version.rb
 - lib/opener/outlet/views/index.erb
+- lib/opener/outlet/views/show.erb
 - lib/opener/outlet/views/show.html.erb
-- config.ru
+- lib/opener/outlet/visualizer.rb
 - opener-outlet.gemspec
-- README.md
-- exec/outlet.rb
 - visualizer.rb
-- bin/outlet-server
-- bin/outlet-daemon
 homepage: http://opener-project.github.com/
 licenses: []
 metadata: {}
@@ -292,9 +306,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: Database storing for the web services output when using callbacks.
 test_files: []
-has_rdoc: yard