active_scheduler 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9445ea94c943115cbf2f6f9d4b1a02e97bd69d9d
-  data.tar.gz: bfb4eb364fcb2f50d43adb610d41c3f1f26cdcd7
+  metadata.gz: bce92faeee0147e77ab595311f6a310cb46faf2b
+  data.tar.gz: d50fadc1849b52f24202674d7fb817d8cb050113
 SHA512:
-  metadata.gz: 0ccde6b34bbdbc63627724aaf06c0ab312fa9e41156e0ee9a0bfd01191c87bc680e9af6178a5aa202eac2ad4a7fc3d5765a69f180ec0ca48b47520ff8f9f05b1
-  data.tar.gz: 4245e0cb345d9d9358c187a062292a9bae0325457f2347fc43b54749381f9e4b49716f75cb1e8e098e32b1b8dfcbda28de8d8df7beef9c5518230a536bd7c7a1
+  metadata.gz: 1d92c872b659df7ce609086c80fcc5bf144684dabe446a4f102441cfed86d554046ccc13650754e4c4fec85f54f8d85a4120bcc98f0beee326245483fb7c518b
+  data.tar.gz: c31433a27c31878b0cab832589db762c57fb87524a174577bac399229e6190b0a5e4be506de21ee9bdfc042ee67284a797ece694bcc53847430206e7f529c1f9

data/.gitignore

@@ -22,3 +22,4 @@
 .DS_Store
 /.rvmrc
 /.yardoc
+.idea/

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 0.6.0
+
+- Add `persist` option [#15](https://github.com/JustinAiken/active_scheduler/pull/15) (Thanks @SpiffyStores)
+- Remove hardcoded class references [#16](https://github.com/JustinAiken/active_scheduler/pull/16) (Thanks @kensentor)
+
 # 0.5.0
 - Expand Travis matrix to include Rails 5 and more ruby versions
 - Allow `rails_env` option since [resque-scheduler](https://github.com/resque/resque-scheduler) does [#10](https://github.com/JustinAiken/active_scheduler/pull/10) (Thanks @blahutka)

data/README.markdown

@@ -86,6 +86,8 @@ simple_job:
   - [@jdguzman](https://github.com/jdguzman)
   - [@r3trofitted](https://github.com/r3trofitted)
   - [@blahutka](https://github.com/blahutka)
+  - [@SpiffyStores](https://github.com/SpiffyStores)
+  - [@kensentor](https://github.com/kensentor)
 
 ## License
 

data/lib/active_scheduler/resque_wrapper.rb

@@ -23,8 +23,8 @@ module ActiveScheduler
 
       schedule.each do |job, opts|
         class_name = opts[:class] || job
-        next if class_name =~ /ActiveScheduler::ResqueWrapper/
-        
+        next if class_name =~ /#{self.to_s}/
+
         klass = class_name.constantize
         next unless klass <= ActiveJob::Base
 
@@ -40,13 +40,13 @@ module ActiveScheduler
         end
 
         schedule[job] = {
-          class:        'ActiveScheduler::ResqueWrapper',
+          class:        self.to_s,
           queue:        queue,
           args: [{
-            job_class:  class_name,
-            queue_name: queue,
-            arguments:  args,
-          }]
+                   job_class:  class_name,
+                   queue_name: queue,
+                   arguments:  args,
+                 }]
         }
 
         schedule[job][:args].first.merge!({ named_args: named_args }) if named_args
@@ -55,6 +55,7 @@ module ActiveScheduler
         schedule[job][:every]       = opts.fetch(:every, nil)       if opts.fetch(:every, nil)
         schedule[job][:cron]        = opts.fetch(:cron, nil)        if opts.fetch(:cron, nil)
         schedule[job][:rails_env]   = opts.fetch(:rails_env, nil)   if opts.fetch(:rails_env, nil)
+        schedule[job][:persist]     = true                          if opts.fetch(:persist, nil)
       end
     end
   end

data/lib/active_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ActiveScheduler
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/active_scheduler/resque_wrapper_spec.rb

@@ -37,6 +37,29 @@ describe ActiveScheduler::ResqueWrapper do
           )
         end
       end
+
+      context 'with a custom wrapper class' do
+        class CustomWrapper < ActiveScheduler::ResqueWrapper
+        end
+
+        let(:schedule) { YAML.load_file 'spec/fixtures/simple_job.yaml' }
+
+        it "queues up a simple job" do
+          stub_jobs("SimpleJob")
+          expect(CustomWrapper.wrap(schedule)['simple_job']).to eq(
+            "class"       => "CustomWrapper",
+            "queue"       => "simple",
+            "description" => "It's a simple job.",
+            "every"       => "30s",
+            "rails_env"   => "test",
+            "args"        => [{
+               "job_class"  => "SimpleJob",
+               "queue_name" => "simple",
+               "arguments"  => ['foo-arg-1', 'foo-arg-2'],
+              }]
+           )
+        end
+      end
     end
 
     context "with a simple job json" do
@@ -58,6 +81,27 @@ describe ActiveScheduler::ResqueWrapper do
       end
     end
 
+    context "with a persist key" do
+      let(:schedule) { YAML.load_file 'spec/fixtures/persist_job.yaml' }
+
+      it "queues up a simple job" do
+        stub_jobs("SimpleJob")
+        expect(wrapped['persist_job']).to eq(
+          "class"       => "ActiveScheduler::ResqueWrapper",
+          "queue"       => "simple",
+          "description" => "It's a simple job. That persists.",
+          "every"       => "30s",
+          "rails_env"   => "test",
+          "persist"     => true,
+          "args"        => [{
+            "job_class"  => "SimpleJob",
+            "queue_name" => "simple",
+            "arguments"  => ['foo-arg-1', 'foo-arg-2'],
+          }]
+        )
+      end
+    end
+
     context "with a multiple jobs in the schedule" do
       let(:schedule) { YAML.load_file 'spec/fixtures/two_jobs.yaml' }
 
@@ -85,9 +129,9 @@ describe ActiveScheduler::ResqueWrapper do
         simple_job = Class.new(ActiveJob::Base) do
           queue_as :myscheduledjobqueue
         end
-        
+
         stub_const("SimpleJob", simple_job)
-        
+
         expect(wrapped['no_queue_job']['queue']).to eq 'myscheduledjobqueue'
       end
     end

data/spec/fixtures/persist_job.yaml

@@ -0,0 +1,10 @@
+persist_job:
+  every: "30s"
+  queue: "simple"
+  class: "SimpleJob"
+  rails_env: "test"
+  args:
+    - foo-arg-1
+    - foo-arg-2
+  description: "It's a simple job. That persists."
+  persist: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Justin Aiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,6 +90,7 @@ files:
 - spec/fixtures/cron_job.yaml
 - spec/fixtures/named_args_job.yaml
 - spec/fixtures/no_queue.yaml
+- spec/fixtures/persist_job.yaml
 - spec/fixtures/schedule_name_is_class_name.yaml
 - spec/fixtures/simple_job.json
 - spec/fixtures/simple_job.yaml
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: active_scheduler
-rubygems_version: 2.6.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Scheduling for ActiveJob