cloudtasker 0.3.0 → 0.8.0

data/lib/cloudtasker/worker_handler.rb

@@ -5,7 +5,7 @@ require 'google/cloud/tasks'
 module Cloudtasker
   # Build, serialize and schedule tasks on the processing backend.
   class WorkerHandler
-    attr_reader :worker, :job_args
+    attr_reader :worker
 
     # Alrogith used to sign the verification token
     JWT_ALG = 'HS256'
@@ -46,7 +46,8 @@ module Cloudtasker
             'Authorization' => "Bearer #{Authenticator.verification_token}"
           },
           body: worker_payload.to_json
-        }
+        },
+        queue: worker.job_queue
       }
     end
 
@@ -64,7 +65,8 @@ module Cloudtasker
     #
     def worker_payload
       @worker_payload ||= {
-        worker: worker.class.to_s,
+        worker: worker.job_class_name,
+        job_queue: worker.job_queue,
         job_id: worker.job_id,
         job_args: worker.job_args,
         job_meta: worker.job_meta.to_h

data/lib/cloudtasker/worker_logger.rb

@@ -11,7 +11,7 @@ module Cloudtasker
     end
 
     # Only log the job meta information by default (exclude arguments)
-    DEFAULT_CONTEXT_PROCESSOR = ->(worker) { worker.to_h.slice(:worker, :job_id, :job_meta) }
+    DEFAULT_CONTEXT_PROCESSOR = ->(worker) { worker.to_h.slice(:worker, :job_id, :job_meta, :job_queue) }
 
     #
     # Build a new instance of the class.

data/lib/cloudtasker/worker_wrapper.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'cloudtasker/worker'
+
+module Cloudtasker
+  # A worker class used to schedule jobs without actually
+  # instantiating the worker class. This is useful for middlewares
+  # needing to enqueue jobs in a Rails initializer. Rails 6 complains
+  # about instantiating workers in an iniitializer because of autoloading
+  # in zeitwerk mode.
+  #
+  # Downside of this wrapper: any cloudtasker_options specified on on the
+  # worker_class will be ignored.
+  #
+  # See: https://github.com/rails/rails/issues/36363
+  #
+  class WorkerWrapper
+    include Worker
+
+    attr_accessor :worker_name
+
+    #
+    # Build a new instance of the class.
+    #
+    # @param [String] worker_class The name of the worker class.
+    # @param [Hash] **opts The worker arguments.
+    #
+    def initialize(worker_name:, **opts)
+      @worker_name = worker_name
+      super(opts)
+    end
+
+    #
+    # Override parent. Return the underlying worker class name.
+    #
+    # @return [String] The worker class.
+    #
+    def job_class_name
+      worker_name
+    end
+
+    #
+    # Return a new instance of the worker with the same args and metadata
+    # but with a different id.
+    #
+    # @return [Cloudtasker::WorkerWrapper] <description>
+    #
+    def new_instance
+      self.class.new(worker_name: worker_name, job_queue: job_queue, job_args: job_args, job_meta: job_meta)
+    end
+  end
+end

data/lib/tasks/setup_queue.rake

@@ -1,10 +1,20 @@
 # frozen_string_literal: true
 
 require 'cloudtasker/backend/google_cloud_task'
+require 'cloudtasker/config'
+
+ENV['GOOGLE_AUTH_SUPPRESS_CREDENTIALS_WARNINGS'] ||= 'true'
 
 namespace :cloudtasker do
-  desc 'Setup the Cloud Task queue'
+  desc 'Setup a Cloud Task queue. (default options: ' \
+    "name=#{Cloudtasker::Config::DEFAULT_JOB_QUEUE}, " \
+    "concurrency=#{Cloudtasker::Config::DEFAULT_QUEUE_CONCURRENCY}, " \
+    "retries=#{Cloudtasker::Config::DEFAULT_QUEUE_RETRIES})"
   task setup_queue: :environment do
-    Cloudtasker::Backend::GoogleCloudTask.setup_queue
+    puts Cloudtasker::Backend::GoogleCloudTask.setup_queue(
+      name: ENV['name'],
+      concurrency: ENV['concurrency'],
+      retries: ENV['retries']
+    )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudtasker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +248,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Manage GCP Cloud Tasks in your app. (alpha)
+description: Background jobs for Ruby using Google Cloud Tasks (beta)
 email:
 - arnaud.lachaume@keypup.io
 executables:
@@ -247,6 +261,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -307,7 +322,6 @@ files:
 - lib/cloudtasker/local_server.rb
 - lib/cloudtasker/meta_store.rb
 - lib/cloudtasker/middleware/chain.rb
-- lib/cloudtasker/railtie.rb
 - lib/cloudtasker/redis_client.rb
 - lib/cloudtasker/testing.rb
 - lib/cloudtasker/unique_job.rb
@@ -329,6 +343,7 @@ files:
 - lib/cloudtasker/worker.rb
 - lib/cloudtasker/worker_handler.rb
 - lib/cloudtasker/worker_logger.rb
+- lib/cloudtasker/worker_wrapper.rb
 - lib/tasks/setup_queue.rake
 homepage: https://github.com/keypup-io/cloudtasker
 licenses:
@@ -356,5 +371,5 @@ rubyforge_project:
 rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
-summary: Manage GCP Cloud Tasks in your app. (alpha)
+summary: Background jobs for Ruby using Google Cloud Tasks (beta)
 test_files: []

data/lib/cloudtasker/railtie.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Cloudtasker
-  # Rails extensions
-  class Railtie < Rails::Railtie
-    rake_tasks do
-      load 'tasks/setup_queue.rake'
-    end
-  end
-end