active_scheduler 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c723aa094616a7530ea528c8910f5abfe695d91b
-  data.tar.gz: a8286d5ebc009739893d72912fc3534158161dbe
+  metadata.gz: 5947ed39877bdeb1e41be0dc069f91cbd42a3d0b
+  data.tar.gz: 738b6e3d63ed6ecb05359ca01491fd0b0785c9e9
 SHA512:
-  metadata.gz: 42cc510cc65ff67895469f65ee436024faeaf4b064bf2e18e2264219ba89b55603c6f0f489008838db3e8c6bf107dcbc771d986d0e1599ab4e19b41e751ba4d3
-  data.tar.gz: 71cba03ce129f5a22a5b948f71a3cc3428d0a09939c0df418c77ce364e43d3251a6f2aae43c3639c1c9a0c38425e6d44ce0e0e7d89c58cbc9d0e46a93b73ba2f
+  metadata.gz: 78e7c5564036a7b8517a801bcf693bb843dbc2304836e2065d20cd8b3a6b992d0b9cac1a665d18a235eee1cd615884726b54d7d7ba103e2c27951213a1c39aae
+  data.tar.gz: b7016a965d05c43aab4f044a23b9ca6369618f45385dde78f8ac83785fd7c64e9e1a90ce822a354b5fc3e3a0dab72eef2988cdf2473bd1d6400d48069705503f

data/.travis.yml

@@ -1,13 +1,16 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.1.5
   - 2.2.0
-matrix:
-  allow_failures:
-    - rvm: 1.9.3
+  - 2.2.1
+  - 2.2.2
+  - 2.2.3
+  - 2.2.4
+  - 2.2.5
+  - 2.3.0
+  - 2.3.1
 env:
   - "RAILS_VERSION=4.2.0"
 notifications:

data/CHANGELOG.markdown

@@ -1,9 +1,17 @@
+# 0.3.0
+
+- :boom: active_support dependency
+- Updated testing matrix for more rubies 💎💎💎
+- Support named args [#6](https://github.com/JustinAiken/active_scheduler/pull/6) (Thanks @jdguzman)
+
 # 0.2.0
 
-- Deprecate `arguments` in favor of `args` [#5](https://github.com/JustinAiken/active_scheduler/pull/5)
+- Deprecate `arguments` in favor of `args` [#5](https://github.com/JustinAiken/active_scheduler/pull/5) (Thanks @ximus)
 
 # 0.1.0
 
-- Only wrap jobs that are descendants of `ActiveJob::Base` [#3](https://github.com/JustinAiken/active_scheduler/pull/3)
+- Only wrap jobs that are descendants of `ActiveJob::Base` [#3](https://github.com/JustinAiken/active_scheduler/pull/3) (Thanks @ximus)
 
 # 0.0.3
+
+- Use schedule name as class name if unspecified [#1](https://github.com/JustinAiken/active_scheduler/pull/1) (Thanks @jeremycrosbie)

data/Gemfile

@@ -4,6 +4,10 @@ rails_version = ENV['RAILS_VERSION'] || '4.2.0'
 rails         = "~> #{rails_version}"
 
 gem "activejob",     rails
-gem "activesupport", rails
+
+gem "guard-rspec", '~> 4.2' unless ENV['CI']
+
+# Randomly grabbed 'tins' version doesn't like ancient rubies
+gem "tins", '~> 1.6.0' if RUBY_VERSION == '1.9.3'
 
 gemspec

data/README.markdown

@@ -8,9 +8,9 @@ Currently only Resque is supported, but pull requests to add other queues (sidek
 
 ## Requirements/Support
 
+- Ruby 2.0+
 - Rails
   - ActiveJob 4.2+
-  - ActiveSupport 4.2+
 - Resque
 - Resque Scheduler
 
@@ -57,11 +57,32 @@ ThisIsTheClass:
 
 Only classes that are descended from `ActiveJob::Base` will be wrapped
 
+### Job Classes With Named Args
+
+If you have a job class that uses named arguments you can specify that. `args`
+should be a hash nested in the array and you need to add the named_args key.
+
+```yaml
+simple_job:
+  every: "30s"
+  queue: "simple"
+  class: "SimpleJob"
+  args:
+    - foo: 1
+      bar: 2
+  description: "It's a simple job."
+  named_args: true
+```
+
 ## Credits
 
 - Written by [@JustinAiken](https://www.github.com/JustinAiken)
 - Wrapper class idea by [@ryanwjackson](https://www.github.com/ryanwjackson)
-- Special thanks to [Rocketmade](http://www.rocketmade.com/) for development resources.
+- Special thanks to [Rocketmade](https://www.rocketmade.com/) for development resources.
+- Other Contributors:
+  - @jeremycrosbie
+  - @ximus
+  - @jdguzman
 
 ## License
 

data/active_scheduler.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "active_scheduler"
   s.version     = ActiveScheduler::VERSION
   s.authors     = ["Justin Aiken"]
-  s.email       = ["jaiken@rocketmade.com"]
+  s.email       = ["60tonangel@gmail.com"]
   s.license     = 'MIT'
   s.homepage    = "https://github.com/JustinAiken/active_scheduler"
   s.summary     = %q{Scheduling for ActiveJob}
@@ -18,10 +18,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency             'activejob',     '>= 4.2.0'
-  s.add_dependency             'activesupport', '>= 4.2.0'
-
-  s.add_development_dependency 'rspec-rails',   '~> 3.1'
-  s.add_development_dependency 'guard-rspec',   '~> 4.2'
+  s.add_dependency             'rake'
+  s.add_dependency             'activejob', '>= 4.2.0'
+  s.add_development_dependency 'rspec',     '~> 3.5'
   s.add_development_dependency 'coveralls'
 end

data/lib/active_scheduler.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'active_job'
 require 'active_scheduler/version'
 require 'active_scheduler/resque_wrapper'

data/lib/active_scheduler/resque_wrapper.rb

@@ -3,9 +3,16 @@ module ActiveScheduler
 
     def self.perform(job_data)
       klass = Object.const_get job_data['job_class']
+      named_args = job_data.delete('named_args') || false
 
       if job_data.has_key? 'arguments'
-        klass.perform_later *job_data['arguments']
+        if named_args
+          args = job_data['arguments'].first.symbolize_keys
+        else
+          args = job_data['arguments']
+        end
+
+        named_args ? klass.perform_later(**args) : klass.perform_later(*args)
       else
         klass.perform_later
       end
@@ -21,6 +28,7 @@ module ActiveScheduler
 
         queue = opts[:queue] || 'default'
         args = opts[:args]
+        named_args = opts[:named_args] || false
 
         if !args && opts.has_key?(:arguments)
           warn 'active_scheduler: [DEPRECATION] using the `arguments` key in ' \
@@ -35,10 +43,12 @@ module ActiveScheduler
           args: [{
             job_class:  class_name,
             queue_name: queue,
-            arguments:  args
+            arguments:  args,
           }]
         }
 
+        schedule[job][:args].first.merge!({ named_args: named_args }) if named_args
+
         schedule[job][:description] = opts.fetch(:description, nil) if opts.fetch(:description, nil)
         schedule[job][:every]       = opts.fetch(:every, nil)       if opts.fetch(:every, nil)
         schedule[job][:cron]        = opts.fetch(:cron, nil)        if opts.fetch(:cron, nil)

data/lib/active_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ActiveScheduler
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/active_scheduler/resque_wrapper_spec.rb

@@ -103,6 +103,26 @@ describe ActiveScheduler::ResqueWrapper do
         )
       end
     end
+
+    context "when the schedule is for a job with named arguments" do
+      let(:schedule) { YAML.load_file 'spec/fixtures/named_args_job.yaml' }
+
+      it "queues up a job, specifing that there are named args in the job" do
+        stub_jobs("NamedArgsJob")
+        expect(wrapped['named_args_job']).to eq(
+          "class"       => "ActiveScheduler::ResqueWrapper",
+          "queue"       => "simple",
+          "description" => "It's a named args job.",
+          "every"       => "30s",
+          "args"        => [{
+            "job_class"  => "NamedArgsJob",
+            "queue_name" => "simple",
+            "arguments"  => [{'foo' => 1, 'bar' => 2}],
+            "named_args" => true
+          }]
+        )
+      end
+    end
   end
 
   describe ".perform" do
@@ -124,5 +144,19 @@ describe ActiveScheduler::ResqueWrapper do
         expect(TestKlass).to receive(:perform_later).with 1, 2
       end
     end
+
+    context "with named_arguments specified" do
+      let(:job_data) do
+        {
+          'job_class' => 'TestKlass',
+          'arguments' => [{ 'foo' => 1, 'bar' => 2 }],
+          'named_args' => true
+        }
+      end
+
+      it "passed the arguments as Named args" do
+        expect(TestKlass).to receive(:perform_later).with(foo: 1, bar: 2)
+      end
+    end
   end
 end

data/spec/fixtures/named_args_job.yaml

@@ -0,0 +1,9 @@
+named_args_job:
+  every: "30s"
+  queue: "simple"
+  class: "NamedArgsJob"
+  args:
+    - foo: 1
+      bar: 2
+  description: "It's a named args job."
+  named_args: true

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: active_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin Aiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activejob
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,33 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +68,7 @@ dependencies:
         version: '0'
 description: A wrapper for scheduling jobs through ActiveJob
 email:
-- jaiken@rocketmade.com
+- 60tonangel@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -102,6 +88,7 @@ files:
 - lib/active_scheduler/version.rb
 - spec/active_scheduler/resque_wrapper_spec.rb
 - spec/fixtures/cron_job.yaml
+- spec/fixtures/named_args_job.yaml
 - spec/fixtures/no_queue.yaml
 - spec/fixtures/schedule_name_is_class_name.yaml
 - spec/fixtures/simple_job.json
@@ -128,9 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: active_scheduler
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Scheduling for ActiveJob
 test_files: []
-has_rdoc: