opener-daemons 2.4.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 369491bf2439adc202032d470e5c922c2ac68126
-  data.tar.gz: 30cf51a05d5987faf7a905fd15d100f59c14d79a
+  metadata.gz: 6f3c8a043044a495e03b0dacdad8a67b68d7a1a5
+  data.tar.gz: 073bc78c6d4526e5fa0fc92df9ec232d547f740d
 SHA512:
-  metadata.gz: 619a449d3ead1d4cc6ac90b825f936f79f62c59dad15f031557dd46fd4a16edc3a9d6cb95466d16f58d98f9005c8e8e81410d99e38c184d15f7624f52968af3d
-  data.tar.gz: 18b0e2c728a08c69d6d3e7e7862faafcb876dab0bd66660aa271765ae7f343fd27fa7754ec8200f6a7098e60841601d05d245f9aef15a0275941915668f7bb4a
+  metadata.gz: 862ef276d46a65078f5f47c39712f0d0e42f3338ebae5f1bc64ecc6a8989b95a9c6855c7cb2ff5cb3c0cd981ead18f9b0957ea7c084d08c3dd6d3dda7bb0bb93
+  data.tar.gz: 4d56bf239321c51ee2c59580e19eed90e3df3d3cb8b72a7336dc85a718ae54c02da8c3e6374df4bb210252cdf60d94b8e6a43d8d817a0257ac2edfe96bfc3c7a

data/lib/opener/daemons/daemon.rb

@@ -54,11 +54,7 @@ module Opener
 
         NewRelic::Agent.manual_start if Daemons.newrelic?
 
-        # AWS SDK autoloads everything, but this causes constant missing errors
-        # on both JRuby and Rubinius from time to time.
-        AWS.eager_autoload!(AWS::Core)
-        AWS.eager_autoload!(AWS::SQS)
-        AWS.eager_autoload!(AWS::S3)
+        Aws.eager_autoload!(:services => %w{S3 SQS})
       end
 
       ##

data/lib/opener/daemons/uploader.rb

@@ -1,56 +1,42 @@
 module Opener
   module Daemons
-    ##
     # Class for uploading KAF documents to Amazon S3.
-    #
     class Uploader
-      ##
       # Uploads the given KAF document.
       #
       # @param [String] identifier
       # @param [String] document
       # @param [Hash] metadata description
       #
-      # @return [AWS::S3::S3Object]
-      #
+      # @return [Aws::S3::Object]
       def upload(identifier, document, metadata = {})
         object = create(
           "#{SecureRandom.hex}/#{identifier}.xml",
           document,
           :metadata     => metadata,
           :content_type => 'application/xml',
-          :acl          => :public_read
+          :acl          => 'public-read'
         )
 
         return object
       end
 
-      ##
-      # @param [Array] args
-      # @return [AWS::S3::S3Object]
-      #
-      def create(*args)
-        object = bucket.objects.create(*args)
-
-        if object.is_a?(AWS::S3::ObjectVersion)
-          object = object.object
-        end
-
-        return object
+      # @param [String] key
+      # @param [String] body
+      # @param [Hash] options
+      # @return [Aws::S3::Object]
+      def create(key, body, options = {})
+        bucket.put_object(options.merge(:key  => key, :body => body))
       end
 
-      ##
-      # @return [AWS::S3.new]
-      #
+      # @return [Aws::S3::Resource]
       def s3
-        return @s3 ||= AWS::S3.new
+        @s3 ||= Aws::S3::Resource.new
       end
 
-      ##
-      # @return [AWS::S3::Bucket]
-      #
+      # @return [Aws::S3::Bucket]
       def bucket
-        return @bucket ||= s3.buckets[Daemons.output_bucket]
+        @bucket ||= s3.bucket(Daemons.output_bucket)
       end
     end # Uploader
   end # Daemons

data/lib/opener/daemons/version.rb

@@ -1,5 +1,5 @@
 module Opener
   module Daemons
-    VERSION = '2.4.3'
+    VERSION = '2.5.0'
   end # Daemons
 end # Opener

data/lib/opener/daemons/worker.rb

@@ -67,7 +67,7 @@ module Opener
 
       ##
       # @param [String] output
-      # @return [AWS::S3::S3Object]
+      # @return [Aws::S3::Object]
       #
       def upload_output(output)
         object = uploader.upload(config.identifier, output, config.metadata)
@@ -83,7 +83,7 @@ module Opener
       ##
       # Sends the object's URL to the next callback URL.
       #
-      # @param [AWS::S3::S3Object] object
+      # @param [Aws::S3::Object] object
       #
       def submit_callbacks(object)
         urls      = config.callbacks.dup

data/lib/opener/daemons.rb

@@ -1,7 +1,7 @@
 require 'timeout'
 require 'securerandom'
 
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'httpclient'
 require 'slop'
 require 'oni'

data/opener-daemons.gemspec

@@ -21,14 +21,14 @@ Gem::Specification.new do |spec|
     'README.md'
   ]).select { |file| File.file?(file) }
 
-  spec.add_dependency 'aws-sdk', '~> 1.0'
+  spec.add_dependency 'aws-sdk', '~> 2.0'
   spec.add_dependency 'slop', '~> 3.0'
-  spec.add_dependency 'opener-callback-handler', '~> 1.0'
+  spec.add_dependency 'opener-callback-handler', '~> 1.1'
   spec.add_dependency 'opener-core', '~> 2.3'
   spec.add_dependency 'newrelic_rpm'
   spec.add_dependency 'json-schema'
   spec.add_dependency 'rollbar', '~> 1.0'
-  spec.add_dependency 'oni', '~> 3.0'
+  spec.add_dependency 'oni', '~> 4.0'
 
   spec.add_dependency 'httpclient', ['~> 2.0', '>= 2.5.3.3']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opener-daemons
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.5.0
 platform: ruby
 authors:
 - Wilco van Duinkerken
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: opener-core
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement