lib/say_when/scheduler.rb in say_when-2.0.1 vs lib/say_when/scheduler.rb in say_when-2.0.2

- old
+ new

@@ -44,35 +44,33 @@ options[:trigger_options] = { at: (Time.now + after)} schedule(options) 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) job[:scheduled] if job.is_a?(Hash) 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) if job.is_a?(Hash) job[:method] || job[:job_method]