lev 7.0.3 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39058e1cbfa410f404d73fa99f6cdb4fd101bdb6
-  data.tar.gz: 7b9f5c3e3366f9915f3c1bb16086c6b5c0c20a41
+  metadata.gz: d9ea57006e876643c43923721b4df56584b6c7a7
+  data.tar.gz: 90fa8d60e6c1a7229d143614b1b74e0470c92458
 SHA512:
-  metadata.gz: 388f7e4f202994665ddcc1881081526859d3e059738e2f60af3ebed416f4e4615a9d75bac3d588fd84780e9f331a60d0f8b2a4c4477b11eb1caebce301177af4
-  data.tar.gz: 756b6ee8991ee1b3e92912c496c1d766be58122b8c9efaefff90edcbab267c610b5453ebe837ab6b46d18130e66d15bcac984d30e760bb5d63e4f2e54b49ff11
+  metadata.gz: 2b7a39b7c78d35f1b62d61a36607fea7fec2fe9d3416e3fd1442322967e0fd932bdbbca65b6ec9cc0e48073b14bdc9e559293559e6fc6e2c6dec29588f047362
+  data.tar.gz: e1938a24304b4d9c3673098aa48e9c0dd13b70839a7e6c72e84b79800da9c68bb64e24fce187f3ce3545ab893c716a98447338117eddc67395ac6b8477ad88d5

data/lib/lev/active_job.rb

@@ -1,21 +1,37 @@
 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)
         queue_as routine_class.active_job_queue
-        args.push(routine_class.to_s)
 
-        # Create a new status object and push its ID on to the arguments so that
-        # in `perform` it can be used to retrieve the status when the routine is
-        # initialized.
+        # 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
+        # up when the activejob adapter runs the job right away (inline mode)
         status.queued!
-        super(*args, &block)
 
+        # 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 = super(*args, &block).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
 

data/lib/lev/null_status.rb

@@ -22,6 +22,9 @@ class Lev::NullStatus
   # within routines; routines should not be using other query methods to check
   # their own status (they should know it), with the exception of `kill_requested?`
 
+  def set_job_name(*); end
+  def set_job_args(*); end
+  def set_provider_job_id(*); end
   def set_progress(*); end
   def save(*); end
   def add_error(*); end

data/lib/lev/version.rb

@@ -1,3 +1,3 @@
 module Lev
-  VERSION = "7.0.3"
+  VERSION = "7.1.0"
 end

data/spec/routine_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Lev::Routine do
 
   before do
-    stub_const 'RaiseError', Class.new
-    RaiseError.class_eval {
+    stub_const 'RaiseRuntimeError', Class.new
+    RaiseRuntimeError.class_eval {
       lev_routine
       def exec
         raise 'error message'
@@ -18,12 +18,20 @@ describe Lev::Routine do
         unknown_method_call
       end
     }
+
+    stub_const 'RaiseArgumentError', Class.new
+    RaiseArgumentError.class_eval {
+      lev_routine
+      def exec
+        raise ArgumentError, 'your argument is invalid', caller
+      end
+    }
   end
 
   it "raised errors should propagate" do
     expect{
       RaiseArgumentError.call
-    }.to raise_error
+    }.to raise_error(ArgumentError)
   end
 
   it "raised StandardErrors should propagate" do
@@ -59,7 +67,7 @@ describe Lev::Routine do
 
     expect {
       SpecialFatalErrorOption.call
-    }.to raise_error
+    }.to raise_error(Lev::FatalError)
 
     expect {
       NoFatalErrorOption.call
@@ -106,7 +114,7 @@ describe Lev::Routine do
     it 'raises an exception on fatal_error if configured' do
       expect {
         RaiseFatalError.call
-      }.to raise_error
+      }.to raise_error(Lev::FatalError)
 
       begin
         RaiseFatalError.call

data/spec/spec_helper.rb

@@ -4,7 +4,8 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-
+require 'bundler'
+Bundler.require('default')
 require 'active_job'
 
 ActiveJob::Base.queue_adapter = :test
@@ -25,6 +26,7 @@ require 'lev'
 require 'byebug'
 
 require 'transaction_retry'
+
 TransactionRetry.apply_activerecord_patch
 
 Dir[(File.expand_path('../support', __FILE__)) + ("/**/*.rb")].each { |f| require f }

data/spec/statused_routines_spec.rb

@@ -4,9 +4,10 @@ class StatusedRoutine
   lev_routine
 
   protected
-  def exec
+
+  def exec(*args)
     status.set_progress(9, 10)
-    status.save({'hi' => 'there'})
+    status.save('hi' => 'there')
     fatal_error(code: 'blah', message: 'hi')
   end
 end
@@ -15,11 +16,23 @@ RSpec.describe 'Statused Routines' do
 
   before { Lev::Jobba.use_jobba }
 
+  let(:routine_class) { StatusedRoutine }
+  let(:args)          { ['some arg'] }
+  let(:status_id)     { routine_class.perform_later(*args) }
+  let(:status)        { Jobba::Status.find(status_id) }
+
   context 'in a routine' do
-    it 'queues the job object on queue' do
-      id = StatusedRoutine.perform_later
-      status = Jobba::Status.find(id)
+    it 'sets the job_name on the status' do
+      expect(status.job_name).to eq routine_class.name
+    end
+
+    it 'sets the provider_job_id on the status' do
+      expect_any_instance_of(Lev::ActiveJob::Base).to receive(:provider_job_id).and_return(42)
+
+      expect(status.provider_job_id).to eq 42
+    end
 
+    it 'sets the status to queued' do
       expect(status).to be_queued
     end
 
@@ -29,12 +42,10 @@ RSpec.describe 'Statused Routines' do
 
       it 'sets job to started when called' do
         expect_any_instance_of(Jobba::Status).to receive(:started!)
-        StatusedRoutine.perform_later
+        routine_class.perform_later
       end
 
       it 'completes the status object on completion, returning other data' do
-        id = StatusedRoutine.perform_later
-        status = Jobba::Status.find(id)
         expect(status).to be_failed
         expect(status.progress).to eq(0.9)
         expect(status.errors).to contain_exactly(

data/spec/transaction_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe 'Transactions' do
     it 'rolls back on exceptions' do
       expect {
         RollBackTransactions.call
-      }.to raise_error
+      }.to raise_error(RuntimeError)
 
       expect(Model.count).to eq(0)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lev
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.1.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Ride the rails but don't touch them.