shoryuken 3.1.9 → 3.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17dbef4b25b83a6c3529947b5fabf45ff89e868d
-  data.tar.gz: aab8f0e8521732396865abbcb5394ad6e21ed317
+  metadata.gz: 4dda2c81b7db286ab0286fc53d6f809a94036827
+  data.tar.gz: d95cc4ea313c9df67a3fa91147874f5361ddbdbf
 SHA512:
-  metadata.gz: 54c17164557879edcc48b053dad99009989a7be515a0d8e38bd7eb47e95d5f7629389a54d92dfa137494966168d0e34a2a95f1c6e3ee29ff6950bdd8f970bf96
-  data.tar.gz: eca828404986cc2aa5dcf22f01ccb3552591f676c299efac6139ce46dfc9f078d8fcdc1d4dbc5c0269361929f1b0673084733c09fbd23ded26c11142605cb7d4
+  metadata.gz: cd5ce448af5d501a27b15419617dec8c38d03f7134898f617b8a9fe23c291917186f00918c962f11cf45dca19c9ff6d87c7f85c805f265edce3dc0b6dfa686e9
+  data.tar.gz: 33baff2079043bea32abf2d372035301e4ceadf65b9156caa3140233a643578113df2790cd2211e92b0502164388fc99087ece4f8ebebf6e202a840accd4deee

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+
 rvm:
   - 2.0.0
   - 2.1.10
@@ -11,9 +12,18 @@ notifications:
     on_success: change
     on_failure: always
 
-script: SPEC_ALL=true bundle exec rspec spec
+gemfile:
+  - Gemfile
+  - Gemfile.aws-sdk-core-v2
+
+env:
+  - SPEC_ALL=true
+
+script: bundle exec rspec spec
+
 before_install:
- - gem update bundler
+  - gem update bundler
+
 after_success:
   - bundle exec codeclimate-test-reporter
 

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v3.1.10] - 2017-09-02
+
+- Make Shoryuken compatible with AWS SDK 3 and 2
+ - [#433](https://github.com/phstc/shoryuken/pull/433)
+
 ## [v3.1.9] - 2017-08-24
 
 - Add support for dispatch fire event

data/Gemfile

@@ -4,9 +4,11 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'activejob'
+  gem 'activejob', '~> 4'
+  gem 'aws-sdk-core', '~> 3'
+  gem 'aws-sdk-sqs'
   gem 'codeclimate-test-reporter', require: nil
-  gem 'simplecov'
-  gem 'multi_xml'
   gem 'httparty'
+  gem 'multi_xml'
+  gem 'simplecov'
 end

data/Gemfile.aws-sdk-core-v2

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in shoryuken.gemspec
+gemspec
+
+group :test do
+  gem 'activejob', '~> 4'
+  gem 'aws-sdk-core', '~> 2'
+  gem 'codeclimate-test-reporter', require: nil
+  gem 'httparty'
+  gem 'multi_xml'
+  gem 'simplecov'
+end

data/lib/shoryuken.rb

@@ -1,6 +1,11 @@
 require 'yaml'
 require 'json'
 require 'aws-sdk-core'
+begin
+  require 'aws-sdk-sqs' unless defined?(Aws::SQS)
+rescue LoadError
+  fail "AWS SDK 3 requires aws-sdk-sqs to be installed separately. Please add gem 'aws-sdk-sqs' to your Gemfile"
+end
 require 'time'
 require 'concurrent'
 require 'forwardable'

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '3.1.9'.freeze
+  VERSION = '3.1.10'.freeze
 end

data/lib/shoryuken/worker.rb

@@ -61,10 +61,9 @@ module Shoryuken
       end
 
       def stringify_keys(hash) # :nodoc:
-        hash.keys.each do |key|
-          hash[key.to_s] = hash.delete(key)
-        end
-        hash
+        new_hash = {}
+        hash.each { |key, value| new_hash[key.to_s] = value }
+        new_hash
       end
 
       private

data/shoryuken.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'dotenv'
 
-  spec.add_dependency 'aws-sdk-core', '> 2'
+  spec.add_dependency 'aws-sdk-core', '>= 2'
   spec.add_dependency 'concurrent-ruby'
   spec.add_dependency 'thor'
 end

data/spec/shoryuken/worker_spec.rb

@@ -116,6 +116,20 @@ RSpec.describe 'Shoryuken::Worker' do
       expect(NewTestWorker.get_shoryuken_options['queue']).to eq 'production_default'
     end
 
+    it 'does not change the original hash' do
+      class TestWorker
+        include Shoryuken::Worker
+
+        OPT = { queue: :default }
+
+        shoryuken_options OPT
+      end
+
+      expect(TestWorker::OPT['queue']).to eq(nil)
+      expect(TestWorker.get_shoryuken_options['queue']).to eq('default')
+      expect(TestWorker::OPT[:queue]).to eq(:default)
+    end
+
     it 'accepts an array as a queue' do
       class WorkerMultipleQueues
         include Shoryuken::Worker

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.10
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,14 +84,14 @@ dependencies:
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
@@ -137,6 +137,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.aws-sdk-core-v2
 - LICENSE
 - README.md
 - Rakefile