sidekiq-cron 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e24b22d1f58e374c9ea85f606f3a86e01c204c6
-  data.tar.gz: af7f0ea32e39568a6f04981703088cf9c5fb4692
+  metadata.gz: e36b7b669446980725e708550d8a4c468a155f42
+  data.tar.gz: b95a3e582638be3924da88fcd45d2c8e5f6e1826
 SHA512:
-  metadata.gz: 4283ebe1d86984162381e640bad0d447b7fd2b4b25fd24f0a5750381fcd2aa74ab1432c3918015789bd549635928afbe84a102956c52a0ba79e7383850154854
-  data.tar.gz: 38e0734ff2253e123fe012687153cad465a06b187cda5806ac05baac3984ef24fbb14b072f522d2e759b821b0989c6cd4ca538c249efb43067946635d70d2911
+  metadata.gz: 333bab73a66a5fc2dcc80646a7cd1a64a34ba9e3c92f46bc31560b7b0b774caaf949864b11d2a63d2571a51c280ce9147b2a64ddc626e7c150b5d01dfcaf2cd6
+  data.tar.gz: 4f14cf44af1f6c610a7e411577f7a6555b15fb25d19f3909db96461db03c42d22098d50af826b3f54f6d37acbcdfed613f048a81db4bca7fbdf7952cad1ec11a

data/Changes.md

@@ -1,3 +1,9 @@
+v 0.3.1
+-------
+
+- add CSRF tags to forms so it will work with sidekiq >= 3.4.2
+- remove titl dependency
+
 v 0.3.0
 -------
 

data/Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'tilt' , '< 2.0.0'
 gem 'sidekiq', '>= 2.17.3'
 gem 'rufus-scheduler', '>= 2.0.24'
 

data/README.md

@@ -2,17 +2,17 @@ Sidekiq-Cron [![Gem Version](https://badge.fury.io/rb/sidekiq-cron.png)](http://
 ================================================================================================================================================================================================================================================================================================================================================================================================================================================
 
 
-An scheduling add-on for [Sidekiq](http://sidekiq.org).
+A scheduling add-on for [Sidekiq](http://sidekiq.org).
 
-Runs a thread along side Sidekiq workers to schedule jobs at specified times (using cron notation `* * * * *` parsed by [Rufus-Scheduler](https://github.com/jmettraux/rufus-scheduler), more about [cron notation](http://www.nncron.ru/help/EN/working/cron-format.htm).
+Runs a thread alongside Sidekiq workers to schedule jobs at specified times (using cron notation `* * * * *` parsed by [Rufus-Scheduler](https://github.com/jmettraux/rufus-scheduler), more about [cron notation](http://www.nncron.ru/help/EN/working/cron-format.htm).
 
 Checks for new jobs to schedule every 10 seconds and doesn't schedule the same job multiple times when more than one Sidekiq worker is running.
 
-Scheduling jobs are added only when at least one sidekiq process is running.
+Scheduling jobs are added only when at least one Sidekiq process is running.
 
-If you want to know how scheduling work check [out under the hood](#under-the-hood)
+If you want to know how scheduling work, check out [under the hood](#under-the-hood)
 
-Works with Active jobs (Rails 4.2+)
+Works with ActiveJob (Rails 4.2+)
 
 Requirements
 -----------------
@@ -22,15 +22,15 @@ Requirements
 
 Change Log
 ----------
-before upgrading to new version pls read:
-[Change Log](https://github.com/ondrejbartas/sidekiq-cron/raw/master/Changes.md)
+before upgrading to new version, please read:
+[Change Log](https://github.com/ondrejbartas/sidekiq-cron/blob/master/Changes.md)
 
 Installation
 ------------
 
     $ gem install sidekiq-cron
 
-or add to your Gemfile
+or add to your `Gemfile`
 
     gem "sidekiq-cron", "~> 0.3.0"
 
@@ -39,7 +39,7 @@ Getting Started
 -----------------
 
 
-If you are not using Rails you need to add `require 'sidekiq-cron'` somewhere after `require 'sidekiq'`.
+If you are not using Rails, you need to add `require 'sidekiq-cron'` somewhere after `require 'sidekiq'`.
 
 _Job properties_:
 
@@ -56,12 +56,11 @@ _Job properties_:
 
 ### Time, cron and sidekiq-cron
 
-Cron line is allways evaluated against UTC time. So if you are Prague (timezone +02:00) and you want job to be qneueued at 8:30 AM
-You will need to adjust cronline to `30 6 * * *`.
+Cron line is always evaluated against UTC time. So if you are in Prague (timezone +02:00) and you want a job to be enqueued at 8:30 AM, you will need to adjust cronline to `30 6 * * *`.
 
 ### What objects/classes can be scheduled
 #### Sidekiq Worker
-In example we were using: `HardWorker` which loooks like:
+In this example, we are using `HardWorker` which looks like:
 ```ruby
 class HardWorker
   include Sidekiq::Worker
@@ -72,7 +71,7 @@ end
 ```
 
 #### Active Job Worker
-You can schedule: `ExampleJob` which loooks like:
+You can schedule: `ExampleJob` which looks like:
 ```ruby
 class ExampleJob < ActiveJob::Base
   queue_as :default
@@ -93,14 +92,14 @@ class HardWorker
   end
 end
 
-Sidekiq::Cron::Job.create( name: 'Hard worker - every 5min', cron: '*/5 * * * *', klass: 'HardWorker')
+Sidekiq::Cron::Job.create(name: 'Hard worker - every 5min', cron: '*/5 * * * *', klass: 'HardWorker')
 # => true
 ```
 
 `create` method will return only true/false if job was saved or not.
 
 ```ruby
-job = Sidekiq::Cron::Job.new( name: 'Hard worker - every 5min', cron: '*/5 * * * *', klass: 'HardWorker')
+job = Sidekiq::Cron::Job.new(name: 'Hard worker - every 5min', cron: '*/5 * * * *', klass: 'HardWorker')
 
 if job.valid?
   job.save
@@ -152,8 +151,9 @@ array = [
 Sidekiq::Cron::Job.load_from_array array
 ```
 
-Bang methods will remove jobs that are not present in given hash/array
-updates jobs with same names and create new ones.
+Bang-suffixed methods will remove jobs that are not present in the given hash/array,
+updates jobs that have the same names, and creates new ones when the names are previously unknown.
+
 ```ruby
 Sidekiq::Cron::Job#load_from_hash! hash
 Sidekiq::Cron::Job#load_from_array! array
@@ -190,10 +190,10 @@ end
 #return array of all jobs
 Sidekiq::Cron::Job.all
 
-#return one job by its uniq name - case sensitive
+#return one job by its unique name - case sensitive
 Sidekiq::Cron::Job.find "Job Name"
 
-#return one job by its uniq name - you can use hash with 'name' key
+#return one job by its unique name - you can use hash with 'name' key
 Sidekiq::Cron::Job.find name: "Job Name"
 
 #if job can't be found nil is returned
@@ -207,7 +207,7 @@ Sidekiq::Cron::Job.destroy_all!
 #destroy job by its name
 Sidekiq::Cron::Job.destroy "Job Name"
 
-#destroy founded job
+#destroy found job
 Sidekiq::Cron::Job.find('Job name').destroy
 ```
 
@@ -230,15 +230,16 @@ job.enque!
 ```
 
 How to start scheduling?
-Just start sidekiq workers by:
+Just start Sidekiq workers by running:
 
     sidekiq
 
-### Web Ui for Cron Jobs
+### Web UI for Cron Jobs
 
-If you are using sidekiq web ui and you would like to add cron josb to web too,
+If you are using Sidekiq's web UI and you would like to add cron jobs too to this web UI,
 add `require 'sidekiq/cron/web'` after `require 'sidekiq/web'`.
-By this you will get:
+
+With this, you will get:
 ![Web UI](https://github.com/ondrejbartas/sidekiq-cron/raw/master/examples/web-cron-ui.png)
 
 ### Forking Processes
@@ -248,7 +249,7 @@ before the process forks, causing the following exception
 
     Redis::InheritedError: Tried to use a connection from a child process without reconnecting. You need to reconnect to Redis after forking.
 
-to occcur. To avoid this, wrap your job creation in the a call to `Sidekiq.configure_server`:
+to occcur. To avoid this, wrap your job creation in the call to `Sidekiq.configure_server`:
 
 ```ruby
 Sidekiq.configure_server do |config|
@@ -264,15 +265,28 @@ Note that this API is only available in Sidekiq 3.x.x.
 
 ## Under the hood
 
-When you start sidekiq process it starts one thread with Sidekiq::Poller instance, which perform adding of scheduled jobs to queues, retryes etc.
+When you start the Sidekiq process, it starts one thread with `Sidekiq::Poller` instance, which perform the adding of scheduled jobs to queues, retries etc.
 
-Sidekiq-Cron add itself into this start procedure and start another thread with Sidekiq::Cron::Poler which checks all enabled sidekiq cron jobs evry 10 seconds,
-if they should be added to queue (their cronline matches time of check).
+Sidekiq-Cron adds itself into this start procedure and starts another thread with `Sidekiq::Cron::Poller` which checks all enabled Sidekiq cron jobs every 10 seconds, if they should be added to queue (their cronline matches time of check).
 
 
+## Thanks to
+* [@7korobi](https://github.com/7korobi)
+* [@antulik](https://github.com/antulik)
+* [@felixbuenemann](https://github.com/felixbuenemann)
+* [@gstark](https://github.com/gstark)
+* [@RajRoR](https://github.com/RajRoR)
+* [@romeuhcf](https://github.com/romeuhcf)
+* [@siruguri](https://github.com/siruguri)
+* [@Soliah](https://github.com/Soliah)
+* [@stephankaag](https://github.com/stephankaag)
+* [@sue445](https://github.com/sue445)
+* [@sylg](https://github.com/sylg)
+* [@tmeinlschmidt](https://github.com/tmeinlschmidt)
+* [@zerobearing2](https://github.com/zerobearing2)
 
-## Contributing to sidekiq-cron
 
+## Contributing to sidekiq-cron
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
@@ -282,9 +296,6 @@ if they should be added to queue (their cronline matches time of check).
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-
 ## Copyright
 
-Copyright (c) 2013 Ondrej Bartas. See LICENSE.txt for
-further details.
-
+Copyright (c) 2013 Ondrej Bartas. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/sidekiq/cron/job.rb

@@ -217,6 +217,8 @@ module Sidekiq
 
         if args["message"]
           @message = args["message"]
+          message_data = Sidekiq.load_json(@message) || {}
+          @queue = message_data['queue'] || default
         elsif @klass
           message_data = {
             "class" => @klass.to_s,

data/lib/sidekiq/cron/views/cron.erb

@@ -35,19 +35,24 @@
           <td style="<%= style %>">
             <% if job.status == 'enabled' %>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">
+                <%= csrf_tag if respond_to?(:csrf_tag) %>
                 <input class='btn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>"/>
               </form>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/disable" method="post">
+                <%= csrf_tag if respond_to?(:csrf_tag) %>
                 <input class='btn btn-xs pull-left' type="submit" name="disable" value="<%= t('Disable') %>"/>
               </form>
             <% else %>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">
+                <%= csrf_tag if respond_to?(:csrf_tag) %>
                 <input class='btn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>"/>
               </form>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enable" method="post">
+                <%= csrf_tag if respond_to?(:csrf_tag) %>
                 <input class='btn btn-xs pull-left' type="submit" name="enable" value="<%= t('Enable') %>"/>
               </form>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/delete" method="post">
+                <%= csrf_tag if respond_to?(:csrf_tag) %>
                 <input class='btn btn-xs btn-danger pull-left' type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => job.name) %>"/>
               </form>
             <% end %>

data/lib/sidekiq/cron/views/cron.slim

@@ -32,15 +32,20 @@ header.row
         td[style="#{style}"]
           -if job.status == 'enabled'
             form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enque" method="post"
+              = csrf_tag if respond_to?(:csrf_tag)
               input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueNow')}"
             form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/disable" method="post"
+              = csrf_tag if respond_to?(:csrf_tag)
               input.btn.btn-small.pull-left type="submit" name="disable" value="#{t('Disable')}"
           -else
             form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enque" method="post"
+              = csrf_tag if respond_to?(:csrf_tag)
               input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueNow')}"
             form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enable" method="post"
+              = csrf_tag if respond_to?(:csrf_tag)
               input.btn.btn-small.pull-left type="submit" name="enable" value="#{t('Enable')}"
             form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/delete" method="post"
+              = csrf_tag if respond_to?(:csrf_tag)
               input.btn.btn-danger.btn-small type="submit" name="delete" value="#{t('Delete')}" data-confirm="#{t('AreYouSureDeleteCronJob', :job => job.name)}"
 
 - else

data/sidekiq-cron.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 0.3.0 ruby lib
+# stub: sidekiq-cron 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ondrej Bartas"]
-  s.date = "2015-06-26"
+  s.date = "2015-08-21"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
@@ -55,7 +55,6 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tilt>, ["< 2.0.0"])
       s.add_runtime_dependency(%q<sidekiq>, [">= 2.17.3"])
       s.add_runtime_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -73,7 +72,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<coveralls>, [">= 0"])
       s.add_development_dependency(%q<shotgun>, [">= 0"])
     else
-      s.add_dependency(%q<tilt>, ["< 2.0.0"])
       s.add_dependency(%q<sidekiq>, [">= 2.17.3"])
       s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -92,7 +90,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shotgun>, [">= 0"])
     end
   else
-    s.add_dependency(%q<tilt>, ["< 2.0.0"])
     s.add_dependency(%q<sidekiq>, [">= 2.17.3"])
     s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/test/test_helper.rb

@@ -24,7 +24,6 @@ require "mocha/setup"
 
 #SIDEKIQ Require - need to have sidekiq running!
 require 'celluloid/autostart'
-require 'tilt'
 require 'sidekiq'
 require 'sidekiq/util'
 require 'sidekiq/web'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement