opener-daemons 1.1.1 → 1.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGY5NjQ1MjM2M2ZjMmEzMGQ5OTFhODc3NGRhMTFkODQ3MTk5ODBmMg==
-  data.tar.gz: !binary |-
-    MzllZTE4ODlhOGU4M2QzNmE4NDcyOTM0MTNmN2E0ZWU0ODU1MGZhOA==
+SHA1:
+  metadata.gz: 983e879dcaa50627ad0893e28d50d70f69fd77c3
+  data.tar.gz: 9c6cf436bc1c7aee5a78d3b62adcd220df334b02
 SHA512:
-  metadata.gz: !binary |-
-    ZmM0NDgxODYxZmQxMDU3MjBjNmY4ODRhYzQwYjE4MjA1MDNmOWQ3ZjFlZmVi
-    NGQ5ZWExNjE0ZDQyYzZmNmY2ZDU1NzIwZTgxNjk5ODg4MzFhNWE5OTNhMGI5
-    YzhmYWRjNzA3NzczOGUyNjZiN2ExNzhlNGNiZWZiZDY0NTEwNGI=
-  data.tar.gz: !binary |-
-    ODdjNmYwYjVjYmY5NzU5MjliMGE5MWQ2NWY2OWNmZTNlMTA3MmM3Yjk5ODA4
-    OGQwNDcxYmU5NTVhYmVlNjFjNTBlZjU4NGE2NWM3MGNhODJmYTRmNWE1OWRk
-    NjEzMGFlMDY3M2FmOTEyOWQ0MzRjYmNiYWJlMTU1N2UyMjI1ZGQ=
+  metadata.gz: 77b310b5014d001ab149822d64fba94e1b0553ac95609b6f56ef7e77cba507792db17163c0832aa79cf24faa8117497c758c2853f86ae862c63f79f7158f8eef
+  data.tar.gz: 4cdab83d98edf62ce78cd9a2003d61c6b44bcd060235be307bf4f7023b24e293863ac8c7432b8b60b05a99256b874e686d0b73635a4386964f392d46e93e3d40

data/LICENSE.txt

@@ -1,22 +1,13 @@
-Copyright (c) 2014 Wilco van Duinkerken
+Copyright 2014 OpeNER Project Consortium
 
-MIT License
+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
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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/daemons.rb

@@ -3,6 +3,7 @@ require "opener/daemons/sqs"
 require "opener/daemons/daemon"
 require "opener/daemons/opt_parser"
 require "opener/daemons/controller"
+require 'opener/callback_handler'
 
 require "dotenv"
 env_file = File.expand_path("~/.opener-daemons-env")

data/lib/opener/daemons/daemon.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'thread'
 require 'opener/daemons/sqs'
 require 'json'
@@ -58,7 +60,6 @@ module Opener
       def buffer_new_messages
         return if input_buffer.size > buffer_size
         return if output_buffer.size > buffer_size
-
         messages = input_queue.receive_messages(batch_size)
 
         if messages.nil?
@@ -103,7 +104,7 @@ module Opener
             loop do
               message = input_buffer.pop
 
-              input = JSON.parse(message[:body])["input"]
+              input = message[:body]["input"]
               input,* = input if input.kind_of?(Array)
 
               begin
@@ -119,9 +120,11 @@ module Opener
                   output = input
                 end
               end
-
-              output_buffer.push({ :output=>output,
-                                   :handle=>message[:receipt_handle]})
+              message[:body].delete("input")
+              output_buffer.push({ :output=>output, 
+                                   :body => message[:body],
+                                   :handle=>message[:receipt_handle]
+                                   })
             end
           end
         end
@@ -133,10 +136,22 @@ module Opener
             logger.info "Pusher #{t+1} ready for action..."
             loop do
               message = output_buffer.pop
-
-              payload = {:input=>message[:output].force_encoding("UTF-8")}.to_json
-              output_queue.send_message(payload) if output_queue
+              callbacks = extract_callbacks(message[:body]["callbacks[]"])
+              handler = Opener::CallbackHandler.new
+              message[:body][:input] = message[:output].force_encoding("UTF-8")
+              
+              
+              unless callbacks.empty?
+                callback_url = callbacks.shift
+                message[:body][:'callbacks[]'] = callbacks
+                payload = {:body => message[:body]}
+                handler.post(callback_url, payload)
+              else
+                payload = {:body => message[:body]}
+                handler.post(output_queue.queue_url, payload)
+              end
               input_queue.delete_message(message[:handle])
+              
             end
           end
         end
@@ -174,6 +189,20 @@ module Opener
       def relentless?
         @relentless
       end
+      
+      ##
+      # Returns an Array containing the callback URLs, ignoring empty values.
+      #
+      # @param [Array|String] input
+      # @return [Array]
+      #
+      def extract_callbacks(input)
+        return [] if input.nil? || input.empty?
+
+        callbacks = input.compact.reject(&:empty?)
+
+        return callbacks
+      end
 
     end
   end

data/lib/opener/daemons/sqs.rb

@@ -10,7 +10,7 @@ module Opener
       end
 
       def initialize(name)
-        @sqs = Aws::SQS.new
+        @sqs = Aws::SQS::Client.new
         @name = name
         begin
           @url = sqs.get_queue_url(:queue_name=>name)[:queue_url]
@@ -30,7 +30,23 @@ module Opener
 
       def receive_messages(limit)
         result = sqs.receive_message(:queue_url=>url,
-                                     :max_number_of_messages=>limit)[:messages]
+                                     :max_number_of_messages=>limit)[:messages] rescue []
+                                            
+        result ? to_hash(result) : []                       
+                                     
+      end
+      
+      def to_hash(messages)
+        messages.map do |m| 
+          hash = m.to_hash
+          json_body = JSON.parse(hash.delete(:body))
+          hash[:body] = json_body["body"] ? json_body["body"] : json_body
+          hash
+        end
+      end
+      
+      def queue_url
+        url
       end
 
     end

data/lib/opener/daemons/version.rb

@@ -1,5 +1,5 @@
 module Opener
   module Daemons
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/opener-daemons.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.summary     = %q{Daemonize OpeNER components and make them read from an SQS queue. JRuby compatible.}
   spec.description = spec.summary
   spec.homepage    = "http://opener-project.github.io"
-  spec.license     = "Apache v2"
+  spec.license     = "Apache 2.0"
 
   spec.files = Dir.glob([
     'lib/**/*',
@@ -17,9 +17,10 @@ Gem::Specification.new do |spec|
     'README.md'
   ]).select { |file| File.basename(file) }
 
-  spec.add_dependency 'aws-sdk-core', '>= 2.0.0.rc1', '< 3'
+  spec.add_dependency 'aws-sdk-core'
   spec.add_dependency 'spoon'
   spec.add_dependency 'dotenv'
+  spec.add_dependency "opener-callback-handler"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,144 +1,152 @@
 --- !ruby/object:Gem::Specification
 name: opener-daemons
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Wilco van Duinkerken
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
-    - - <
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
+        version: '0'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: spoon
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: spoon
+        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: dotenv
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: opener-callback-handler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '0'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.5'
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Daemonize OpeNER components and make them read from an SQS queue. JRuby
-  compatible.
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+description: Daemonize OpeNER components and make them read from an SQS queue. JRuby compatible.
 email:
 - wilco@sparkboxx.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/opener/daemons.rb
 - lib/opener/daemons/controller.rb
 - lib/opener/daemons/daemon.rb
 - lib/opener/daemons/opt_parser.rb
 - lib/opener/daemons/sqs.rb
 - lib/opener/daemons/version.rb
-- lib/opener/daemons.rb
 - LICENSE.txt
 - opener-daemons.gemspec
 - README.md
 homepage: http://opener-project.github.io
 licenses:
-- Apache v2
+- 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: 
-rubygems_version: 2.1.11
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Daemonize OpeNER components and make them read from an SQS queue. JRuby compatible.
 test_files: []
+has_rdoc: