active_elastic_job 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7f80373d7f57286083c91bfb62632d463df9b7a
-  data.tar.gz: 30ad4c79acf1d9a8393092bdf430f7416b606239
+  metadata.gz: 23ebae0278f2915ef56c50b3387a2d862c697a0a
+  data.tar.gz: 60f652aab799782e51bfe1eaae1fcc7c12abb234
 SHA512:
-  metadata.gz: 72d3f884abb6f6b16d0c43fe2c537ba64d80acba7e65ff2a97faaea99d16b4e6b45666aeb33f232b95cf227b8d16af172385bc9dfcc5d978720fe97f3ea6742a
-  data.tar.gz: b5f4204e84cc39de88f67f321fbc758021b1fbcbb698cc7c991e1a1e0e14b0b9d6d177f92f92191840a01e9e72e29e4b5796886dfa4d2482e310889b89eafda1
+  metadata.gz: 6177ea2b5c0b2eaf15787a3421bb08696862a4b70e03f61702a1ddc0d3df059e1d89440b4cc70cfcb5c9b7d15304c68cbda832c386777710ca91a4aa7117fb5c
+  data.tar.gz: 630e3c61425608800d84e402a2de004ef65ec8424ce19df24be19c942eac75425a1389ac5502110af9042b3c541c2c5ae516516018e18c592c58e586df480543

data/lib/active_elastic_job/md5_message_digest_calculation.rb

@@ -44,10 +44,10 @@ module ActiveElasticJob
         encode_length_and_bytes(attribute[:data_type]) <<
         [TRANSPORT_TYPE_ENCODINGS[attribute[:data_type]]].pack('C'.freeze)
 
-        if string_value = attribute[:string_value]
-          encoded[name] << encode_length_and_string(string_value)
-        elsif binary_value = attribute[:binary_value]
-          encoded[name] << encode_length_and_bytes(binary_value)
+        if attribute[:string_value] != nil
+          encoded[name] << encode_length_and_string(attribute[:string_value])
+        elsif attribute[:binary_value] != nil
+          encoded[name] << encode_length_and_bytes(attribute[:binary_value])
         end
       end
 

data/lib/active_elastic_job/rack/sqs_message_consumer.rb

@@ -40,11 +40,6 @@ module ActiveElasticJob
               '403',
               {CONTENT_TYPE_HEADER_NAME => 'text/plain' },
               ["incorrect digest"]]
-          rescue StandardError => e
-            return [
-              '500',
-              {CONTENT_TYPE_HEADER_NAME => 'text/plain' },
-              [e.message]]
           end
           return [
             OK_RESPONSE_CODE ,

data/lib/active_elastic_job/version.rb

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

data/lib/active_job/queue_adapters/active_elastic_job_adapter.rb

@@ -64,10 +64,11 @@ which exceeds the allowed maximum of #{MAX_MESSAGE_SIZE} bytes imposed by Amazon
       # Raised when calculated MD5 digest does not match the MD5 Digest
       # of the response from Amazon SQS.
       class MD5MismatchError < Error
-        def initialize(message_id)
-          msg = "MD5 returned by Amazon SQS does not match the calculation " <<
-            "on the original request. The message with Message ID " <<
-            "#{message_id} sent to SQS might be corrupted."
+        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
         end
@@ -157,23 +158,29 @@ which exceeds the allowed maximum of #{MAX_MESSAGE_SIZE} bytes imposed by Amazon
         end
 
         def message_digest(messsage_body)
-          secret_key_base = Rails.application.secrets[:secret_key_base]
           @verifier ||= ActiveElasticJob::MessageVerifier.new(secret_key_base)
           @verifier.generate_digest(messsage_body)
         end
 
         def verify_md5_digests!(response, messsage_body, message_attributes)
-          if md5_of_message_body(messsage_body) != response.md5_of_message_body
-            raise MD5MismatchError, response.message_id
+          calculated = md5_of_message_body(messsage_body)
+          returned = response.md5_of_message_body
+          if calculated != returned
+            raise MD5MismatchError.new response.message_id, calculated, returned
           end
 
           if message_attributes
-            if md5_of_message_attributes(message_attributes) !=
-              response.md5_of_message_attributes
-              raise MD5MismatchError, response.message_id
+            calculated = md5_of_message_attributes(message_attributes)
+            returned = response.md5_of_message_attributes
+            if  calculated != returned
+              raise MD5MismatchError.new response.message_id, calculated, returned
             end
           end
         end
+
+        def secret_key_base
+          @secret_key_base ||= Rails.application.secrets[:secret_key_base]
+        end
       end
     end
   end

metadata

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