active_elastic_job 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6847a7a87f3a4b268f17b0e1051c1947738c3ec
-  data.tar.gz: e6017460930225630f39d9b4994ec2eb6e92005b
+  metadata.gz: 33d8c9fbb99bf26f435b6ec527e34022b1967473
+  data.tar.gz: e87b6fb000e3ee8feac2b549af57b83852358c72
 SHA512:
-  metadata.gz: 784f598655f40226151c63d094432a239ecb22bbb3d8104d1d09f81ce68e1fc7603f788fef0a045f2e06a0e8b9f3248d73709df89a23111cadaef62d16719cb8
-  data.tar.gz: 4256d0370e0e926f7fc287fe05da0ca4bd8020c7d91de32a242f2185fe5e991d863e3c3a8357ebcf0e5dd555d68bcaf32cdf06e676fb411f5900af0484966ff3
+  metadata.gz: ca2572266cbfd44cfa04270ece01d0e99c26f6768ac6d20aa4f7fd3969130ff5afb2d82f11ac3ba092ddf2378dedeada37c344844a677aebf4e73b650ee50cde
+  data.tar.gz: 068c7a6062081d4d0196d4a865179515f89b9a93375aa55574cd6a724c9316295d56a3b277aaf01c9debf882ed337e00741caf6f83e8111517b2bc920b38fa23

data/lib/active_elastic_job/railtie.rb

@@ -1,7 +1,13 @@
 module ActiveElasticJob
   class Railtie < Rails::Railtie
+    config.active_elastic_job = ActiveSupport::OrderedOptions.new
+    config.active_elastic_job.aws_region = ENV['AWS_REGION']
+    config.active_elastic_job.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
+    config.active_elastic_job.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_KEY'] || ENV['AMAZON_SECRET_ACCESS_KEY']
+    config.active_elastic_job.disable_sqs_confumer = ENV['DISABLE_SQS_CONSUMER']
+
     initializer "active_elastic_job.insert_middleware" do |app|
-      disabled = ENV['DISABLE_SQS_CONSUMER']
+      disabled = app.config.active_elastic_job.disable_sqs_confumer
       if disabled == 'false' || disabled.nil?
         if app.config.force_ssl
           app.config.middleware.insert_before(ActionDispatch::SSL,ActiveElasticJob::Rack::SqsMessageConsumer)

data/lib/active_elastic_job/version.rb

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

data/lib/active_job/queue_adapters/active_elastic_job_adapter.rb

@@ -171,12 +171,17 @@ module ActiveJob
         end
 
         def aws_sqs_client
-          @aws_key ||= ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_KEY'] || ENV['AMAZON_SECRET_ACCESS_KEY']
-          @aws_sqs_client ||= Aws::SQS::Client.new(
-            access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-            secret_access_key: @aws_key,
-            region: ENV['AWS_REGION']
-          )
+          c =  Rails.application.config.active_elastic_job
+          @aws_sqs_client ||= if c.aws_credentials.present?
+                                Aws::SQS::Client.new(
+                                  credentials: c.aws_credentials,
+                                  region: c.aws_region)
+                              else
+                                Aws::SQS::Client.new(
+                                  access_key_id: c.aws_access_key_id,
+                                  secret_access_key: c.aws_secret_access_key,
+                                  region: c.aws_region)
+                              end
         end
 
         def message_digest(messsage_body)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_elastic_job
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Tawan Sierek