opener-webservice 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2f0bbd6c49b5e68d01232c20dc174073ac66997b
-  data.tar.gz: 236c4398bfd4c39c509aca78844f6ffa293f8401
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjMwOGI0NzVjZDA0NDJmNzVlNGRkMmJjYTIxNzBkZTRkM2I2MTRiZA==
+  data.tar.gz: !binary |-
+    MDE0ZmRlM2NlZTIyNzY5MTFjYjQ5NTk0NzNhODUwMjczZTU3MzA1ZA==
 SHA512:
-  metadata.gz: 86c9a155b512a6a682e8ecea0a646be4ed7f83fee8ca6805c98a2b71f134144474a4e8046267a433a323e5846fa7827934196245d1c397a9edb5651aeefd749b
-  data.tar.gz: 8d2725e610d1ecb603e64a3225a05d43db5de10e62cc3e2bf7cc4ee029579385b15ceb44e4d78c445d9fa586cd5cbbc9bcc24c09c4b750a2763380b6a7e20a9c
+  metadata.gz: !binary |-
+    ZTllYjJjNWQ2ODFiY2M3MThmOWVlYmQ3YmMyMTlhZGFiNGNmOGFlNzBiMzQ5
+    NTQ0M2RhZGRiODc0NjZjYjQ3MTE1NGZiOGI3ZWQ1OWZhYzBkNTg1MWVkMjNh
+    ZWI2ZTkzMDk1YjQ0ZjRjMzQ4MjIwYTc0ZmY5MmM1MGFlNDdhNDI=
+  data.tar.gz: !binary |-
+    YjE1ZDdkYWEyYWVmODIxZjE5MWQ1NjcxNjQ1NjU3ZGFhOTFhYWYzNWUxOThh
+    OTdiY2U2YzAxMGY3NDFhMDA0NWY3MTZmODFmNjYxYWRhZjZjNzYxMmFlZmYx
+    OTIzY2NmZTA5M2E4ZDRlZjk3MjRlZWQxODNkYjZjMmIyOTA4ZmM=

data/LICENSE.txt

@@ -0,0 +1,13 @@
+Copyright 2014 OpeNER Project Consortium
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/lib/opener/webservice/version.rb

@@ -2,6 +2,6 @@ require 'sinatra/base'
 
 module Opener
   class Webservice < Sinatra::Base
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/opener/webservice.rb

@@ -3,6 +3,7 @@ require "sinatra/base"
 require "json"
 require "opener/webservice/version"
 require "opener/webservice/opt_parser"
+require 'opener/callback_handler'
 
 module Opener
   class Webservice < Sinatra::Base
@@ -66,13 +67,20 @@ module Opener
         process_async(callbacks, error_callback)
       end
     end
-
+    
     ##
     # @return [HTTPClient]
     #
     def self.http_client
       return @http_client || new_http_client
     end
+    
+    ##
+    # @return [Opener::CallbackHandler]
+    #
+    def self.callback_handler
+      return @callback_handler || new_callback_handler
+    end
 
     ##
     # @return [HTTPClient]
@@ -83,6 +91,15 @@ module Opener
 
       return client
     end
+    
+    ##
+    # @return [Opener::CallbackHandler]
+    #
+    def self.new_callback_handler
+      handler = Opener::CallbackHandler.new
+
+      return handler
+    end
 
     ##
     # Specifies the text processor to use or returns it if no parameter is
@@ -248,7 +265,7 @@ module Opener
       
       extract_params
       
-      http_client.post_async(
+      callback_handler.post(
         url,
         :body => filtered_params.merge(output)
       )
@@ -259,7 +276,7 @@ module Opener
     # @param [String] message
     #
     def submit_error(url, message)
-      http_client.post_async(url, :body => {:error => message})
+      callback_handler.post(url, :body => {:error => message})
     end
 
     ##
@@ -290,6 +307,13 @@ module Opener
       return self.class.http_client
     end
     
+    ##
+    # @see Opener::Webservice.callback_handler
+    #
+    def callback_handler
+      return self.class.callback_handler
+    end
+    
     def authenticate!
       credentials = {
         secret_symbol => params[secret_symbol.to_s],

data/opener-webservice.gemspec

@@ -7,10 +7,13 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Basic webservice hooks for the opener toolchain}
   spec.description   = spec.summary
 
+  spec.license = 'Apache 2.0'
+
   spec.files = Dir.glob([
     'lib/**/*',
     '*.gemspec',
-    'README.md'
+    'README.md',
+    'LICENSE.txt'
   ]).select { |file| File.file?(file) }
 
   spec.add_development_dependency "bundler", "~> 1.3"
@@ -20,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra", "~> 1.4.3"
   spec.add_dependency "uuidtools"
   spec.add_dependency "json"
+  spec.add_dependency "opener-callback-handler"
 end

metadata

@@ -1,131 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: opener-webservice
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - development@olery.com
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  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
-- !ruby/object:Gem::Dependency
-  name: pry
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.3
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.3
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: json
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: opener-callback-handler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Basic webservice hooks for the opener toolchain
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
 - README.md
 - lib/opener/webservice.rb
 - lib/opener/webservice/opt_parser.rb
 - lib/opener/webservice/version.rb
 - opener-webservice.gemspec
-homepage:
-licenses: []
+homepage: 
+licenses:
+- Apache 2.0
 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: '0'
 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: Basic webservice hooks for the opener toolchain
 test_files: []
+has_rdoc: