shoryuken 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fff521cc6ef6173b686df9b83b5145901d3b20cb
-  data.tar.gz: a7841963b11b2e4025ab368698e7571df0e506e9
+  metadata.gz: 25d7b8d6df3ab9ede1f0d7a6aba01d18e2a102f2
+  data.tar.gz: bf26e631ee57665f7b18d0a314259b48e71951cd
 SHA512:
-  metadata.gz: 3c45ecb9a4a2d63408978af8eda9d7a2fcf85122a1a603b16550143dff23f16f6e145b0f2985f85b41f1be8f107b1c8a4bf232d75e931d9e0b5635fd82bba7ab
-  data.tar.gz: 80410090f98a1a9d3112401c0fbf02e44b5b1f7fdb6e753df2f6ae2b4887927dcadc9937b2395fd5421c790892984c2e0fea4b3475077bf2411a0de0ecb854a9
+  metadata.gz: edfb890c3b31a38252bfecfd5f0f1c4d98b31c892f12106136fd91c973434f544e76c1ca48c860f2cd4f1065342231ca1dbd3a3f8752eb49613be45b57ce4c87
+  data.tar.gz: 3c36a03cb7bc41ce4038c5942b87f3e5b087d08a4e26e9387f9dc3222bbd4e50840af7ddd68f3b073712de5d8a629d57d29ec9387e855c16499183983fea0e04

data/.travis.yml

@@ -15,3 +15,5 @@ notifications:
     on_failure: always
 
 script: SPEC_ALL=true bundle exec rspec spec
+before_install:
+ - gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [v2.0.4] -
+
+- Add Rails 3 support
+ - [#175](https://github.com/phstc/shoryuken/pull/175)
+
+- Allow symbol as a queue name in shoryuken_options
+ - [#177](https://github.com/phstc/shoryuken/pull/177)
+
+- Make sure bundler is always updated on Travis CI
+ - [#176](https://github.com/phstc/shoryuken/pull/176)
+
+- Add Rails 5 compatibility
+ - [#174](https://github.com/phstc/shoryuken/pull/174)
+
 ## [v2.0.3] - 2015-12-30
 
 - Allow multiple queues per worker

data/lib/shoryuken/core_ext.rb

@@ -1,47 +1,69 @@
-begin
-  require 'active_support/core_ext/hash/keys'
-  require 'active_support/core_ext/hash/deep_merge'
-rescue LoadError
-  class Hash
-    def stringify_keys
-      keys.each do |key|
-        self[key.to_s] = delete(key)
+module Shoryuken
+  module HashExt
+    module StringifyKeys
+      def stringify_keys
+        keys.each do |key|
+          self[key.to_s] = delete(key)
+        end
+        self
+      end
+    end
+
+    module SymbolizeKeys
+      def symbolize_keys
+        keys.each do |key|
+          self[(key.to_sym rescue key) || key] = delete(key)
+        end
+        self
       end
-      self
-    end if !{}.respond_to?(:stringify_keys)
+    end
+
+    module DeepSymbolizeKeys
+      def deep_symbolize_keys
+        keys.each do |key|
+          value = delete(key)
+          self[(key.to_sym rescue key) || key] = value
 
-    def symbolize_keys
-      keys.each do |key|
-        self[(key.to_sym rescue key) || key] = delete(key)
+          value.deep_symbolize_keys if value.is_a? Hash
+        end
+        self
       end
-      self
-    end if !{}.respond_to?(:symbolize_keys)
+    end
+  end
 
-    def deep_symbolize_keys
-      keys.each do |key|
-        value = delete(key)
-        self[(key.to_sym rescue key) || key] = value
+  module StringExt
+    module Constantize
+      def constantize
+        names = self.split('::')
+        names.shift if names.empty? || names.first.empty?
 
-        value.deep_symbolize_keys if value.is_a? Hash
+        constant = Object
+        names.each do |name|
+          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+        end
+        constant
       end
-      self
-    end if !{}.respond_to?(:deep_symbolize_keys)
+    end
   end
 end
 
+begin
+  require 'active_support/core_ext/hash/keys'
+  require 'active_support/core_ext/hash/deep_merge'
+rescue LoadError
+end
+
+class Hash
+  include Shoryuken::HashExt::StringifyKeys unless method_defined?(:stringify_keys)
+  include Shoryuken::HashExt::SymbolizeKeys unless method_defined?(:symbolize_keys)
+  include Shoryuken::HashExt::DeepSymbolizeKeys unless method_defined?(:deep_symbolize_keys)
+end
+
 begin
   require 'active_support/core_ext/string/inflections'
 rescue LoadError
-  class String
-    def constantize
-      names = self.split('::')
-      names.shift if names.empty? || names.first.empty?
-
-      constant = Object
-      names.each do |name|
-        constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-      end
-      constant
-    end
-  end if !"".respond_to?(:constantize)
+end
+
+class String
+  include Shoryuken::StringExt::Constantize unless method_defined?(:constantize)
 end

data/lib/shoryuken/environment_loader.rb

@@ -166,7 +166,7 @@ module Shoryuken
         begin
           Shoryuken::Client.queues queue
         rescue Aws::SQS::Errors::NonExistentQueue
-          Shoryuken.logger.warn { "AWS Queue '#{queue}' does not exist" }
+          Shoryuken.logger.warn { "The specified queue '#{queue}' does not exist" }
         end
       end
     end

data/lib/shoryuken/extensions/active_job_adapter.rb

@@ -16,44 +16,57 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :shoryuken
     class ShoryukenAdapter
       class << self
-        def enqueue(job) #:nodoc:
-          register_worker!(job)
+        def instance
+          # https://github.com/phstc/shoryuken/pull/174#issuecomment-174555657
+          @instance ||= new
+        end
 
-          queue = Shoryuken::Client.queues(job.queue_name)
-          queue.send_message(message(job))
+        def enqueue(job)
+          instance.enqueue(job)
         end
 
-        def enqueue_at(job, timestamp) #:nodoc:
-          register_worker!(job)
+        def enqueue_at(job, timestamp)
+          instance.enqueue(job, timestamp)
+        end
+      end
 
-          delay = (timestamp - Time.current.to_f).round
-          raise 'The maximum allowed delay is 15 minutes' if delay > 15.minutes
+      def enqueue(job) #:nodoc:
+        register_worker!(job)
 
-          queue = Shoryuken::Client.queues(job.queue_name)
-          queue.send_message(message(job, delay_seconds: delay))
-        end
+        queue = Shoryuken::Client.queues(job.queue_name)
+        queue.send_message(message(job))
+      end
 
-        private
+      def enqueue_at(job, timestamp) #:nodoc:
+        register_worker!(job)
 
-        def message(job, options = {})
-          body = job.serialize
+        delay = (timestamp - Time.current.to_f).round
+        raise 'The maximum allowed delay is 15 minutes' if delay > 15.minutes
 
-          { message_body: body,
-            message_attributes: message_attributes }.merge(options)
-        end
+        queue = Shoryuken::Client.queues(job.queue_name)
+        queue.send_message(message(job, delay_seconds: delay))
+      end
 
-        def register_worker!(job)
-          Shoryuken.register_worker(job.queue_name, JobWrapper)
-        end
+      private
+
+      def message(job, options = {})
+        body = job.serialize
+
+        { message_body: body,
+          message_attributes: message_attributes }.merge(options)
+      end
 
-        def message_attributes
-          @message_attributes ||= {
-            'shoryuken_class' => {
-              string_value: JobWrapper.to_s,
-              data_type: 'String'
-            }
+      def register_worker!(job)
+        Shoryuken.register_worker(job.queue_name, JobWrapper)
+      end
+
+      def message_attributes
+        @message_attributes ||= {
+          'shoryuken_class' => {
+            string_value: JobWrapper.to_s,
+            data_type: 'String'
           }
-        end
+        }
       end
 
       class JobWrapper #:nodoc:

data/lib/shoryuken/queue.rb

@@ -5,7 +5,11 @@ module Shoryuken
     def initialize(client, name)
       self.name   = name
       self.client = client
-      self.url    = client.get_queue_url(queue_name: name).queue_url
+      begin
+        self.url = client.get_queue_url(queue_name: name).queue_url
+      rescue Aws::SQS::Errors::NonExistentQueue => e
+        raise e, "The specified queue '#{name}' does not exist"
+      end
     end
 
     def visibility_timeout

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/lib/shoryuken/worker.rb

@@ -68,6 +68,13 @@ module Shoryuken
           @shoryuken_options['queue'] = queue
         end
 
+        case @shoryuken_options['queue']
+        when Array
+          @shoryuken_options['queue'].map!(&:to_s)
+        when Symbol
+          @shoryuken_options['queue'] = @shoryuken_options['queue'].to_s
+        end
+
         [@shoryuken_options['queue']].flatten.compact.each(&method(:register_worker))
       end
 

data/spec/shoryuken/core_ext_spec.rb

@@ -1,6 +1,34 @@
 require 'spec_helper'
 
-describe 'core_ext' do
+RSpec.describe 'Core Extensions' do
+  describe Hash do
+    describe 'stringify_keys' do
+      it 'converts keys into strings' do
+        expect({ :key1 => 'value1', 'key2' => 'value2' }.stringify_keys).to eq('key1' => 'value1', 'key2' => 'value2')
+      end
+    end
+
+    describe 'symbolize_keys' do
+      it 'converts keys into strings' do
+        expect({ :key1 => 'value1', 'key2' => 'value2' }.symbolize_keys).to eq(:key1 => 'value1', key2: 'value2')
+      end
+    end
+
+    describe 'deep_symbolize_keys' do
+      it 'converts keys into strings' do
+        expect({ :key1 => 'value1',
+                 'key2' => 'value2',
+                 'key3' => {
+                   'key31' => { 'key311' => 'value311' },
+                   'key32' => 'value32' } }.deep_symbolize_keys).to eq({ :key1 => 'value1',
+                                                                         :key2 => 'value2',
+                                                                         :key3 => { :key31 =>
+                                                                                    { :key311 => 'value311' },
+                                                                                      :key32 => 'value32' } })
+      end
+    end
+  end
+
   describe String do
     describe '#constantize' do
       class HelloWorld; end

data/spec/shoryuken/worker_spec.rb

@@ -142,6 +142,28 @@ RSpec.describe 'Shoryuken::Worker' do
       expect(GlobalDefaultsTestWorker.get_shoryuken_options['auto_delete']).to eq true
       expect(GlobalDefaultsTestWorker.get_shoryuken_options['batch']).to eq false
     end
+
+    it 'accepts a symbol as a queue and converts to string' do
+      class SymbolQueueTestWorker
+        include Shoryuken::Worker
+
+        shoryuken_options queue: :default
+      end
+
+      expect(SymbolQueueTestWorker.get_shoryuken_options['queue']).to eq 'default'
+    end
+
+    it 'accepts an array that contains symbols as a queue and converts to string' do
+      class WorkerMultipleSymbolQueues
+        include Shoryuken::Worker
+
+        shoryuken_options queue: %i[symbol_queue1 symbol_queue2 symbol_queue3]
+      end
+
+      expect(Shoryuken.worker_registry.workers('symbol_queue1')).to eq([WorkerMultipleSymbolQueues])
+      expect(Shoryuken.worker_registry.workers('symbol_queue2')).to eq([WorkerMultipleSymbolQueues])
+      expect(Shoryuken.worker_registry.workers('symbol_queue3')).to eq([WorkerMultipleSymbolQueues])
+    end
   end
 
   describe '.server_middleware' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler