cloudtasker 0.12.2 → 0.13.rc1

data/lib/cloudtasker/backend/redis_task.rb

@@ -89,7 +89,7 @@ module Cloudtasker
         # 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 @@ module Cloudtasker
         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 @@ module Cloudtasker
       # 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,

data/lib/cloudtasker/cloud_task.rb

@@ -37,7 +37,7 @@ module Cloudtasker
     #
     def self.find(id)
       payload = backend.find(id)&.to_h
-      payload ? new(payload) : nil
+      payload ? new(**payload) : nil
     end
 
     #
@@ -51,7 +51,7 @@ module Cloudtasker
       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
 
     #

data/lib/cloudtasker/cron/schedule.rb

@@ -62,7 +62,7 @@ module Cloudtasker
       def self.load_from_hash!(hash)
         schedules = hash.map do |id, config|
           schedule_config = JSON.parse(config.to_json, symbolize_names: true).merge(id: id.to_s)
-          create(schedule_config)
+          create(**schedule_config)
         end
 
         # Remove existing schedules which are not part of the list
@@ -79,7 +79,7 @@ module Cloudtasker
       def self.create(**opts)
         redis.with_lock(key(opts[:id])) do
           config = find(opts[:id]).to_h.merge(opts)
-          new(config).tap(&:save)
+          new(**config).tap(&:save)
         end
       end
 
@@ -93,7 +93,7 @@ module Cloudtasker
       def self.find(id)
         return nil unless (schedule_config = redis.fetch(key(id)))
 
-        new(schedule_config)
+        new(**schedule_config)
       end
 
       #
@@ -251,9 +251,9 @@ module Cloudtasker
       #
       # 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 @@ module Cloudtasker
       #
       # 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

data/lib/cloudtasker/redis_client.rb

@@ -132,22 +132,47 @@ module Cloudtasker
       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.

data/lib/cloudtasker/unique_job/job.rb

@@ -14,10 +14,11 @@ module Cloudtasker
       # 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
 
       #

data/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

data/lib/cloudtasker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cloudtasker
-  VERSION = '0.12.2'
+  VERSION = '0.13.rc1'
 end

data/lib/cloudtasker/worker.rb

@@ -47,7 +47,7 @@ module Cloudtasker
       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 @@ module Cloudtasker
       # @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 @@ module Cloudtasker
     #
     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

data/lib/cloudtasker/worker_wrapper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudtasker
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.rc1
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-31 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,20 +136,6 @@ 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
@@ -262,48 +248,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  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: rspec-rails
-  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: sqlite3
-  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'
 description: Background jobs for Ruby using Google Cloud Tasks (beta)
 email:
 - arnaud.lachaume@keypup.io
@@ -312,7 +256,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/test.yml"
+- ".github/workflows/lint_rubocop.yml"
+- ".github/workflows/test_ruby_2.5_2.6.yml"
+- ".github/workflows/test_ruby_2.7.yml"
+- ".github/workflows/test_ruby_3.x.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -351,6 +298,8 @@ files:
 - gemfiles/rails_5.2.gemfile.lock
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.0.gemfile.lock
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - gemfiles/semantic_logger_3.4.gemfile
 - gemfiles/semantic_logger_4.6.gemfile
 - gemfiles/semantic_logger_4.7.0.gemfile
@@ -426,11 +375,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Background jobs for Ruby using Google Cloud Tasks (beta)