lev 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23ac8b75438c4dcc055ba30a3df6862646138cb9
-  data.tar.gz: 244bc1d7505e6dd29e84412f241cb1bde0cb82d0
+  metadata.gz: 10396668754e61bf873103c7b939507c6797ada7
+  data.tar.gz: 4c3d23e16f566c7f8f10acc9c2c53f692ddda0b0
 SHA512:
-  metadata.gz: a1a19da74d6ddd287fba67e6f7caf05d52651d1a572b29a9500e835ebc83654d3a1a63102b8a7e775de30429f9810d64bb335c55fb0a275cf9ef107b0451f93d
-  data.tar.gz: 90c37a45bbba09d725ec5ceda5661706d9b579885741309dd6f15b53ea3499fea2df7cb02b536fd17a3ce8484bf93bddf652f2ed6675a94207c91fe68921de79
+  metadata.gz: d44e4de024146fdaae53a3524177d17968836337ba6db82abe53ddcc9a0ec939d89585d902232d410cc123d746a085ac5a144e68aaafb9a53463c405d0279856
+  data.tar.gz: a24eefc3365c7181178b8bd04218335fd2d84f17087a01fd3d825c6b99e6c73e4acfa4c1e70e6cca6842db65fe1310c65608abc3a7a025574ccd5a72a950ba11

data/lib/lev/active_job.rb

@@ -1,49 +1,2 @@
-module Lev
-  module ActiveJob
-    class Base < Lev.configuration.job_class
-      attr_accessor(:provider_job_id) unless respond_to?(:provider_job_id)
-
-      def self.perform_later(routine_class, *args, &block)
-        # Create a new status object
-        status = Lev::create_status
-
-        # Push the routine class name on to the arguments
-        # so that we can run the correct routine in `perform`
-        args.push(routine_class.to_s)
-
-        # Push the status's ID on to the arguments so that in `perform`
-        # it can be used to retrieve the status when the routine is initialized
-        args.push(status.id)
-
-        # Set the job_name
-        status.set_job_name(routine_class.name)
-
-        # In theory we'd mark as queued right after the call to super, but this messes
-        # up when the activejob adapter runs the job right away (inline mode)
-        status.queued!
-
-        # Queue up the job and set the provider_job_id
-        # For delayed_job, requires either Rails 5 or
-        # http://stackoverflow.com/questions/29855768/rails-4-2-get-delayed-job-id-from-active-job
-        provider_job_id = job_or_instantiate(*args, &block)
-                            .enqueue(routine_class.active_job_enqueue_options)
-                            .provider_job_id
-        status.set_provider_job_id(provider_job_id) \
-          if provider_job_id.present? && status.respond_to?(:set_provider_job_id)
-
-        # Return the id of the status object
-        status.id
-      end
-
-      def perform(*args, &block)
-        # Pop arguments added by perform_later
-        id = args.pop
-        routine_class = Kernel.const_get(args.pop)
-
-        routine_instance = routine_class.new(Lev::find_status(id))
-
-        routine_instance.call(*args, &block)
-      end
-    end
-  end
-end
+require 'lev/active_job/base'
+require 'lev/active_job/configured_job'

data/lib/lev/active_job/base.rb

@@ -0,0 +1,49 @@
+module Lev
+  module ActiveJob
+    class Base < Lev.configuration.job_class
+      attr_accessor(:provider_job_id) unless respond_to?(:provider_job_id)
+
+      def perform_later(routine_class, options, *args, &block)
+        # Create a new status object
+        status = Lev::create_status
+
+        # Push the routine class name on to the arguments
+        # so that we can run the correct routine in `perform`
+        args.push(routine_class.to_s)
+
+        # Push the status's ID on to the arguments so that in `perform`
+        # it can be used to retrieve the status when the routine is initialized
+        args.push(status.id)
+
+        # Set the job_name
+        status.set_job_name(routine_class.name)
+
+        # In theory we'd mark as queued right after the call to super, but this messes
+        # up when the activejob adapter runs the job right away (inline mode)
+        status.queued!
+
+        # Queue up the job and set the provider_job_id
+        # For delayed_job, requires either Rails 5 or
+        # http://stackoverflow.com/questions/29855768/rails-4-2-get-delayed-job-id-from-active-job
+        provider_job_id = self.class.send(:job_or_instantiate, *args, &block)
+                                    .enqueue(options)
+                                    .provider_job_id
+        status.set_provider_job_id(provider_job_id) \
+          if provider_job_id.present? && status.respond_to?(:set_provider_job_id)
+
+        # Return the id of the status object
+        status.id
+      end
+
+      def perform(*args, &block)
+        # Pop arguments added by perform_later
+        id = args.pop
+        routine_class = Kernel.const_get(args.pop)
+
+        routine_instance = routine_class.new(Lev::find_status(id))
+
+        routine_instance.call(*args, &block)
+      end
+    end
+  end
+end

data/lib/lev/active_job/configured_job.rb

@@ -0,0 +1,20 @@
+module Lev
+  module ActiveJob
+    class ConfiguredJob
+      attr_reader :routine_class
+
+      def initialize(routine_class, options)
+        @routine_class = routine_class
+        @options = options
+      end
+
+      def options
+        routine_class.active_job_enqueue_options.merge(@options)
+      end
+
+      def perform_later(*args, &block)
+        Lev::ActiveJob::Base.new.perform_later(routine_class, options, *args, &block)
+      end
+    end
+  end
+end

data/lib/lev/routine.rb

@@ -208,9 +208,13 @@ module Lev
         result.outputs.send(@express_output)
       end
 
+      def set(options)
+        Lev::ActiveJob::ConfiguredJob.new(self, options)
+      end
+
       def perform_later(*args, &block)
         # Delegate to a subclass of Lev::Routine::ActiveJob::Base
-        Lev::ActiveJob::Base.perform_later(self, *args, &block)
+        Lev::ActiveJob::Base.new.perform_later(self, active_job_enqueue_options, *args, &block)
       end
 
       def active_job_enqueue_options

data/lib/lev/version.rb

@@ -1,3 +1,3 @@
 module Lev
-  VERSION = "8.0.0"
+  VERSION = "8.1.0"
 end

data/spec/active_job_routines_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'ActiveJob routines' do
       }.to change { ActiveJob::Base.queue_adapter.enqueued_jobs.count }.by(1)
     end
 
-    it 'can have the default queue overridden' do
+    it 'can have the default queue name overridden in the class definition' do
       ActiveJob::Base.queue_adapter.enqueued_jobs.clear
 
       LaterRoutine.perform_later
@@ -27,6 +27,16 @@ RSpec.describe 'ActiveJob routines' do
 
       expect(queue_name).to eq('something_else')
     end
+
+    it 'can have the default queue name overridden using the set method' do
+      ActiveJob::Base.queue_adapter.enqueued_jobs.clear
+
+      LaterRoutine.set(queue: 'whoa').perform_later
+
+      queue_name = ActiveJob::Base.queue_adapter.enqueued_jobs.first[:queue]
+
+      expect(queue_name).to eq('whoa')
+    end
   end
 
   context 'exception raised' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lev
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -232,6 +232,8 @@ files:
 - Rakefile
 - lib/lev.rb
 - lib/lev/active_job.rb
+- lib/lev/active_job/base.rb
+- lib/lev/active_job/configured_job.rb
 - lib/lev/better_active_model_errors.rb
 - lib/lev/delegate_to_routine.rb
 - lib/lev/error.rb
@@ -297,23 +299,23 @@ signing_key:
 specification_version: 4
 summary: Ride the rails but don't touch them.
 test_files:
-- spec/active_job_routines_spec.rb
-- spec/create_sprocket_spec.rb
-- spec/deep_merge_spec.rb
-- spec/delegates_to_spec.rb
-- spec/outputs_spec.rb
-- spec/paramify_handler_spec.rb
-- spec/routine_spec.rb
 - spec/spec_helper.rb
+- spec/paramify_handler_spec.rb
 - spec/sprocket_handler_spec.rb
-- spec/sprocket_spec.rb
-- spec/statused_routines_spec.rb
-- spec/support/create_sprocket.rb
-- spec/support/delegated_routine.rb
-- spec/support/delegating_routine.rb
+- spec/create_sprocket_spec.rb
+- spec/delegates_to_spec.rb
+- spec/transaction_spec.rb
+- spec/deep_merge_spec.rb
+- spec/support/paramify_handler_b.rb
+- spec/support/sprocket_handler.rb
 - spec/support/jobba.rb
 - spec/support/paramify_handler_a.rb
-- spec/support/paramify_handler_b.rb
+- spec/support/delegating_routine.rb
+- spec/support/create_sprocket.rb
+- spec/support/delegated_routine.rb
 - spec/support/sprocket.rb
-- spec/support/sprocket_handler.rb
-- spec/transaction_spec.rb
+- spec/sprocket_spec.rb
+- spec/outputs_spec.rb
+- spec/routine_spec.rb
+- spec/active_job_routines_spec.rb
+- spec/statused_routines_spec.rb