active_elastic_job 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0c3eef5f0c1b0aa66524d644f7f855f8c3a99d
-  data.tar.gz: af9a0f1e16545725b593d01a42743769f3f9d621
+  metadata.gz: fba8dc34fccb06d74d63d72b215251bbd5360dc9
+  data.tar.gz: c3b74c2041ce300b43aec6a4415b95f8bc74608e
 SHA512:
-  metadata.gz: 82c4cda1a5c365a803ee5e3d0948a22d9a372d77f354671bfd2e50197db807ee424f27bb5fb1474c6a6130c5a1b50279dd1e7d60fc5b8c47ee101f326ca933ed
-  data.tar.gz: 39aee6ee9c19d0fac3b263045211fb420643c93fb7bb65f249113c5d53d89fc1611ea171d717a9b7e288346fa9a1a8efa6f8c8fcc9d40fa1edb7437e3ee013d5
+  metadata.gz: c73e6686338a3f38d7485526a49b8c78c3d3e49cccea3d82d56a2de044a02c6068268f762bfa13488e9f9105082b3012b374d6d24fc46e998d25b07345acad1c
+  data.tar.gz: 2a05f3454b9ee41148e45f0ed1c9a02192a051ba5fd7a5bf69503fa5fba7b73ce1d175f2e4f9e9b47b715d4567164b2b2e8777cab1172ea36e6bb66ec504c3e4

data/lib/active_elastic_job.rb

@@ -5,6 +5,8 @@ require 'active_job/queue_adapters/active_elastic_job_adapter'
 require 'active_elastic_job/rack/sqs_message_consumer'
 require 'active_elastic_job/message_verifier'
 
-module ActiveElasticJob; end;
+module ActiveElasticJob
+  ACRONYM = 'AEJ'.freeze
+end
 
 require "active_elastic_job/railtie" if defined? Rails

data/lib/active_elastic_job/rack/sqs_message_consumer.rb

@@ -13,7 +13,12 @@ module ActiveElasticJob
     # environment, which verifies the digest, have to use the *same*
     # +secrets.secret_key_base+ setting.
     class SqsMessageConsumer
-      USER_AGENT_PREFIX = 'aws-sqsd'
+      USER_AGENT_PREFIX = 'aws-sqsd'.freeze
+      DIGEST_HEADER_NAME = 'HTTP_X_AWS_SQSD_ATTR_MESSAGE_DIGEST'.freeze
+      ORIGIN_HEADER_NAME = 'HTTP_X_AWS_SQSD_ATTR_ORIGIN'.freeze
+      CONTENT_TYPE = 'application/json'.freeze
+      CONTENT_TYPE_HEADER_NAME = 'Content-Type'.freeze
+      OK_RESPONSE_CODE = '200'.freeze
 
       def initialize(app) #:nodoc:
         @app = app
@@ -27,11 +32,11 @@ module ActiveElasticJob
             job = JSON.load(request.body)
             ActiveJob::Base.execute(job)
           rescue ActiveElasticJob::MessageVerifier::InvalidDigest => e
-            return ['403', {'Content-Type' => env['text/plain'] }, ["incorrect digest"]]
+            return ['403', {CONTENT_TYPE_HEADER_NAME => env['text/plain'] }, ["incorrect digest"]]
           rescue StandardError => e
-            return ['500', {'Content-Type' => env['text/plain'] }, [e.message]]
+            return ['500', {CONTENT_TYPE_HEADER_NAME => env['text/plain'] }, [e.message]]
           end
-          return ['200', {'Content-Type' => 'application/json' }, [ '' ]]
+          return [OK_RESPONSE_CODE , {CONTENT_TYPE_HEADER_NAME => CONTENT_TYPE }, [ '' ]]
         end
         @app.call(env)
       end
@@ -41,7 +46,7 @@ module ActiveElasticJob
       def verify!(request)
         secret_key_base = Rails.application.secrets[:secret_key_base]
         @verifier ||= ActiveElasticJob::MessageVerifier.new(secret_key_base)
-        digest = request.headers['HTTP_X_AWS_SQSD_ATTR_MESSAGE_DIGEST']
+        digest = request.headers[DIGEST_HEADER_NAME]
         @verifier.verify!(request.body.string, digest)
       end
 
@@ -51,14 +56,20 @@ module ActiveElasticJob
         # Instead we make a simple string comparison.
         # Benchmark runs showed an performance increase of
         # up to 40%
-        current_user_agent = request.headers['User-Agent']
+        current_user_agent = request.headers['User-Agent'.freeze]
         return (current_user_agent.present? &&
           current_user_agent.size >= USER_AGENT_PREFIX.size &&
           current_user_agent[0..(USER_AGENT_PREFIX.size - 1)] == USER_AGENT_PREFIX)
       end
 
       def originates_from_gem?(request)
-        request.headers['HTTP_X_AWS_SQSD_ATTR_ORIGIN'] == 'AEJ'
+        if request.headers[ORIGIN_HEADER_NAME] == ActiveElasticJob::ACRONYM
+          return true
+        elsif request.headers[DIGEST_HEADER_NAME] != nil
+          return true
+        else
+          return false
+        end
       end
     end
   end

data/lib/active_elastic_job/version.rb

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

data/lib/active_job/queue_adapters/active_elastic_job_adapter.rb

@@ -77,24 +77,10 @@ The message with Message ID #{message_id} sent to SQS might be corrupted.
         def enqueue_at(job, timestamp) #:nodoc:
           serialized_job = JSON.dump(job.serialize)
           check_job_size!(serialized_job)
-          message = {
-            queue_url: queue_url(job.queue_name),
-            message_body: serialized_job,
-            delay_seconds: calculate_delay(timestamp),
-            message_attributes: {
-              "message_digest" => {
-                string_value: message_digest(serialized_job),
-                data_type: "String"
-              },
-              "origin" => {
-                string_value: "AEJ",
-                data_type: "String"
-              }
-            }
-          }
+          message = build_message(job.queue_name, serialized_job, timestamp)
           resp = aws_sqs_client.send_message(message)
           verify_md5_digests!(
-          resp,
+            resp,
             message[:message_body],
             message[:message_attributes]
           )
@@ -110,6 +96,24 @@ The message with Message ID #{message_id} sent to SQS might be corrupted.
 
         private
 
+        def build_message(queue_name, serialized_job, timestamp)
+          {
+            queue_url: queue_url(queue_name),
+            message_body: serialized_job,
+            delay_seconds: calculate_delay(timestamp),
+            message_attributes: {
+              message_digest: {
+                string_value: message_digest(serialized_job),
+                data_type: "String".freeze
+              },
+              origin: {
+                string_value: ActiveElasticJob::ACRONYM,
+                data_type: "String".freeze
+              }
+            }
+          }
+        end
+
         def queue_url(queue_name)
           cache_key = queue_name.to_s
           @queue_urls ||= { }

metadata

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