Merge pull request #28 from Sage/feature_decouple_dependencies

Architecture updates

eventq_aws/.rspec

@@ -1,2 +1,3 @@
 --color
 --require spec_helper
+--format progress

eventq_aws/Gemfile

@@ -3,6 +3,17 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in eventq_aws.gemspec
 gemspec
 
-gem 'oj', '2.15.0'
+
 gem 'json', '1.8.3'
-gem 'openssl', '2.0.4'
+gem 'redlock'
+
+platforms :ruby do
+  gem 'oj', '2.15.0'
+  gem 'pry'
+  gem 'openssl', '2.0.4'
+end
+
+platforms :jruby do
+  gem 'pry-debugger-jruby'
+  gem 'jruby-openssl'
+end

eventq_aws/eventq_aws.gemspec

@@ -19,12 +19,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec'
 
   spec.add_dependency 'aws-sdk-core'
-  spec.add_dependency 'eventq_base'
-  spec.add_dependency 'hash_kit'
+  spec.add_dependency 'eventq_base', '~> 1.15'
+
+  if RUBY_PLATFORM =~ /java/
+    spec.platform = 'java'
+  end
 end

eventq_aws/lib/eventq_aws.rb

@@ -5,10 +5,15 @@
 require 'eventq_aws/aws_eventq_client'
 require 'eventq_aws/aws_queue_client'
 require 'eventq_aws/aws_queue_manager'
-require 'eventq_aws/aws_queue_worker'
 require 'eventq_aws/aws_subscription_manager'
 require_relative 'eventq_aws/aws_status_checker'
 
+if RUBY_PLATFORM =~ /java/
+  require 'eventq_aws/jruby/aws_queue_worker'
+else
+  require 'eventq_aws/aws_queue_worker'
+end
+
 module EventQ
   def self.namespace
     @namespace

eventq_aws/lib/eventq_aws/aws_eventq_client.rb

@@ -86,6 +86,7 @@ def with_prepared_message(event_type, event, context)
         qm.content = event
         qm.type = event_type
         qm.context = context
+        qm.content_type = event.class.to_s
 
         if EventQ::Configuration.signature_secret != nil
           provider = @signature_manager.get_provider(EventQ::Configuration.signature_provider)

eventq_aws/lib/eventq_aws/aws_queue_worker.rb

@@ -250,7 +250,10 @@ def process_message(response, client, queue, q, block)
         payload = JSON.load(msg.body)
         message = deserialize_message(payload[MESSAGE])
 
-        message_args = EventQ::MessageArgs.new(message.type, retry_attempts, message.context)
+        message_args = EventQ::MessageArgs.new(type: message.type,
+                                               retry_attempts: retry_attempts,
+                                               context: message.context,
+                                               content_type: message.content_type)
 
         EventQ.logger.info("[#{self.class}] - Message received. Retry Attempts: #{retry_attempts}")