lev 8.1.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10396668754e61bf873103c7b939507c6797ada7
-  data.tar.gz: 4c3d23e16f566c7f8f10acc9c2c53f692ddda0b0
+  metadata.gz: 282065bb04397e2bd972a0fed407f6a459f99457
+  data.tar.gz: a3f906162864f35c4795c2dac565db236755f454
 SHA512:
-  metadata.gz: d44e4de024146fdaae53a3524177d17968836337ba6db82abe53ddcc9a0ec939d89585d902232d410cc123d746a085ac5a144e68aaafb9a53463c405d0279856
-  data.tar.gz: a24eefc3365c7181178b8bd04218335fd2d84f17087a01fd3d825c6b99e6c73e4acfa4c1e70e6cca6842db65fe1310c65608abc3a7a025574ccd5a72a950ba11
+  metadata.gz: 406b49f5cfc26b5b7af0a17415ecaa51ddea921496608571879292ea537b316d82c81225cfc8c9253cf22515b0a53e99674b73aee4116cf16001b91dad471e90
+  data.tar.gz: 9f95deafac942d65ae90b9c7ed6e543b42fb5a8749ee3a7760e49998f3881e4e8de1487aae9dd93703c26e8f36f2777b565bfe7c5efa9f38570e06b049751925

data/README.md

@@ -449,9 +449,11 @@ Routine status objects also have query methods to check if a status is in a give
 For plain vanilla routines not run as an active job, the status calls are no-ops.  When a routine is invoked with `perform_later`, the status object is created/found using two configuration options that must be set (if you care about the status):
 
 ```ruby
-Lev.configure do |config|
-  config.create_status_proc = ->(*) { Jobba::Status.create! }
-  config.find_status_proc = ->(id) { Jobba::Status.find!(id) }
+class SomeRoutine
+  lev_routine use_jobba: true
+  # This is the same as:
+  # self.create_status_proc = ->(*) { Jobba::Status.create! }
+  # self.find_status_proc = ->(id) { Jobba::Status.find!(id) }
 end
 ```
 

data/lib/lev.rb

@@ -31,14 +31,6 @@ require 'lev/null_status'
 module Lev
   class << self
 
-    def create_status
-      configuration.create_status_proc.call
-    end
-
-    def find_status(id)
-      configuration.find_status_proc.call(id)
-    end
-
     ###########################################################################
     #
     # Configuration machinery.
@@ -71,8 +63,6 @@ module Lev
       attr_accessor :security_transgression_error
       attr_accessor :illegal_argument_error
       attr_accessor :raise_fatal_errors
-      attr_accessor :create_status_proc
-      attr_accessor :find_status_proc
       attr_accessor :job_class
 
       def initialize
@@ -80,8 +70,6 @@ module Lev
         @security_transgression_error = Lev::SecurityTransgression
         @illegal_argument_error = Lev::IllegalArgument
         @raise_fatal_errors = false
-        @create_status_proc = ->(*) { NullStatus.new }
-        @find_status_proc = ->(*) { NullStatus.new }
         @job_class = ::ActiveJob::Base
         super
       end
@@ -89,3 +77,5 @@ module Lev
 
   end
 end
+
+require "lev/active_job"

data/lib/lev/active_job/base.rb

@@ -5,7 +5,7 @@ module Lev
 
       def perform_later(routine_class, options, *args, &block)
         # Create a new status object
-        status = Lev::create_status
+        status = routine_class.create_status
 
         # Push the routine class name on to the arguments
         # so that we can run the correct routine in `perform`
@@ -40,7 +40,7 @@ module Lev
         id = args.pop
         routine_class = Kernel.const_get(args.pop)
 
-        routine_instance = routine_class.new(Lev::find_status(id))
+        routine_instance = routine_class.new(routine_class.find_status(id))
 
         routine_instance.call(*args, &block)
       end

data/lib/lev/object.rb

@@ -25,6 +25,11 @@ class Object
 
       # Set this after dealing with "delegates_to" in case it set a value
       @express_output ||= options[:express_output] || self.name.demodulize.underscore
+
+      if options[:use_jobba]
+        self.create_status_proc = ->(*) { Jobba::Status.create! }
+        self.find_status_proc = ->(id) { Jobba::Status.find!(id) }
+      end
     end
   end
 

data/lib/lev/routine.rb

@@ -182,8 +182,7 @@ module Lev
   module Routine
 
     class Result
-      attr_reader :outputs
-      attr_reader :errors
+      attr_reader :outputs, :errors
 
       def initialize(outputs, errors)
         @outputs = outputs
@@ -195,6 +194,9 @@ module Lev
 
     def self.included(base)
       base.extend(ClassMethods)
+      base.class_attribute :create_status_proc, :find_status_proc
+      base.create_status_proc = ->(*) { NullStatus.new }
+      base.find_status_proc = ->(*) { NullStatus.new }
     end
 
     module ClassMethods
@@ -262,6 +264,14 @@ module Lev
       def class_to_symbol(klass)
         klass.name.underscore.gsub('/','_').to_sym
       end
+
+      def create_status
+        create_status_proc.call
+      end
+
+      def find_status(id)
+        find_status_proc.call(id)
+      end
     end
 
     attr_reader :runner

data/lib/lev/version.rb

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

data/spec/active_job_routines_spec.rb

@@ -2,11 +2,9 @@ require 'spec_helper'
 
 RSpec.describe 'ActiveJob routines' do
 
-  before { Lev::Jobba.use_jobba }
-
   context 'default configuration' do
     class LaterRoutine
-      lev_routine active_job_enqueue_options: { queue: :something_else }
+      lev_routine active_job_enqueue_options: { queue: :something_else }, use_jobba: true
 
       protected
       def exec; end
@@ -44,7 +42,7 @@ RSpec.describe 'ActiveJob routines' do
     after { ::ActiveJob::Base.queue_adapter = :test }
 
     class ExceptionalRoutine
-      lev_routine
+      lev_routine use_jobba: true
 
       protected
       def exec

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@
 require 'bundler'
 Bundler.require('default')
 require 'active_job'
+require 'jobba'
 
 ActiveJob::Base.queue_adapter = :test
 ActiveJob::Base.logger = ::Logger.new(nil)

data/spec/statused_routines_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class StatusedRoutine
-  lev_routine
+  lev_routine use_jobba: true
 
   protected
 
@@ -14,8 +14,6 @@ end
 
 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) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lev
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 9.0.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -268,7 +268,6 @@ files:
 - spec/support/create_sprocket.rb
 - spec/support/delegated_routine.rb
 - spec/support/delegating_routine.rb
-- spec/support/jobba.rb
 - spec/support/paramify_handler_a.rb
 - spec/support/paramify_handler_b.rb
 - spec/support/sprocket.rb
@@ -308,7 +307,6 @@ test_files:
 - 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/delegating_routine.rb
 - spec/support/create_sprocket.rb

data/spec/support/jobba.rb

@@ -1,13 +0,0 @@
-require 'jobba'
-
-module Lev::Jobba
-
-  def self.use_jobba
-    Lev.configure do |config|
-      config.create_status_proc = ->(*) { Jobba::Status.create! }
-      config.find_status_proc = ->(id) { Jobba::Status.find!(id) }
-    end
-    true
-  end
-
-end