jets-rails 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9634650074baa478633a15b009ab9364024d5634600742bd6d265bd30b1d3b7b
-  data.tar.gz: ea3fd583993fcb9235096cc47d30885131903265f481bd69a50d97b5a74e5e12
+  metadata.gz: 91030594fed4848d30a8a55d3d68d7c850098e24a5962d101f2eb3e15985d1f6
+  data.tar.gz: 2b5e1a889f0e8bf54bb526f2040dec2b250d193a37c3f24905e3f46628aceb82
 SHA512:
-  metadata.gz: 7cb7fb585a8a777082d8243a9ab96316f34fb489a48dc69b65c6c77b78257fb0d2096cc0b4730375651d699e5549c99018ad1875119d66806b76e0dbce3c76b8
-  data.tar.gz: d84fe1e1f4b7fbf874ce052e59ab5903af98be03d2d1d761fdb910f744101e5d48b4bd7ae5c1d349357f1ee9594bedbdadae00d8ed078dacc65094d219b11e42
+  metadata.gz: 5b3eea513b43fbd728dbe8e2136cc6d0c519c4929c468e4444c573dda16d86cfe0ac719c9a0ff30068377da63da3433a9dc0bd31bc7605c56083fed9b7b836bc
+  data.tar.gz: 3f589e0f1f016db3ca1f70c10e8f435256d38e7acf7ee33324815a9988e935f9870ae0ef9a2db4378b5fc2180625707bb5ea4491bb8b7d51a5ac59a26b00f3ab

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [1.1.0] - 2024-05-30
+- [#14](https://github.com/rubyonjets/jets-rails/pull/14) multiple queue support
+
 ## [1.0.3] - 2024-05-29
 - [#13](https://github.com/rubyonjets/jets-rails/pull/13) update gem pin rails >= 5.0
 

data/lib/jets/rails/job/queue/check.rb

@@ -2,31 +2,37 @@ class Jets::Rails::Job::Queue
   class Check
     class Error < StandardError; end
 
-    class << self
-      include Jets::Util::Logging
-
-      @@error_message = "ERROR: Unable to get queue url".color(:red)
-      def exist!
-        job_enable!
-        existance!
-      end
-
-      def existance!
-        return if Url.queue_url
-
-        log.error @@error_message
-        raise Error, "Are you sure you have deployed with Jets.project.config.job.enable = true ?"
-      rescue Jets::Api::Error::NotFound
-        log.error @@error_message
-        raise Error, "It does not look like the stack has successfully deployed. Please deploy first."
-      end
-
-      def job_enable!
-        return if Url.queue_url
-
-        log.error @@error_message
-        raise Error, "Are you sure that config.job.enable = true ?"
-      end
+    include Jets::Util::Logging
+
+    def initialize(job)
+      @job = job
+    end
+
+    @@error_message = "ERROR: Unable to get queue url".color(:red)
+    def exist!
+      job_enable_message
+      existance!
+    end
+
+    def queue_url
+      Url.queue_url(@job.queue_name)
+    end
+
+    def existance!
+      return if queue_url
+
+      log.error @@error_message
+      raise Error, "Are you sure you have deployed with Jets.project.config.job.enable = true ?"
+    rescue Jets::Api::Error::NotFound
+      log.error @@error_message
+      raise Error, "It does not look like the stack has successfully deployed. Please deploy first."
+    end
+
+    def job_enable_message
+      return if queue_url
+
+      log.error @@error_message
+      raise Error, "Are you sure that config.job.enable = true ?"
     end
   end
 end

data/lib/jets/rails/job/queue/url.rb

@@ -3,27 +3,47 @@ class Jets::Rails::Job::Queue
     class << self
       extend Memoist
 
-      def queue_url
-        # On AWS Lambda JETS_JOB_QUEUE_URL will be set
+      def queue_url(queue_name)
+        # On AWS Lambda JETS_QUEUE_URL must be set
         # It must be set when on AWS to avoid the API call to retrieve the queue_url
-        return ENV["JETS_JOB_QUEUE_URL"] if ENV["JETS_JOB_QUEUE_URL"]
+        env_var = "JETS_QUEUE_URL_#{queue_name.upcase}" # IE: JETS_QUEUE_URL_DEFAULT
+        if ENV["AWS_LAMBDA_FUNCTION_NAME"]
+          if ENV[env_var] # queue_url
+            return ENV[env_var]
+          else
+            # Not never happen on AWS Lambda
+            # Unless env var is removed from the lambda function
+            puts <<~EOL
+              WARN: JETS_QUEUE_URL_#{queue_name.upcase} not set.  Unable to get queue url.
+              Maybe double check for:
 
-        # Locally when JETS_JOB_QUEUE_URL will try getting the latest release from API
+              config/jets/deploy.rb
+
+                  config.job.additional_queues = ["#{queue_name}"]
+
+              A queue name must be defined for the SQS queue to be created.
+            EOL
+          end
+        end
+
+        # Locally can also be set to avoid the API call for testing
+        return ENV[env_var] if ENV[env_var]
+
+        # Only reach here locally.
+        # Will try getting queue url from API latest release
         # 1. can be nil
         # 2. can raise NotFound error
-        begin
-          resp = Jets::Api::Release.retrieve("latest")
-          endpoint = resp.endpoints.find { |x| x["name"] == "queue_url" }
-          endpoint&.url
-        rescue Jets::Api::Error::NotFound => e
-          puts "WARN: Unable to get queue url from API: #{e.message}".color(:yellow)
-          puts <<~EOL
-            INFO: You can set JETS_JOB_QUEUE_URL in your environment to avoid this API call.
-            Locally, jets will try to get the latest release from the API to get the queue_url.
-            This will only work if the stack has been deployed successfully.
-          EOL
-          raise
-        end
+        resp = Jets::Api::Release.retrieve("latest")
+        endpoint = resp.endpoints.find { |x| x["name"] == "queue_url_#{queue_name}" }
+        endpoint&.url
+      rescue Jets::Api::Error::NotFound => e
+        puts "WARN: Unable to get queue url from API: #{e.message}".color(:yellow)
+        puts <<~EOL
+          INFO: You can set #{env_var} in your environment to avoid this API call.
+          Locally, jets will try to get the latest release from the API to get the queue_url.
+          This will only work if the stack has been deployed successfully.
+        EOL
+        raise
       end
       memoize :queue_url
     end

data/lib/jets/rails/job/queue.rb

@@ -6,7 +6,6 @@ module Jets::Rails::Job
 
     extend Memoist
     include Jets::Util::Logging
-    delegate :queue_url, to: Url
 
     attr_reader :job, :timestamp
     def initialize(job, timestamp = nil)
@@ -15,7 +14,7 @@ module Jets::Rails::Job
     end
 
     def enqueue
-      Check.exist!
+      Check.new(@job).exist!
 
       params = {
         queue_url: queue_url,
@@ -35,6 +34,11 @@ module Jets::Rails::Job
       queue_url.include?(".fifo")
     end
 
+    def queue_url
+      Url.queue_url(@job.queue_name)
+    end
+    memoize :queue_url
+
     def fifo_params
       options = {}
       options[:message_deduplication_id] = message_deduplication_id

data/lib/jets/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Jets
   module Rails
-    VERSION = "1.0.3"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport