active_scheduler 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2c062dfa8434dc5822c02c0a44aac00ea427afc
-  data.tar.gz: 2c2667862c1528c8c2fd2d9a8ed4e7dd12834c66
+  metadata.gz: 26ba70054e1bb771404a32c12fb267d203af40ff
+  data.tar.gz: 8ae34c71ac6b98180726bac6c709d302d6fec381
 SHA512:
-  metadata.gz: 9b0bbfebcedf077487966652616de23b0b6b144ec831a8f7870b82343508dd2777f88e5da43be245847f83c780fe4a91eebe60ea6dd3ce9fad1b35fd301a3bbc
-  data.tar.gz: 79f0c8ebf0777cd5d41284989969d8d5ed8efe3d1241f40ae4bfc7b3d372992f4e2bbc9db0c604e5cb4ec885b45f73b9a23baf602ad026d63c8187042372bf1b
+  metadata.gz: 4ce49add1fbfd7c9f7855a9743c427f52c425bcb90ecf8937aefb1c92231d474f7acbfa5fc4e53f60fa9eb2a2c696033d1267f964ca4a0605ce2a4ab7053a6d3
+  data.tar.gz: 5c8b69658933b8c32f07d784ce01c95534c4b680c30c6a319015f257cc50e94d25d5f110970f3a40e52a7addb51b6c0989ef31844eaafa02c461bea5c0bcf1b9

data/CHANGELOG.markdown

@@ -0,0 +1,5 @@
+# 0.1.0
+
+- Only wrap jobs that are descendants of `ActiveJob::Base` [#3](https://github.com/JustinAiken/active_scheduler/pull/3)
+
+# 0.0.3

data/README.markdown

@@ -55,6 +55,8 @@ ThisIsTheClass:
   description: "Will call the ThisIsTheClass class"
 ```
 
+Only classes that are descended from `ActiveJob::Base` will be wrapped
+
 ## Credits
 
 - Written by [@JustinAiken](https://www.github.com/JustinAiken)

data/lib/active_scheduler/resque_wrapper.rb

@@ -15,7 +15,9 @@ module ActiveScheduler
       schedule = HashWithIndifferentAccess.new(schedule)
 
       schedule.each do |job, opts|
-        next if opts[:class] =~ /ActiveScheduler::ResqueWrapper/
+        class_name = opts[:class] || job
+        next if class_name =~ /ActiveScheduler::ResqueWrapper/
+        next unless class_name.constantize <= ActiveJob::Base
 
         queue = opts[:queue] || 'default'
 
@@ -23,7 +25,7 @@ module ActiveScheduler
           class:        'ActiveScheduler::ResqueWrapper',
           queue:        queue,
           args: [{
-            job_class:  opts[:class] || job,
+            job_class:  class_name,
             queue_name: queue,
             arguments:  opts[:arguments]
           }]

data/lib/active_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ActiveScheduler
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/active_scheduler/resque_wrapper_spec.rb

@@ -9,6 +9,7 @@ describe ActiveScheduler::ResqueWrapper do
       let(:schedule) { YAML.load_file 'spec/fixtures/simple_job.yaml' }
 
       it "queues up a simple job" do
+        stub_jobs("SimpleJob")
         expect(wrapped['simple_job']).to eq(
           "class"       => "ActiveScheduler::ResqueWrapper",
           "queue"       => "simple",
@@ -21,12 +22,26 @@ describe ActiveScheduler::ResqueWrapper do
           }]
         )
       end
+
+      context "job is not an active job descendant" do
+        it "doesn't wrap" do
+          stub_const("SimpleJob", Class.new)
+          expect(wrapped['simple_job']).to eq(
+            "class"       => "SimpleJob",
+            "queue"       => "simple",
+            "description" => "It's a simple job.",
+            "every"       => "30s",
+            "args"        => [nil],
+          )
+        end
+      end
     end
 
     context "with a simple job json" do
       let(:schedule) { YAML.load_file 'spec/fixtures/simple_job.json' }
 
       it "queues up a simple job" do
+        stub_jobs("SimpleJob")
         expect(wrapped['simple_job']).to eq(
           "class"       => "ActiveScheduler::ResqueWrapper",
           "queue"       => "simple",
@@ -45,6 +60,7 @@ describe ActiveScheduler::ResqueWrapper do
       let(:schedule) { YAML.load_file 'spec/fixtures/two_jobs.yaml' }
 
       it "queues them all up simple job" do
+        stub_jobs("JobOne", "JobTwo")
         expect(wrapped['job_1']['args'][0]['job_class']).to eq 'JobOne'
         expect(wrapped['job_2']['args'][0]['job_class']).to eq 'JobTwo'
       end
@@ -54,6 +70,7 @@ describe ActiveScheduler::ResqueWrapper do
       let(:schedule) { YAML.load_file 'spec/fixtures/cron_job.yaml' }
 
       it "uses that instead" do
+        stub_jobs("CronJob")
         expect(wrapped['cron_job']['cron']).to eq '* * * *'
         expect(wrapped['cron_job']['every']).to be_nil
       end
@@ -63,6 +80,7 @@ describe ActiveScheduler::ResqueWrapper do
       let(:schedule) { YAML.load_file 'spec/fixtures/no_queue.yaml' }
 
       it "uses 'default'" do
+        stub_jobs("SimpleJob")
         expect(wrapped['no_queue_job']['queue']).to eq 'default'
       end
     end
@@ -71,6 +89,7 @@ describe ActiveScheduler::ResqueWrapper do
       let(:schedule) { YAML.load_file 'spec/fixtures/schedule_name_is_class_name.yaml' }
 
       it "queues up a job, using the schedule name for the class name" do
+        stub_jobs("MyScheduleNameIsClassNameJob")
         expect(wrapped['MyScheduleNameIsClassNameJob']).to eq(
           "class"       => "ActiveScheduler::ResqueWrapper",
           "queue"       => "myscheduledjobqueue",
@@ -83,7 +102,6 @@ describe ActiveScheduler::ResqueWrapper do
           }]
         )
       end
-
     end
   end
 

data/spec/spec_helper.rb

@@ -5,7 +5,16 @@ unless ENV["NO_COVERALLS"]
   Coveralls.wear!
 end
 
+module Helpers
+  def stub_jobs(*names)
+    names.each do |name|
+      stub_const(name, Class.new(ActiveJob::Base))
+    end
+  end
+end
+
 RSpec.configure do |config|
+  config.include Helpers
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Justin Aiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -90,6 +90,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.markdown
 - Gemfile
 - Guardfile
 - LICENSE
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: active_scheduler
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Scheduling for ActiveJob