shoryuken-later 0.0.5.2 → 0.0.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGNlYzJmMTg4NTJlNDIwNTA5YjQwZjZmYjZlZTRkMTkyMzVmMGNiYQ==
+    ZGU2ZmZlMzE1Y2U3YjE5ZWFlMzlkNmY1NzkwYzE3OTU4MmY3Y2Y5Zg==
   data.tar.gz: !binary |-
-    NDczOWYzNmM5ZjAyY2ZjYWRiNTdjMTA3M2ZmZTFmODYzYTU1NDQ4Ng==
+    OWU1NjQwOTY5M2E4ZTQwNWM3OTBjOWJiMjFmMjdiZGQ4ZTlkZTJjNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjE0NDQwZDZhZWViMzhkYThmZTY1YjY2MDY4MDMyZTZkY2QyZmM0MDIzOTky
-    ZDI4ZDg0YjhiYWE4NDY4YTNmZDgwYWY2YzZjOWVjM2E3ZTg5ZTQxZjljNzM4
-    Y2JkNTVmZDZhNDNlMTc1YTEwMGJmNzE5YjBhOGNmNWUzZThjNWY=
+    YjEzZGMwNzcwYjY4NzE4NGJmN2E3NTc4YmNhZTFlZWRjNWJjNDg0MmIwYmM5
+    MzRkYzk0NDhhNzgzY2Q2YTM0N2Y2ZTk3YWY1ODc0YWFmYmYxMmQ3ZjdlOWU1
+    NzlmZWQwMWIyZTQ5MWE1ZWU5ZDM1ODhiZjcyNDU2YmIzZGJjZDE=
   data.tar.gz: !binary |-
-    YjlhOTE1ZWZjYTAxYjljNjJkMDZhMDkzNjk2N2EwN2VkODU5ZmUwNDkxNjUx
-    NWFmMzI3Y2JkY2UyNDA0MWEwYzMyNDE2OGM0ZTcxMjU5NDdiOTkwODkyOTc5
-    ZjhmODZiMTlkYzU2YWY4MTIwNDJlYWYyYjQ0MGMwMmI5OGU1N2I=
+    NjExYzQ0YWI1YjYyOWFiMmE5ZjdiNzRkZTZhZmM3Nzk0ZDEzZGNjYzk1OWVi
+    MjYzNGYzMTExMTZhMzAzYzJlMGZlZWE5MGMwOTlmNzk1M2U2YzgzMWQwNDM0
+    ZmVkNGU2NzIwOTRlZGMyMzNjZjhjZjYwNzdlZDU5ZjVjYzE2NTE=

data/README.md

@@ -1,27 +1,10 @@
 # shoryuken-later
 
 A scheduling plugin for [Shoryuken](https://github.com/phstc/shoryuken) that uses [Dynamo DB](https://aws.amazon.com/dynamodb/)
-to schedule messages arbitrarily far into the future.
+to delay messages arbitrarily far into the future.
 
 ## Features
 
-### Integration with Shoryuken::Worker
-
-A new method named `perform_later` is added to `Shoryuken::Worker` allowing messages to be delayed arbitrarily far into the future. If the delay is 15 minutes or less, then the message is enqueued into the specified SQS `:queue` as usual.  Otherwise, the message is inserted into the specified DynamoDB `:schedule_table`.
-
-```ruby
- require 'shoryuken-later'
-
- class MyWorker
-   include Shoryuken::Worker
-  
-   shoryuken_options queue: 'default', schedule_table: 'default_schedule'
- end
-
- # Schedules a message to be processed 30 minutes from now.
- MyWorker.perform_later(Time.now + 30 * 60, 'Foobar')
-```
-
 ### One or more schedule tables
 
 Supports polling one or more DynamoDB tables for messages.
@@ -38,11 +21,12 @@ later:
 You can use the same configuration file for both `Shoryuken` and `Shoryuken::Later`, because the new configuration options are namespaced.
 
 ```yaml
-# This key is used by both Shoryuken and Shoryuken::Later
+# These keys are used by both Shoryuken and Shoryuken::Later
 aws:
   access_key_id:      ...       # or <%= ENV['AWS_ACCESS_KEY_ID'] %>
   secret_access_key:  ...       # or <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
   region:             us-east-1 # or <%= ENV['AWS_REGION'] %>
+logfile: some/path/to/file.log
   
 # This key is only used by Shoryuken::Later
 later:
@@ -50,9 +34,6 @@ later:
   pidfile: some/path/to/file.pid
   tables:
     - table1
-    
-# These keys are used by both Shoryuken and Shoryuken::Later
-logfile: some/path/to/file.log
 
 # These keys are only used by Shoryuken
 concurrency: 3
@@ -60,4 +41,83 @@ delay: 0
 queues:
   - [queue1, 1]
   - [queue2, 2]
-```
+```
+
+## Usage
+
+### Integration with ActiveJob
+
+A custom ActiveJob adapter can used to support delaying messages arbitrarily far into the future.
+
+```ruby
+# config/application.rb
+config.active_job.queue_adapter = :shoryuken_later
+```
+
+When you use the `:shoryuken_later` queue adapter, jobs to be performed farther than 15 minutes into the future (by setting the `wait` or `wait_until` ActiveJob options), will be inserted into the *default* schedule table.  You can set the default schedule table in an initializer.
+
+```ruby
+# config/initializers/shoryuken_later.rb
+Shoryuken::Later.default_table = "#{Rails.env}_myapp_later"
+```
+
+
+### Integration with Shoryuken::Worker
+
+A new method named `perform_later` is added to `Shoryuken::Worker` allowing messages to be delayed arbitrarily far into the future. If the delay is 15 minutes or less, then the message is enqueued into the specified SQS `:queue` as usual.  Otherwise, the message is inserted into the specified DynamoDB `:schedule_table`.
+
+```ruby
+ require 'shoryuken-later'
+
+ class MyWorker
+   include Shoryuken::Worker
+  
+   shoryuken_options queue: 'default', schedule_table: 'default_schedule'
+ end
+
+ # Schedules a message to be processed 30 minutes from now.
+ MyWorker.perform_later(Time.now + 30 * 60, 'Foobar')
+```
+
+
+## Requirements
+
+Ruby 2.0 or greater. Ruby 1.9 is no longer supported.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'shoryuken-later'
+```
+
+Or to get the latest updates:
+
+```ruby
+gem 'shoryuken-later', github: 'joekhoobyar/shoryuken-later', branch: 'master'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install shoryuken-later
+    
+## Documentation
+
+Learn about using Shoryuken at the [Shoryuken Wiki](https://github.com/phstc/shoryuken/wiki).
+
+## Credits
+
+[Pablo Cantero](https://github.com/phstc), creator of [Shoryuken](https://github.com/phstc/shoryuken), and [everybody who contributed to it](https://github.com/phstc/shoryuken/graphs/contributors).  I borrowed a lot of code from Shoryuken itself as a shortcut to making this gem.
+
+## Contributing
+
+1. Fork it ( https://github.com/joekhoobyar/shoryuken-later/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/lib/shoryuken/later/cli.rb

@@ -79,6 +79,7 @@ module Shoryuken
           ::Rails::Application.initializer "shoryuken-later.eager_load" do
             ::Rails.application.config.eager_load = true
           end
+          require 'shoryuken/later/active_job_adapter' if defined?(::ActiveJob)
           require File.expand_path("config/environment.rb")
         end
 
@@ -215,10 +216,10 @@ module Shoryuken
 
         config = options[:config_file] ? parse_config(options[:config_file]).deep_symbolize_keys : {}
 
-        Shoryuken::Later.options[:later].merge!(config.delete(:later))
+        Shoryuken::Later.options[:later].merge!(config.delete(:later) || {})
         Shoryuken::Later.options.merge!(config)
 
-        Shoryuken::Later.options[:later].merge!(options.delete(:later))
+        Shoryuken::Later.options[:later].merge!(options.delete(:later) || {})
         Shoryuken::Later.options.merge!(options)
         
         # Tables from command line options take precedence...

data/lib/shoryuken/later/version.rb

@@ -1,5 +1,5 @@
 module Shoryuken
   module Later
-    VERSION = '0.0.5.2'
+    VERSION = '0.0.5.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken-later
 version: !ruby/object:Gem::Version
-  version: 0.0.5.2
+  version: 0.0.5.3
 platform: ruby
 authors:
 - Joe Khoobyar