active_elastic_job 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23ebae0278f2915ef56c50b3387a2d862c697a0a
-  data.tar.gz: 60f652aab799782e51bfe1eaae1fcc7c12abb234
+  metadata.gz: e235c668ed6b4cc4d6b462061c0e63d8786f4a90
+  data.tar.gz: a54b85273c167cb0abeed10739fe82533a7251ef
 SHA512:
-  metadata.gz: 6177ea2b5c0b2eaf15787a3421bb08696862a4b70e03f61702a1ddc0d3df059e1d89440b4cc70cfcb5c9b7d15304c68cbda832c386777710ca91a4aa7117fb5c
-  data.tar.gz: 630e3c61425608800d84e402a2de004ef65ec8424ce19df24be19c942eac75425a1389ac5502110af9042b3c541c2c5ae516516018e18c592c58e586df480543
+  metadata.gz: ad76b1050b01e79f40116296cbc9f146a7d354551b61b1aa8b953546f45f733c9d349ed0ea0d4589e2abc327cb005356fbb9000ca2c822d361fb7dcc04fbd099
+  data.tar.gz: 59ffc700b728075af2e670cae7a07acf2dee007d43e4283dbfcd895ab6277874d7ea55a09dbf2182302141d75b8ec896e53c18b084e9e8b989e0b0e84291ac34

data/lib/active_elastic_job/railtie.rb

@@ -1,7 +1,10 @@
 module ActiveElasticJob
   class Railtie < Rails::Railtie
     initializer "active_elastic_job.insert_middleware" do |app|
-      app.config.middleware.use "ActiveElasticJob::Rack::SqsMessageConsumer"
+      disabled = ENV['DISABLE_SQS_CONSUMER']
+      if disabled == 'false' || disabled.nil?
+        app.config.middleware.use "ActiveElasticJob::Rack::SqsMessageConsumer"
+      end
     end
   end
 end

data/lib/active_elastic_job/version.rb

@@ -2,7 +2,7 @@ module ActiveElasticJob
   module VERSION
     MAJOR = 1
     MINOR = 4
-    TINY  = 2
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/active_job/queue_adapters/active_elastic_job_adapter.rb

@@ -19,6 +19,12 @@ module ActiveJob
       MAX_MESSAGE_SIZE = (256 * 1024)
       MAX_DELAY_IN_MINUTES = 15
 
+      if Gem::Version.new(Aws::VERSION) >= Gem::Version.new('2.2.19')
+        AWS_CLIENT_VERIFIES_MD5_DIGESTS = true
+      else
+        AWS_CLIENT_VERIFIES_MD5_DIGESTS = false
+      end
+
       extend ActiveElasticJob::MD5MessageDigestCalculation
 
       class Error < RuntimeError; end;
@@ -28,10 +34,10 @@ module ActiveJob
       class SerializedJobTooBig < Error
         def initialize(serialized_job)
           msg = <<-MSG
-The job contains #{serialized_job.bytesize} bytes in its serialzed form,
-which exceeds the allowed maximum of #{MAX_MESSAGE_SIZE} bytes imposed by Amazon SQS.
+          super(<<-MSG)
+            The job contains #{serialized_job.bytesize} bytes in its serialzed form,
+            which exceeds the allowed maximum of #{MAX_MESSAGE_SIZE} bytes imposed by Amazon SQS.
           MSG
-          super msg
         end
       end
 
@@ -51,13 +57,14 @@ which exceeds the allowed maximum of #{MAX_MESSAGE_SIZE} bytes imposed by Amazon
       #  end
       class NonExistentQueue < Error
         def initialize(queue_name)
-          msg = "The job is bound to queue at #{queue_name}. " <<
-           "Unfortunately a queue with this name does not exist in this " <<
-           "region. Either create an Amazon SQS queue named #{queue_name} - " <<
-           "you can do this in AWS console, make sure to select region " <<
-           "'#{ENV['AWS_REGION']}' - or you select another queue for your jobs."
 
-          super msg
+          super(<<-MSG)
+            The job is bound to queue at #{queue_name}.
+            Unfortunately a queue with this name does not exist in this
+            region. Either create an Amazon SQS queue named #{queue_name} -
+            you can do this in AWS console, make sure to select region
+            '#{ENV['AWS_REGION']}' - or you select another queue for your jobs.
+          MSG
         end
       end
 
@@ -65,12 +72,13 @@ which exceeds the allowed maximum of #{MAX_MESSAGE_SIZE} bytes imposed by Amazon
       # of the response from Amazon SQS.
       class MD5MismatchError < Error
         def initialize(message_id, calculated, returned)
-          msg = "MD5 '#{returned}' returned by Amazon SQS does not match the" <<
-            " calculation on the original request which was '#{calculated}'. " <<
-            "The message with Message ID #{message_id} sent to SQS might be " <<
-            "corrupted."
 
-          super msg
+          super(<<-MSG)
+            MD5 '#{returned}' returned by Amazon SQS does not match the
+            calculation on the original request which was '#{calculated}'.
+            The message with Message ID #{message_id} sent to SQS might be
+            corrupted.
+          MSG
         end
       end
 
@@ -84,11 +92,12 @@ which exceeds the allowed maximum of #{MAX_MESSAGE_SIZE} bytes imposed by Amazon
           check_job_size!(serialized_job)
           message = build_message(job.queue_name, serialized_job, timestamp)
           resp = aws_sqs_client.send_message(message)
-          verify_md5_digests!(
-            resp,
-            message[:message_body],
-            message[:message_attributes]
-          )
+          unless aws_client_verifies_md5_digests?
+            verify_md5_digests!(
+              resp,
+              message[:message_body],
+              message[:message_attributes])
+          end
         rescue Aws::SQS::Errors::NonExistentQueue => e
           unless @queue_urls[job.queue_name.to_s].nil?
             @queue_urls[job.queue_name.to_s] = nil
@@ -101,6 +110,10 @@ which exceeds the allowed maximum of #{MAX_MESSAGE_SIZE} bytes imposed by Amazon
 
         private
 
+        def aws_client_verifies_md5_digests?
+          return AWS_CLIENT_VERIFIES_MD5_DIGESTS
+        end
+
         def build_message(queue_name, serialized_job, timestamp)
           {
             queue_url: queue_url(queue_name),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_elastic_job
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Tawan Sierek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk