say_when 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4aba1da4815544d6733948a2ee328978dbb8418
-  data.tar.gz: 3f204ffeb70c5890d190630f1a048c60eba9e20f
+  metadata.gz: 659f1d92ff0ba2e4ca3c162ab36255868cfa4f1e
+  data.tar.gz: fd29bc29fbf787899ce18dcf91b165a684c205cc
 SHA512:
-  metadata.gz: 630492044fb4b69bd19c94a018abb93f180d9147f09810339dcc54f08e08ceabbe2b3fe651b8c016af6912c8f50a0ce7eab8fdb3fa0d4d7e90790404c0005721
-  data.tar.gz: 5f89922b266b75449e5bcc88c804e61672b19a7c730b837a1ba973a24efc3df75463105051e9f575116b90899a0b57a6fbb5b2a6b7839d2c22b907e0971c3064
+  metadata.gz: 1a7c57379229dc78237034625d3cbbb75089c35aef118976b0b2252e7d58a8a214c98f7018aa5584c868c8d74d34dbe46c9003c725d7a34502a67d2668d3e5f2
+  data.tar.gz: c31787d123c46fd1892291ed1d5f96d2859f8c76d7e7f18588d440c98b5fc55425243390348c7a614386177cefd43efe92658f163f6daf646856a63e35258cdc

data/lib/say_when/scheduler.rb

@@ -46,12 +46,16 @@ module SayWhen
     end
 
     def job_options(job)
-      {
+      opts = {
         scheduled: extract_scheduled(job),
         job_class: extract_job_class(job),
         job_method: extract_job_method(job),
         data: extract_data(job)
       }
+      unless opts[:scheduled] || opts[:job_class]
+        raise "No job class or scheduled option: #{job.inspect}\nopts: #{opts.inspect}"
+      end
+      opts
     end
 
     def extract_scheduled(job)
@@ -59,19 +63,13 @@ module SayWhen
     end
 
     def extract_job_class(job)
-      job_class = if job.is_a?(Hash)
+      if job.is_a?(Hash)
         job[:class] || job[:job_class]
       elsif job.is_a?(Class)
         job.name
       elsif job.is_a?(String)
         job
       end
-
-      if !job_class
-        raise "Could not identify job class from: #{job}"
-      end
-
-      job_class
     end
 
     def extract_job_method(job)

data/lib/say_when/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module SayWhen
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/test/say_when/scheduler_test.rb

@@ -26,16 +26,16 @@ describe SayWhen::Scheduler do
     scheduler.extract_job_class(class: 'foo').must_equal 'foo'
     scheduler.extract_job_class(SayWhen::Test::TestTask).must_equal 'SayWhen::Test::TestTask'
     scheduler.extract_job_class('SayWhen::Test::TestTask').must_equal 'SayWhen::Test::TestTask'
-
-    lambda do
-      scheduler.extract_job_class(bar: 'foo')
-    end.must_raise RuntimeError
   end
 
   it 'gets job options' do
     keys = [:job_class, :job_method, :data]
     opts = scheduler.job_options(keys.inject({}) { |s, k| s[k] = k.to_s; s } )
     keys.each{|k| opts[k].must_equal k.to_s }
+
+    lambda do
+      scheduler.job_options(bar: 'foo')
+    end.must_raise RuntimeError
   end
 
   it 'can schedule a new job' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: say_when
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Andrew Kuklewicz