add support for ruby 3.0.x - fixes #27

.github/workflows/test_ruby_2.x.yml

@@ -0,0 +1,48 @@
+name: Ruby 2.x
+
+on:
+  push:
+    branches: [ master, 0.9-stable ]
+  pull_request:
+    branches: [ master, 0.9-stable ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - '2.5.9'
+          - '2.6.7'
+          - '2.7.3'
+        appraisal:
+          - 'google-cloud-tasks-1.0'
+          - 'google-cloud-tasks-1.1'
+          - 'google-cloud-tasks-1.2'
+          - 'google-cloud-tasks-1.3'
+          - 'rails-5.2'
+          - 'rails-6.0'
+          - 'rails-6.1'
+          - 'semantic_logger-3.4'
+          - 'semantic_logger-4.6'
+          - 'semantic_logger-4.7.0'
+          - 'semantic_logger-4.7.2'
+    steps:
+      - name: Setup System
+        run: sudo apt-get install libsqlite3-dev
+      - uses: actions/checkout@v2
+      - uses: zhulik/[email protected]
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Build and test with Rake
+        env:
+            APPRAISAL_CONTEXT: ${{ matrix.appraisal }}
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rubocop
+          bundle exec appraisal ${APPRAISAL_CONTEXT} bundle
+          bundle exec appraisal ${APPRAISAL_CONTEXT} rspec

.github/workflows/test.yml → .github/workflows/test_ruby_3.x.yml

@@ -1,4 +1,4 @@
-name: Test
+name: Ruby 3.x
 
 on: [push, pull_request]
 
@@ -8,15 +8,13 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.5.x'
-          - '2.6.x'
+          - '3.0.1'
         appraisal:
           - 'google-cloud-tasks-1.0'
           - 'google-cloud-tasks-1.1'
           - 'google-cloud-tasks-1.2'
           - 'google-cloud-tasks-1.3'
-          - 'rails-5.2'
-          - 'rails-6.0'
+          - 'rails-6.1'
           - 'semantic_logger-3.4'
           - 'semantic_logger-4.6'
           - 'semantic_logger-4.7.0'
@@ -26,10 +24,11 @@ jobs:
         run: sudo apt-get install libsqlite3-dev
       - uses: actions/checkout@v2
       - uses: zhulik/[email protected]
-      - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Build and test with Rake
         env:
             APPRAISAL_CONTEXT: ${{ matrix.appraisal }}

Appraisals

@@ -24,6 +24,10 @@ appraise 'rails-6.0' do
   gem 'rails', '6.0'
 end
 
+appraise 'rails-6.1' do
+  gem 'rails', '6.1'
+end
+
 appraise 'semantic_logger-3.4' do
   gem 'semantic_logger', '3.4.1'
 end

examples/rails/.ruby-version

@@ -1 +1 @@
-ruby-2.5.5
+ruby-3.0.0

examples/rails/Gemfile

@@ -3,10 +3,12 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.5.5'
+ruby '3.0.0'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.2'
+gem 'rails', '~> 6.1.3'
+
+gem 'puma', '~> 5.3.2'
 
 # Background jobs via Cloud Tasks
 gem 'cloudtasker', path: '../../'

examples/sinatra/Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.5.5'
+ruby '3.0.0'
 
 # Web framework
 gem 'sinatra'

gemfiles/rails_6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "6.1"
+
+gemspec path: "../"

lib/cloudtasker/backend/google_cloud_task.rb

@@ -12,28 +12,30 @@ class GoogleCloudTask
       #
       # Create the queue configured in Cloudtasker if it does not already exist.
       #
-      # @param [String] queue_name The relative name of the queue.
+      # @param [String] :name The queue name
+      # @param [Integer] :concurrency The queue concurrency
+      # @param [Integer] :retries The number of retries for the queue
       #
       # @return [Google::Cloud::Tasks::V2beta3::Queue] The queue
       #
-      def self.setup_queue(**opts)
+      def self.setup_queue(name: nil, concurrency: nil, retries: nil)
         # Build full queue path
-        queue_name = opts[:name] || Cloudtasker::Config::DEFAULT_JOB_QUEUE
+        queue_name = name || Cloudtasker::Config::DEFAULT_JOB_QUEUE
         full_queue_name = queue_path(queue_name)
 
         # Try to get existing queue
         client.get_queue(full_queue_name)
       rescue Google::Gax::RetryError
         # Extract options
-        concurrency = (opts[:concurrency] || Cloudtasker::Config::DEFAULT_QUEUE_CONCURRENCY).to_i
-        retries = (opts[:retries] || Cloudtasker::Config::DEFAULT_QUEUE_RETRIES).to_i
+        queue_concurrency = (concurrency || Cloudtasker::Config::DEFAULT_QUEUE_CONCURRENCY).to_i
+        queue_retries = (retries || Cloudtasker::Config::DEFAULT_QUEUE_RETRIES).to_i
 
         # Create queue on 'not found' error
         client.create_queue(
           client.location_path(config.gcp_project_id, config.gcp_location_id),
           name: full_queue_name,
-          retry_config: { max_attempts: retries },
-          rate_limits: { max_concurrent_dispatches: concurrency }
+          retry_config: { max_attempts: queue_retries },
+          rate_limits: { max_concurrent_dispatches: queue_concurrency }
         )
       end
 

lib/cloudtasker/backend/memory_task.rb

@@ -62,7 +62,7 @@ def self.create(payload)
         payload = payload.merge(schedule_time: payload[:schedule_time].to_i)
 
         # Save task
-        task = new(payload.merge(id: id))
+        task = new(**payload.merge(id: id))
         queue << task
 
         # Execute task immediately if in testing and inline mode enabled

lib/cloudtasker/backend/redis_task.rb

@@ -89,7 +89,7 @@ def self.create(payload)
         # Save job
         redis.write(key(id), payload)
         redis.sadd(key, id)
-        new(payload.merge(id: id))
+        new(**payload.merge(id: id))
       end
 
       #
@@ -103,7 +103,7 @@ def self.find(id)
         gid = key(id)
         return nil unless (payload = redis.fetch(gid))
 
-        new(payload.merge(id: id))
+        new(**payload.merge(id: id))
       end
 
       #
@@ -172,8 +172,12 @@ def gid
       # Retry the task later.
       #
       # @param [Integer] interval The delay in seconds before retrying the task
+      # @param [Hash] opts Additional options
+      # @option opts [Boolean] :is_error Increase number of retries. Default to true.
       #
-      def retry_later(interval, is_error: true)
+      def retry_later(interval, opts = {})
+        is_error = opts.to_h.fetch(:is_error, true)
+
         redis.write(
           gid,
           retries: is_error ? retries + 1 : retries,

lib/cloudtasker/cloud_task.rb

@@ -37,7 +37,7 @@ def self.backend
     #
     def self.find(id)
       payload = backend.find(id)&.to_h
-      payload ? new(payload) : nil
+      payload ? new(**payload) : nil
     end
 
     #
@@ -51,7 +51,7 @@ def self.create(payload)
       raise MaxTaskSizeExceededError if payload.to_json.bytesize > Config::MAX_TASK_SIZE
 
       resp = backend.create(payload)&.to_h
-      resp ? new(resp) : nil
+      resp ? new(**resp) : nil
     end
 
     #

lib/cloudtasker/cron/schedule.rb

@@ -93,7 +93,7 @@ def self.create(**opts)
       def self.find(id)
         return nil unless (schedule_config = redis.fetch(key(id)))
 
-        new(schedule_config)
+        new(**schedule_config)
       end
 
       #
@@ -251,9 +251,9 @@ def next_time(*args)
       #
       # Buld edit the object attributes.
       #
-      # @param [Hash] **opts The attributes to edit.
+      # @param [Hash] opts The attributes to edit.
       #
-      def assign_attributes(**opts)
+      def assign_attributes(opts)
         opts
           .select { |k, _| instance_variables.include?("@#{k}".to_sym) }
           .each { |k, v| instance_variable_set("@#{k}", v) }
@@ -262,9 +262,9 @@ def assign_attributes(**opts)
       #
       # Edit the object attributes and save the object in Redis.
       #
-      # @param [Hash] **opts The attributes to edit.
+      # @param [Hash] opts The attributes to edit.
       #
-      def update(**opts)
+      def update(opts)
         assign_attributes(opts)
         save
       end

lib/cloudtasker/redis_client.rb

@@ -132,22 +132,47 @@ def search(pattern)
       list
     end
 
-    #
-    # Delegate all methods to the redis client.
-    #
-    # @param [String, Symbol] name The method to delegate.
-    # @param [Array<any>] *args The list of method arguments.
-    # @param [Proc] &block Block passed to the method.
-    #
-    # @return [Any] The method return value
-    #
-    def method_missing(name, *args, &block)
-      if Redis.method_defined?(name)
-        client.with { |c| c.send(name, *args, &block) }
-      else
-        super
+    # rubocop:disable Style/MissingRespondToMissing
+    if RUBY_VERSION < '3'
+      #
+      # Delegate all methods to the redis client.
+      # Old delegation method.
+      #
+      # @param [String, Symbol] name The method to delegate.
+      # @param [Array<any>] *args The list of method positional arguments.
+      # @param [Hash<any>] *kwargs The list of method keyword arguments.
+      # @param [Proc] &block Block passed to the method.
+      #
+      # @return [Any] The method return value
+      #
+      def method_missing(name, *args, &block)
+        if Redis.method_defined?(name)
+          client.with { |c| c.send(name, *args, &block) }
+        else
+          super
+        end
+      end
+    else
+      #
+      # Delegate all methods to the redis client.
+      # Ruby 3 delegation method style.
+      #
+      # @param [String, Symbol] name The method to delegate.
+      # @param [Array<any>] *args The list of method positional arguments.
+      # @param [Hash<any>] *kwargs The list of method keyword arguments.
+      # @param [Proc] &block Block passed to the method.
+      #
+      # @return [Any] The method return value
+      #
+      def method_missing(name, *args, **kwargs, &block)
+        if Redis.method_defined?(name)
+          client.with { |c| c.send(name, *args, **kwargs, &block) }
+        else
+          super
+        end
       end
     end
+    # rubocop:enable Style/MissingRespondToMissing
 
     #
     # Check if the class respond to a certain method.

lib/cloudtasker/unique_job/job.rb

@@ -14,10 +14,11 @@ class Job
       # Build a new instance of the class.
       #
       # @param [Cloudtasker::Worker] worker The worker at hand
+      # @param [Hash] worker The worker options
       #
-      def initialize(worker, **kwargs)
+      def initialize(worker, opts = {})
         @worker = worker
-        @call_opts = kwargs
+        @call_opts = opts
       end
 
       #

lib/cloudtasker/unique_job/middleware/client.rb

@@ -3,9 +3,10 @@
 module Cloudtasker
   module UniqueJob
     module Middleware
+      # TODO: kwargs to job otherwise it won't get the time_at
       # Client middleware, invoked when jobs are scheduled
       class Client
-        def call(worker, **_kwargs)
+        def call(worker, _opts = {})
           Job.new(worker).lock_instance.schedule { yield }
         end
       end

lib/cloudtasker/worker.rb

@@ -47,7 +47,7 @@ def self.from_hash(hash)
       return nil unless worker_klass.include?(self)
 
       # Return instantiated worker
-      worker_klass.new(payload.slice(:job_queue, :job_args, :job_id, :job_meta, :job_retries, :task_id))
+      worker_klass.new(**payload.slice(:job_queue, :job_args, :job_id, :job_meta, :job_retries, :task_id))
     rescue NameError
       nil
     end
@@ -121,7 +121,7 @@ def perform_at(time_at, *args)
       # @return [Cloudtasker::CloudTask] The Google Task response
       #
       def schedule(args: nil, time_in: nil, time_at: nil, queue: nil)
-        new(job_args: args, job_queue: queue).schedule({ interval: time_in, time_at: time_at }.compact)
+        new(job_args: args, job_queue: queue).schedule(**{ interval: time_in, time_at: time_at }.compact)
       end
 
       #
@@ -239,7 +239,7 @@ def schedule_time(interval: nil, time_at: nil)
     #
     def schedule(**args)
       # Evaluate when to schedule the job
-      time_at = schedule_time(args)
+      time_at = schedule_time(**args)
 
       # Schedule job through client middlewares
       Cloudtasker.config.client_middleware.invoke(self, time_at: time_at) do

lib/cloudtasker/worker_wrapper.rb

@@ -27,7 +27,7 @@ class WorkerWrapper
     #
     def initialize(worker_name:, **opts)
       @worker_name = worker_name
-      super(opts)
+      super(**opts)
     end
 
     #

spec/active_job/queue_adapters/cloudtasker_adapter/job_wrapper_spec.rb

@@ -6,7 +6,7 @@
   include_context 'of Cloudtasker ActiveJob instantiation'
 
   subject :worker do
-    described_class.new(example_job_wrapper_args.merge(task_id: '00000001'))
+    described_class.new(**example_job_wrapper_args.merge(task_id: '00000001'))
   end
 
   let :example_unreconstructed_job_serialization do