shoryuken 0.0.5 → 1.0.0

data/spec/shoryuken/topic_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Shoryuken::Topic do
+  let(:sns) { Aws::SNS::Client.new stub_responses: true }
+  let(:topic_arn) { 'arn:aws:sns:us-east-1:0987654321:shoryuken' }
+  let(:topic_name) { 'shoryuken' }
+
+  before do
+    Shoryuken::Client.account_id = '0987654321'
+    Aws.config = { region: 'us-east-1' }
+  end
+
+  subject { described_class.new(topic_name, sns) }
+
+  describe '#send_message' do
+    it 'enqueues a message' do
+      sns.stub_responses(:publish, { message_id: 'msg1' })
+      expect(sns).to receive(:publish).with(topic_arn: topic_arn, message: 'test')
+
+      subject.send_message('test')
+    end
+
+    it 'parses as JSON by default' do
+      msg = { field: 'test', other_field: 'other' }
+
+      sns.stub_responses(:publish, { message_id: 'msg2' })
+      expect(sns).to receive(:publish).with(topic_arn: topic_arn, message: JSON.dump(msg))
+
+      subject.send_message(msg)
+    end
+  end
+end

data/spec/shoryuken/util_spec.rb

@@ -16,7 +16,9 @@ describe 'Shoryuken::Util' do
   end
 
   describe '#worker_name' do
-    let(:sqs_msg) { double AWS::SQS::ReceivedMessage, id: 'fc754df7-9cc2-4c41-96ca-5996a44b771e', message_attributes: {} }
+    let(:sqs_msg) do
+      double Aws::SQS::Message, message_id: 'fc754df7-9cc2-4c41-96ca-5996a44b771e', message_attributes: {}
+    end
 
     it 'returns Shoryuken worker name' do
       expect(subject.worker_name(TestWorker, sqs_msg)).to eq 'TestWorker'

data/spec/shoryuken/worker_spec.rb

@@ -10,15 +10,15 @@ describe 'Shoryuken::Worker' do
 
   describe '.perform_in' do
     it 'delays a message' do
-      expect(sqs_queue).to receive(:send_message).with('message', {
+      expect(sqs_queue).to receive(:send_message).with(
         message_attributes: {
           'shoryuken_class' => {
             string_value: TestWorker.to_s,
             data_type: 'String'
           }
         },
-        delay_seconds: 60
-      })
+        message_body: 'message',
+        delay_seconds: 60)
 
       TestWorker.perform_in(60, 'message')
     end
@@ -32,15 +32,15 @@ describe 'Shoryuken::Worker' do
 
   describe '.perform_at' do
     it 'delays a message' do
-      expect(sqs_queue).to receive(:send_message).with('message', {
+      expect(sqs_queue).to receive(:send_message).with(
         message_attributes: {
           'shoryuken_class' => {
             string_value: TestWorker.to_s,
             data_type: 'String'
           }
         },
-        delay_seconds: 60
-      })
+        message_body: 'message',
+        delay_seconds: 60)
 
       TestWorker.perform_in(Time.now + 60, 'message')
     end
@@ -54,28 +54,41 @@ describe 'Shoryuken::Worker' do
 
   describe '.perform_async' do
     it 'enqueues a message' do
-      expect(sqs_queue).to receive(:send_message).with('message', {
+      expect(sqs_queue).to receive(:send_message).with(
         message_attributes: {
           'shoryuken_class' => {
             string_value: TestWorker.to_s,
             data_type: 'String'
           }
-        }
-      })
+        },
+        message_body: 'message')
 
       TestWorker.perform_async('message')
     end
 
+    it 'enqueues a message given as hash' do
+      expect(sqs_queue).to receive(:send_message).with(
+        message_attributes: {
+          'shoryuken_class' => {
+            string_value: TestWorker.to_s,
+            data_type: 'String'
+          }
+        },
+        message_body: '{"field":"part1","other_field":"part2"}')
+
+      TestWorker.perform_async(field: 'part1', other_field: 'part2')
+    end
+
     it 'enqueues a message with options' do
-      expect(sqs_queue).to receive(:send_message).with('delayed message', {
+      expect(sqs_queue).to receive(:send_message).with(
         delay_seconds: 60,
         message_attributes: {
           'shoryuken_class' => {
             string_value: TestWorker.to_s,
             data_type: 'String'
           }
-        }
-      })
+        },
+        message_body: 'delayed message')
 
       TestWorker.perform_async('delayed message', delay_seconds: 60)
     end

data/spec/spec_helper.rb

@@ -5,20 +5,31 @@ require 'pry-byebug'
 require 'celluloid'
 require 'shoryuken'
 require 'json'
+require 'multi_xml'
+require 'dotenv'
+Dotenv.load
 
-options_file = File.join(File.expand_path('../..', __FILE__), 'shoryuken.yml')
-
-$options = {}
+if ENV['CODECLIMATE_REPO_TOKEN']
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
+end
 
-if File.exists? options_file
-  $options = YAML.load(File.read(options_file)).deep_symbolize_keys
+config_file = File.join(File.expand_path('../..', __FILE__), 'spec', 'shoryuken.yml')
 
-  AWS.config $options[:aws]
-end
+Shoryuken::EnvironmentLoader.load(config_file: config_file)
 
 Shoryuken.logger.level = Logger::UNKNOWN
 Celluloid.logger.level = Logger::UNKNOWN
 
+# I'm not sure whether this is an issue specific to running Shoryuken against github.com/comcast/cmb
+# as opposed to AWS itself, but sometimes the receive_messages call returns XML that looks like this:
+#
+# <ReceiveMessageResponse>\n\t<ReceiveMessageResult>\n\t</ReceiveMessageResult> ... </ReceiveMessageResponse>
+#
+# The default MultiXML parser is ReXML, which seems to mishandle \n\t chars. Nokogiri seems to be
+# the only one that correctly ignore this whitespace.
+MultiXml.parser = :nokogiri
+
 class TestWorker
   include Shoryuken::Worker
 
@@ -37,16 +48,16 @@ RSpec.configure do |config|
     Shoryuken::Client.class_variable_set :@@queues, {}
     Shoryuken::Client.class_variable_set :@@visibility_timeouts, {}
 
-    Shoryuken.options.clear
-    Shoryuken.options.merge!($options)
+    Shoryuken::Client.sqs = nil
+    Shoryuken::Client.sqs_resource = nil
+    Shoryuken::Client.sns = nil
 
     Shoryuken.queues.clear
 
     Shoryuken.options[:concurrency] = 1
     Shoryuken.options[:delay]       = 1
     Shoryuken.options[:timeout]     = 1
-
-    Shoryuken.options[:aws] = {}
+    Shoryuken.options[:aws].delete(:receive_message)
 
     TestWorker.get_shoryuken_options.clear
     TestWorker.get_shoryuken_options['queue'] = 'default'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   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: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.21
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.21
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-resources
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.21.pre
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.21.pre
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +145,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .hound.yml
 - .rspec
 - .travis.yml
 - Gemfile
@@ -117,6 +160,7 @@ files:
 - lib/shoryuken/client.rb
 - lib/shoryuken/core_ext.rb
 - lib/shoryuken/default_worker_registry.rb
+- lib/shoryuken/environment_loader.rb
 - lib/shoryuken/extensions/active_job_adapter.rb
 - lib/shoryuken/fetcher.rb
 - lib/shoryuken/launcher.rb
@@ -127,6 +171,8 @@ files:
 - lib/shoryuken/middleware/server/auto_delete.rb
 - lib/shoryuken/middleware/server/timing.rb
 - lib/shoryuken/processor.rb
+- lib/shoryuken/sns_arn.rb
+- lib/shoryuken/topic.rb
 - lib/shoryuken/util.rb
 - lib/shoryuken/version.rb
 - lib/shoryuken/worker.rb
@@ -134,6 +180,7 @@ files:
 - shoryuken.gemspec
 - shoryuken.jpg
 - spec/integration/launcher_spec.rb
+- spec/shoryuken.yml
 - spec/shoryuken/client_spec.rb
 - spec/shoryuken/core_ext_spec.rb
 - spec/shoryuken/default_worker_registry_spec.rb
@@ -143,6 +190,8 @@ files:
 - spec/shoryuken/middleware/server/auto_delete_spec.rb
 - spec/shoryuken/middleware/server/timing_spec.rb
 - spec/shoryuken/processor_spec.rb
+- spec/shoryuken/sns_arn_spec.rb
+- spec/shoryuken/topic_spec.rb
 - spec/shoryuken/util_spec.rb
 - spec/shoryuken/worker_spec.rb
 - spec/shoryuken_spec.rb
@@ -167,12 +216,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Shoryuken is a super efficient AWS SQS thread based message processor
 test_files:
 - spec/integration/launcher_spec.rb
+- spec/shoryuken.yml
 - spec/shoryuken/client_spec.rb
 - spec/shoryuken/core_ext_spec.rb
 - spec/shoryuken/default_worker_registry_spec.rb
@@ -182,6 +232,8 @@ test_files:
 - spec/shoryuken/middleware/server/auto_delete_spec.rb
 - spec/shoryuken/middleware/server/timing_spec.rb
 - spec/shoryuken/processor_spec.rb
+- spec/shoryuken/sns_arn_spec.rb
+- spec/shoryuken/topic_spec.rb
 - spec/shoryuken/util_spec.rb
 - spec/shoryuken/worker_spec.rb
 - spec/shoryuken_spec.rb