active_interaction-active_job 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aad1a27c134d6d4eca50848fe96fa82adf6aaff6
-  data.tar.gz: 464a1af388c378ce3ac10234587b963b075cd19c
+  metadata.gz: 9c07d78350fd9b3ccc7e99ad7d238fd7e541f5f3
+  data.tar.gz: 58ed3d122bf95d64de98b165c3aaa675f55c38cd
 SHA512:
-  metadata.gz: 932faf468a8d87e3856c08a1d63d5df375e88cb3586e289adc633a07d9c2bea262e7b6a85e5405e65dabde4ab8fe9fd66339b37ac22d2031911e822767dc3190
-  data.tar.gz: f0fe0e282f6d3d141bff694107e7d6dc4fb3c945d4e8b7b0452ab5a1b4a54fa2bd795cbe4682a2d74f0a8b2d661e6865a4c6b2201b78d632a94c16ced368728a
+  metadata.gz: 794741cffd5a6ed5dac4018e536b6bf5c63d6e7154f03224f6f40f5215d12833375f059ae8ca3cebf736ed3123c52aa7fc70ae62f16d61ef1ede25f236e672f0
+  data.tar.gz: 39f2e048951ea7201247c747a3b44bf6e9dafd205c95c6d71f867eb36d2cf95da0d56b9cbe8bf1810d5a39e030fb8bfe9200fd4b7b38a0b4116236553ea841b2

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+### 0.3.0
+
+- **BREAKING CHANGE** `class.async` method is removed, use `delay.run` or alias it yourself
+- **BREAKING CHANGE** Job class is no longer is created by default, you need to manually create it yourself
+- added sidekiq support
+- added alias `job` to `active_job` interaction class method

data/README.md

@@ -20,7 +20,10 @@ gem 'active_interaction-active_job'
 ```ruby
 class Add < ActiveInteraction::Base
   include ActiveInteraction::ActiveJob::Core
-  # This creates Add::Job class
+
+  class Job < ActiveJob::Base
+    include ActiveInteraction::ActiveJob::JobHelper
+  end
 
   integer :x, :y
 
@@ -90,6 +93,34 @@ AddOrDivide.async(x: 4, y: 2, divide: true) # same as above
 AddOrDivide.delay(queue_name: 'fast', wait: 1.week).run(x: 4, y: 2, divide: true)
 ```
 
+## Sidekiq without ActiveJob
+
+You can use sidekiq directly if you need more control. Sidekiq integration comes with default GlobalID support.
+
+```ruby
+class BaseInteraction < ActiveInteraction::Base
+  include ActiveInteraction::ActiveJob::Sidekiq::Core
+
+  class Job
+    include Sidekiq::Worker
+    include ActiveInteraction::ActiveJob::Sidekiq::JobHelper
+
+    sidekiq_options queue: 'default'
+  end
+end
+
+class Add < BaseInteraction
+  job do
+    sidekiq_options queue: 'critical'
+  end
+
+  def execute
+  end
+end
+
+Add.delay(wait: 1.minute, queue: 'slow').run
+```
+
 
 ## Development
 

data/lib/active_interaction/active_job.rb

@@ -11,7 +11,14 @@ module ActiveInteraction
 
     autoload :Core
     autoload :ConfiguredJob
-    autoload :DefaultJob
     autoload :JobHelper
+
+    module Sidekiq
+      extend ActiveSupport::Autoload
+
+      autoload :Core
+      autoload :ConfiguredJob
+      autoload :JobHelper
+    end
   end
 end

data/lib/active_interaction/active_job/core.rb

@@ -1,24 +1,17 @@
 module ActiveInteraction::ActiveJob::Core
   extend ActiveSupport::Concern
 
-  included do
-    define_job_class
-  end
-
   module ClassMethods
-    def define_job_class klass = default_job_class
+    def define_job_class klass
       unless const_defined?(:Job, false)
         const_set(:Job, Class.new(klass))
       end
     end
 
-    def default_job_class
-      ActiveInteraction::ActiveJob::DefaultJob
-    end
-
     def active_job &block
       job_class.class_exec(&block)
     end
+    alias_method :job, :active_job
 
     def job_class
       const_get(:Job, false)
@@ -29,14 +22,8 @@ module ActiveInteraction::ActiveJob::Core
       subclass.define_job_class job_class
     end
 
-    def set options = {}
+    def delay options = {}
       ::ActiveInteraction::ActiveJob::ConfiguredJob.new(job_class, options)
     end
-
-    alias_method :delay, :set
-
-    def async *args
-      delay.run! *args
-    end
   end
 end

data/lib/active_interaction/active_job/sidekiq/configured_job.rb

@@ -0,0 +1,21 @@
+class ActiveInteraction::ActiveJob::Sidekiq::ConfiguredJob < ::ActiveJob::ConfiguredJob
+  def perform_now(*args)
+    @job_class.run!(*args)
+  end
+
+  def perform_later(*args)
+    args = ActiveJob::Arguments.serialize(args)
+    scope = @job_class.set(@options.except(:wait, :wait_until))
+
+    if @options[:wait]
+      scope.perform_in @options[:wait], *args
+    elsif @options[:wait_until]
+      scope.perform_at @options[:wait_until], *args
+    else
+      scope.perform_async *args
+    end
+  end
+
+  alias_method :run!, :perform_later
+  alias_method :run, :perform_later
+end

data/lib/active_interaction/active_job/sidekiq/core.rb

@@ -0,0 +1,10 @@
+module ActiveInteraction::ActiveJob::Sidekiq::Core
+  extend ActiveSupport::Concern
+  include ActiveInteraction::ActiveJob::Core
+
+  module ClassMethods
+    def delay options = {}
+      ::ActiveInteraction::ActiveJob::Sidekiq::ConfiguredJob.new(job_class, options)
+    end
+  end
+end

data/lib/active_interaction/active_job/sidekiq/job_helper.rb

@@ -0,0 +1,6 @@
+module ActiveInteraction::ActiveJob::Sidekiq::JobHelper
+  def perform *args
+    args = ActiveJob::Arguments.deserialize(args)
+    self.class.parent.run!(*args)
+  end
+end

data/lib/active_interaction/active_job/version.rb

@@ -1,5 +1,5 @@
 module ActiveInteraction
   module ActiveJob
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction-active_job
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Anton Katunin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -101,6 +102,9 @@ files:
 - lib/active_interaction/active_job/core.rb
 - lib/active_interaction/active_job/default_job.rb
 - lib/active_interaction/active_job/job_helper.rb
+- lib/active_interaction/active_job/sidekiq/configured_job.rb
+- lib/active_interaction/active_job/sidekiq/core.rb
+- lib/active_interaction/active_job/sidekiq/job_helper.rb
 - lib/active_interaction/active_job/version.rb
 homepage: https://github.com/antulik/active_interaction-active_job
 licenses:
@@ -122,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Add ActiveJob support to ActiveInteraction gem