rubykiq 0.0.2 → 0.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWMyOTY2NGFjNWIwOTM5MWY5OWYxMjQ2MTgzZTllOWJhZGY3ZDdkNg==
-  data.tar.gz: !binary |-
-    NWE4MzQ1ZmFiNmRhNDkxNmJmNjQ2NzNlMjNkZDU3ZGE5YzMzMTRjMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGZhYWEwNzAwODRiZjExZmE4NGVmMjg0OTg2ZjVkOGQzNGY1YjE1NzJjNTk5
-    YWI0MWQxYzZhYzE4YjVlODUwMGE2ZDY4NWVjNDYyMjI1NjY3OThkNDkzMGQ1
-    MDdhMzJmOWM5YjcxMGY2NTkyZWJhYzdiYmJhMzhhZTA1ZmE3NTU=
-  data.tar.gz: !binary |-
-    Y2VlNmY0OTRiYTIwM2Q0YjU1YmI5YWFkYjJkZDdmMTVmNjVjN2M0MGZiYmM4
-    MTZlYzIzYzdjYWY1MGJjZWQ3ZTBmN2ZkOTkwNDJhODZjMTc1NmI3NWRiNTA0
-    Y2ZjODM3NWYwZjE4ODlmMjIwM2ViYjc2ODJiOTkzZTM5YzI2Zjc=
+SHA1:
+  metadata.gz: 696749fd11368ecd5319c9bf317c6b0ac04a14bd
+  data.tar.gz: fbea254bb5f399512e51992fbf0ada9e4e3d6e3f
+SHA512:
+  metadata.gz: 00c6ab314e85af8eb6cfc661fb5e22c1e3b5860a4a58cc33555dc717d60fbe2fc071485d79436aad0842dfcf7cb31505b034925d9d0a870e3dd256d6132975f9
+  data.tar.gz: 1f523fa4f43a80f8e7acfce5a3cb2d19b32c0bec3da160de1134744576518625daf47a5a1c3b1230f738e56ba6bc3ced6630c5c799688d96d23898d1a679bafc

data/.gitignore

@@ -12,8 +12,7 @@ test/tmp
 test/version_tmp
 tmp
 *.lock
-
-# YARD artifacts
 .yardoc
 _yardoc
-doc/
+doc/
+bin

data/.rubocop.yml

@@ -0,0 +1,24 @@
+AllCops:
+  Includes:
+    - Rakefile
+    - Gemfile
+  Excludes:
+    - script/**
+    - vendor/**
+    - bin/**
+LineLength:
+  Enabled: false
+MethodLength:
+  Enabled: false
+ClassLength:
+  Enabled: false
+Documentation:
+  Enabled: false
+Encoding:
+  Enabled: false
+Blocks:
+  Enabled: false
+AlignParameters:
+  Enabled: false
+HashSyntax:
+  EnforcedStyle: ruby19

data/.travis.yml

@@ -1,10 +1,21 @@
-bundler_args: --without development
 language: ruby
+cache: bundler
 rvm:
+  - ruby-head
+  - jruby-head
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
   - rbx-19mode
   - jruby-19mode
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
 services:
-  - redis-server
+  - redis-server
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode
+notifications:
+  email: false

data/CONTRIBUTING.md

@@ -36,10 +36,8 @@ Ideally, a bug report should include a pull request with failing specs.
 4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
 5. Implement your feature or bug fix.
 6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
-7. Run `open coverage/index.html`. If your changes are not completely covered
-   by your tests, return to step 3.
-8. Add, commit, and push your changes.
-9. [Submit a pull request.][pr]
+7. Add, commit, and push your changes.
+8. [Submit a pull request.][pr]
 
 [fork]: http://help.github.com/fork-a-repo/
 [branch]: http://learn.github.com/p/branching.html

data/Gemfile

@@ -1,33 +1,22 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "rake", ">= 1.2"
-gem "yard"
-
-# platforms :ruby_18 do
-# end
-# platforms :ruby, :mswin, :mingw do
-# end
-# platforms :jruby do
-# end
-
-gem "hiredis", ">= 0.4.5", :require => false
-gem "em-synchrony", :require => false
+gem 'yard'
+gem 'rake', '~> 10.0'
+gem 'hiredis', '>= 0.4.5', require: false
+gem 'em-synchrony', require: false
 
 group :development do
-  gem "kramdown", ">= 0.14"
-  gem "pry"
-  gem "pry-debugger", :platforms => :mri_19
-  gem "awesome_print"
+  gem 'pry'
+  gem 'rubocop'
+  gem 'kramdown', '>= 0.14'
 end
 
 group :test do
-  gem "rspec"
-  gem "rspec-smart-formatter"
-  gem "vcr"
-  gem "timecop"
-  gem "simplecov", :require => false
-  gem "coveralls", :require => false
-  gem "cane", :require => false, :platforms => :ruby_19
+  gem 'rspec'
+  gem 'timecop'
+  gem 'simplecov', require: false
+  gem 'coveralls', require: false
+  gem 'fakefs', '~> 0.4.3'
 end
 
-gemspec
+gemspec

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Karl Freeman
+Copyright (c) 2013-2014 Karl Freeman
 
 MIT License
 

data/README.md

@@ -1,59 +1,78 @@
 # Rubykiq
 
-[Sidekiq] agnostic enqueuing using Redis.
+[Sidekiq][sidekiq] agnostic enqueuing using Redis.
 
 Sidekiq is a fantastic message processing library which has a simple and stable message format. `Rubykiq` aims to be a portable library to push jobs in to Sidekiq with as little overhead as possible whilst having feature parity on `Sidekiq::Client`'s conventions.
 
+## Installation
+
+```ruby
+gem 'rubykiq', '~> 0.0.3'
+```
+
+```ruby
+require 'rubykiq'
+```
 ## Features / Usage Examples
 
-* [Redis] has support for [alternative drivers](https://github.com/redis/redis-rb#alternate-drivers), Rubykiq is tested with these in mind. ( eg `:synchrony` )
+* [Redis] has support for [alternative drivers](https://github.com/redis/redis-rb#alternate-drivers), Rubykiq is tested with these in mind. (eg `:synchrony`)
+* the `:class` parameter can be the Class or a String of the Class (eg push jobs to Sidekiq from anywhere, not just where Sidekiq has the classes loaded)
 * The `:at` parameter supports `Time`, `Date` and any `Time.parse`-able strings.
-* Pushing multiple and singular jobs has the same interface ( simply nest args )
-* Slightly less gem dependecies, and by that I mean `Sidekiq::Client` without `Celluloid` ( which is already very light! )
+* Pushing multiple and singular jobs has the same interface (simply nest args)
+* Slightly less gem dependecies, and by that I mean `Sidekiq::Client` without `Celluloid` (which is already very light!)
+* Easier configuration (IMO)
 
 ```ruby
-require "rubykiq"
 
 # will also detect REDIS_URL, REDIS_PROVIDER and REDISTOGO_URL ENV variables
-Rubykiq.url = "redis://127.0.0.1:6379"
+Rubykiq.url = 'redis://127.0.0.1:6379'
 
 # alternative driver support ( :ruby, :hiredis, :synchrony )
 Rubykiq.driver = :synchrony
 
 # defaults to nil
-Rubykiq.namespace = "background"
+Rubykiq.namespace = 'background'
 
-# uses "default" queue unless specified
-Rubykiq.push(:class => "Worker", :args => ["foo", 1, :bat => "bar"])
+# uses 'default' queue unless specified
+Rubykiq.push(:class => 'Worker', :args => ['foo', 1, :bat => 'bar'])
 
 # args are optionally set to empty
-Rubykiq.push(:class => "Scheduler", :queue => "scheduler")
+Rubykiq.push(:class => 'Scheduler', :queue => 'scheduler')
 
 # will batch up multiple jobs
-Rubykiq.push(:class => "Worker", :args => [["foo"], ["bar"]]) 
+Rubykiq.push(:class => 'Worker', :args => [['foo'], ['bar']]) 
 
-# at param can be a "Time", "Date" or any "Time.parse"-able strings
-Rubykiq.push(:class => "DelayedHourMailer", :at => Time.now + 3600)
-Rubykiq.push(:class => "DelayedDayMailer", :at => DateTime.now.next_day)
-Rubykiq.push(:class => "DelayedMailer", :at => "2013-01-01T09:00:00Z")
+# at param can be a 'Time', 'Date' or any 'Time.parse'-able strings
+Rubykiq.push(:class => 'DelayedHourMailer', :at => Time.now + 3600)
+Rubykiq.push(:class => 'DelayedDayMailer', :at => DateTime.now.next_day)
+Rubykiq.push(:class => 'DelayedMailer', :at => '2013-01-01T09:00:00Z')
 
 # alias based sugar
-job = { :class => "Worker" }
+job = { :class => 'Worker' }
 Rubykiq << job
+
+# create multiple Rubykiq clients with their own drivers
+ruby_client = Rubykiq::Client.new
+hiredis_client = Rubykiq::Client.new(:driver => :hiredis)
+
+# create multiple Rubykiq clients with their own namespaces
+foo_client = Rubykiq::Client.new(:namespace => 'foo')
+bar_client = Rubykiq::Client.new(:namespace => 'bar')
+
 ```
 
 ## Caveats
 
 * It's advised that using [Sidekiq::Client's push](https://github.com/mperham/sidekiq/blob/master/lib/sidekiq/client.rb#L36) method when already a dependency is better in most everyday cases
-* If you rely on any [Sidekiq Middleware](https://github.com/mperham/sidekiq/wiki/Middleware), Rubykiq is not aware of them so defaults will not be applied to the job hash.
+* If you rely on any [Sidekiq Middleware](https://github.com/mperham/sidekiq/wiki/middleware), Rubykiq is not aware of them so defaults will not be applied to the job hash.
 
 ## Build & Dependency Status
 
 [![Gem Version](https://badge.fury.io/rb/rubykiq.png)][gem]
 [![Build Status](https://travis-ci.org/karlfreeman/rubykiq.png)][travis]
-[![Dependency Status](https://gemnasium.com/karlfreeman/rubykiq.png?travis)][gemnasium]
 [![Code Quality](https://codeclimate.com/github/karlfreeman/rubykiq.png)][codeclimate]
 [![Coverage Status](https://coveralls.io/repos/karlfreeman/rubykiq/badge.png?branch=master)][coveralls]
+[![Gittip](http://img.shields.io/gittip/karlfreeman.png)][gittip]
 
 ## Supported Redis Drivers
 
@@ -62,20 +81,21 @@ Rubykiq << job
 * [Synchrony](https://github.com/igrigorik/em-synchrony)
 
 ## Supported Ruby Versions
+
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-* Ruby 1.9.2 (drivers: ruby, hiredis, synchrony)
-* Ruby 1.9.3 (drivers: ruby, hiredis, synchrony)
+* Ruby 2.1.0 (drivers: ruby, hiredis, synchrony)
 * Ruby 2.0.0 (drivers: ruby, hiredis, synchrony)
-* [JRuby][] (drivers: ruby)
-* [Rubinius][] (drivers: ruby)
+* Ruby 1.9.3 (drivers: ruby, hiredis, synchrony)
+* [JRuby][jruby] (drivers: ruby)
+* [Rubinius][rubinius] (drivers: ruby)
 
 # Credits
 
 Inspiration:
 
-- [Michael Grosser's Enqueue into Sidkiq post](http://grosser.it/2013/01/17/enqueue-into-sidekiq-via-pure-redis-without-loading-sidekiq/)
+- [Michael Grosser's Enqueue into Sidkiq post](http://grosser.it/2013/01/17/enqueue-into-sidekiq-via-pure-redis-without-loading-sidekiq)
 
 Cribbed:
 
@@ -83,13 +103,13 @@ Cribbed:
 - [Sidekiq's internal redis class](https://github.com/mperham/sidekiq/blob/master/lib/sidekiq/redis_connection.rb)
 - [Sidekiq's FAQ](https://github.com/mperham/sidekiq/wiki/FAQ)
 
-[sidekiq]: http://mperham.github.com/sidekiq
-[redis]: https://github.com/redis/redis-rb
 [gem]: https://rubygems.org/gems/rubykiq
 [travis]: http://travis-ci.org/karlfreeman/rubykiq
-[gemnasium]: https://gemnasium.com/karlfreeman/rubykiq
 [coveralls]: https://coveralls.io/r/karlfreeman/rubykiq
 [codeclimate]: https://codeclimate.com/github/karlfreeman/rubykiq
+[gittip]: https://www.gittip.com/karlfreeman
 [jruby]: http://www.jruby.org
 [rubinius]: http://rubini.us
 
+[sidekiq]: http://mperham.github.com/sidekiq
+[redis]: https://github.com/redis/redis-rb

data/Rakefile

@@ -1,27 +1,17 @@
-require "bundler"
+require 'bundler'
 Bundler.setup
 Bundler::GemHelper.install_tasks
 
-require "yard"
+require 'yard'
 YARD::Rake::YardocTask.new
 
-require "rspec/core/rake_task"
-desc "Run all examples"
+require 'rspec/core/rake_task'
+desc 'Run all examples'
 RSpec::Core::RakeTask.new(:spec)
 
-begin
-  require "cane/rake_task"
-  namespace :metric do
-    desc "Analyze for code quality"
-    Cane::RakeTask.new(:quality) do |cane|
-      cane.abc_max = 27
-      cane.no_doc = true
-      cane.style_measure = 200
-    end
-  end
-rescue LoadError
-  warn "Cane is not available, metric:quality task not provided."
-end
+require 'rubocop/rake_task'
+desc 'Run rubocop'
+Rubocop::RakeTask.new(:rubocop)
 
-task :default => :spec
-task :test => :spec
+task default: :spec
+task test: :spec

data/lib/rubykiq.rb

@@ -1,23 +1,22 @@
-require "forwardable"
-require "rubykiq/client"
-require "rubykiq/connection"
+require 'forwardable'
+require 'rubykiq/client'
+require 'rubykiq/connection'
 
 module Rubykiq
   extend SingleForwardable
 
-  def_delegators :client, :<<, :push, :connection_pool
+  def_delegators :client, :<<, :push, :connection_pool, :connection_pool=
 
   # delegate all VALID_OPTIONS_KEYS accessors to the client
   def_delegators :client, *Rubykiq::Client::VALID_OPTIONS_KEYS
 
   # delegate all VALID_OPTIONS_KEYS setters to the client ( hacky I know... )
-  def_delegators :client, *(Rubykiq::Client::VALID_OPTIONS_KEYS.dup.collect! do |key| "#{key}=".to_sym; end)
+  def_delegators :client, *(Rubykiq::Client::VALID_OPTIONS_KEYS.dup.map! do |key| "#{key}=".to_sym; end)
 
   # Fetch the Rubykiq::Client
   #
   # @return [Rubykiq::Client]
-  def self.client(options={})
+  def self.client(options = {})
     @client ||= Rubykiq::Client.new(options)
   end
-
-end
+end

data/lib/rubykiq/client.rb

@@ -1,12 +1,10 @@
-require "connection_pool"
-require "securerandom"
-require "multi_json"
-require "time"
+require 'connection_pool'
+require 'securerandom'
+require 'multi_json'
+require 'time'
 
 module Rubykiq
-
   class Client
-
     # An array of valid keys in the options hash when configuring a `Rubykiq::Client`
     VALID_OPTIONS_KEYS = [
       :redis_pool_size,
@@ -20,13 +18,13 @@ module Rubykiq
 
     # A hash of valid options and their default values
     DEFAULT_OPTIONS = {
-      :redis_pool_size => 1,
-      :redis_pool_timeout => 1,
-      :url => nil,
-      :namespace => nil,
-      :driver => :ruby,
-      :retry => true,
-      :queue => "default"
+      redis_pool_size: 1,
+      redis_pool_timeout: 1,
+      url: nil,
+      namespace: nil,
+      driver: :ruby,
+      retry: true,
+      queue: 'default'
     }.freeze
 
     # Bang open the valid options
@@ -42,13 +40,17 @@ module Rubykiq
       end
     end
 
+    def connection_pool=(val)
+      @connection_pool = val
+    end
+
     # Fetch the ::ConnectionPool of Rubykiq::Connections
     #
     # @return [::ConnectionPool]
-    def connection_pool(options={}, &block)
+    def connection_pool(options = {}, &block)
       options = valid_options.merge(options)
 
-      @connection_pool ||= ::ConnectionPool.new(:timeout => redis_pool_timeout, :size => redis_pool_size) do
+      @connection_pool ||= ::ConnectionPool.new(timeout: redis_pool_timeout, size: redis_pool_size) do
         Rubykiq::Connection.new(options)
       end
 
@@ -57,13 +59,12 @@ module Rubykiq
       else
         return @connection_pool
       end
-
     end
 
     # Push a Sidekiq job to Redis. Accepts a number of options:
     #
     #   :class - the worker class to call, required.
-    #   :queue - the named queue to use, optional ( default: "default" )
+    #   :queue - the named queue to use, optional ( default: 'default' )
     #   :args - an array of simple arguments to the perform method, must be JSON-serializable, optional ( default: [] )
     #   :retry - whether to retry this job if it fails, true or false, default true, optional ( default: true )
     #   :at - when the job should be executed. This can be a `Time`, `Date` or any `Time.parse`-able strings, optional.
@@ -72,31 +73,29 @@ module Rubykiq
     # if multiple jobs are pushed the size of the jobs will be returned
     #
     # Example:
-    #   Rubykiq.push(:class => "Worker", :args => ["foo", 1, :bat => "bar"])
-    #   Rubykiq.push(:class => "Scheduler", :queue => "scheduler")
-    #   Rubykiq.push(:class => "DelayedMailer", :at => "2013-01-01T09:00:00Z")
-    #   Rubykiq.push(:class => "Worker", :args => [["foo"], ["bar"]])
+    #   Rubykiq.push(:class => 'Worker', :args => ['foo', 1, :bat => 'bar'])
+    #   Rubykiq.push(:class => 'Scheduler', :queue => 'scheduler')
+    #   Rubykiq.push(:class => 'DelayedMailer', :at => '2013-01-01T09:00:00Z')
+    #   Rubykiq.push(:class => 'Worker', :args => [['foo'], ['bar']])
     #
     # @param items [Array]
     def push(items)
-      raise(ArgumentError, "Message must be a Hash") unless items.is_a?(Hash)
-      raise(ArgumentError, "Message args must be an Array") if items[:args] && !items[:args].is_a?(Array)
+      fail(ArgumentError, 'Message must be a Hash') unless items.is_a?(Hash)
+      fail(ArgumentError, 'Message args must be an Array') if items[:args] && !items[:args].is_a?(Array)
 
       # args are optional
       items[:args] ||= []
 
       # determine if this items arg's is a nested array
       items[:args].first.is_a?(Array) ? push_many(items) : push_one(items)
-
     end
     alias_method :<<, :push
 
-
     private
 
     # Create a hash of options and their values
     def valid_options
-      VALID_OPTIONS_KEYS.inject({}){|o,k| o.merge!(k => send(k)) }
+      VALID_OPTIONS_KEYS.reduce({}) { |o, k| o.merge!(k => send(k)) }
     end
 
     # Create a hash of the default options and their values
@@ -113,7 +112,6 @@ module Rubykiq
 
     # when only one item is needed to persisted to redis
     def push_one(item)
-
       # we're expecting item to be a single item so simply normalize it
       payload = normalize_item(item)
 
@@ -121,19 +119,17 @@ module Rubykiq
       pushed = false
       pushed = raw_push([payload]) if payload
       pushed ? payload[:jid] : nil
-
     end
 
     # when multiple item's are needing to be persisted to redis
     def push_many(items)
-
       # we're expecting items to have an nested array of args, lets take each one and correctly normalize them
       payloads = items[:args].map do |args|
-        raise ArgumentError, "Bulk arguments must be an Array of Arrays: [[:foo => 'bar'], [:foo => 'foo']]" unless args.is_a?(Array)
-        # clone the original items ( for :queue, :class, etc.. )
+        fail ArgumentError, "Bulk arguments must be an Array of Arrays: [[:foo => 'bar'], [:foo => 'foo']]" unless args.is_a?(Array)
+        # clone the original items (for :queue, :class, etc..)
         item = items.clone
-        # merge this item's args ( eg the nested `arg` array )
-        item.merge!(:args => args) unless args.empty?
+        # merge this item's args (eg the nested `arg` array)
+        item.merge!(args: args) unless args.empty?
         # normalize this individual item
         item = normalize_item(item)
       end.compact
@@ -142,20 +138,19 @@ module Rubykiq
       pushed = false
       pushed = raw_push(payloads) unless payloads.empty?
       pushed ? payloads.size : nil
-
     end
 
     # persist the job message(s)
     def raw_push(payloads)
       pushed = false
-      Rubykiq.connection_pool do |connection|
+      connection_pool do |connection|
         if payloads.first[:at]
-          pushed = connection.zadd("schedule", payloads.map {|item| [ item[:at].to_s, ::MultiJson.encode(item) ]})
+          pushed = connection.zadd('schedule', payloads.map { |item| [item[:at].to_s, ::MultiJson.encode(item)] })
         else
           q = payloads.first[:queue]
           to_push = payloads.map { |item| ::MultiJson.encode(item) }
           _, pushed = connection.multi do
-            connection.sadd("queues", q)
+            connection.sadd('queues', q)
             connection.lpush("queue:#{q}", to_push)
           end
         end
@@ -163,12 +158,11 @@ module Rubykiq
       pushed
     end
 
-    #
     def normalize_item(item)
-      raise(ArgumentError, "Message must be a Hash") unless item.is_a?(Hash)
-      raise(ArgumentError, "Message must include a class and set of arguments: #{item.inspect}") if !item[:class] || !item[:args]
-      raise(ArgumentError, "Message args must be an Array") if item[:args] && !item[:args].is_a?(Array)
-      raise(ArgumentError, "Message class must be a String representation of the class name") unless item[:class].is_a?(String)
+      fail(ArgumentError, 'Message must be a Hash') unless item.is_a?(Hash)
+      fail(ArgumentError, "Message must include a class and set of arguments: #{item.inspect}") if !item[:class] || !item[:args]
+      fail(ArgumentError, 'Message args must be an Array') if item[:args] && !item[:args].is_a?(Array)
+      fail(ArgumentError, 'Message class must be a String representation of the class name') unless item[:class].is_a?(String)
 
       # normalize the time
       item[:at] = normalize_time(item[:at]) if item[:at]
@@ -179,19 +173,17 @@ module Rubykiq
 
       # apply the default options
       [:retry, :queue].each do |key|
-        pre_normalized_item[key] = send("#{key}") unless pre_normalized_item.has_key?(key)
+        pre_normalized_item[key] = send("#{key}") unless pre_normalized_item.key?(key)
       end
 
       # provide a job ID
       pre_normalized_item[:jid] = ::SecureRandom.hex(12)
 
-      return pre_normalized_item
-
+      pre_normalized_item
     end
 
     # Given an object meant to represent time, try to convert it intelligently to a float
     def normalize_time(time)
-
       # if the time param is a `Date` / `String` convert it to a `Time` object
       if time.is_a?(Date)
         normalized_time = time.to_time
@@ -201,13 +193,10 @@ module Rubykiq
         normalized_time = time
       end
 
-      # convert the `Time` object to a float ( if necessary )
+      # convert the `Time` object to a float (if necessary)
       normalized_time = normalized_time.to_f unless normalized_time.is_a?(Numeric)
 
-      return normalized_time
-
+      normalized_time
     end
-
   end
-
-end
+end

data/lib/rubykiq/connection.rb

@@ -1,10 +1,8 @@
-require "redis"
-require "redis/namespace"
+require 'redis'
+require 'redis/namespace'
 
 module Rubykiq
-
   class Connection
-
     extend Forwardable
     def_delegators :@redis_connection, :multi, :namespace, :sadd, :zadd, :lpush, :lpop, :lrange, :llen, :zcard, :zrange, :flushdb
     def_delegators :@redis_client, :host, :port, :db, :password
@@ -18,21 +16,20 @@ module Rubykiq
       driver = options.delete(:driver)
       @redis_connection ||= build_conection(url, namespace, driver)
       @redis_client ||= @redis_connection.client
-      return @redis_connection
+      @redis_connection
     end
 
     private
 
     # lets try and fallback to another redis url
     def determine_redis_provider
-      ENV["REDISTOGO_URL"] || ENV["REDIS_PROVIDER"] || ENV["REDIS_URL"] || "redis://localhost:6379/0"
+      ENV['REDISTOGO_URL'] || ENV['REDIS_PROVIDER'] || ENV['REDIS_URL'] || 'redis://localhost:6379/0'
     end
 
     # construct a namespaced redis connection
     def build_conection(url, namespace, driver)
-      client = ::Redis.connect(:url => url, :driver => driver)
-      return ::Redis::Namespace.new(namespace, :redis => client)
+      client = ::Redis.new(url: url, driver: driver)
+      ::Redis::Namespace.new(namespace, redis: client)
     end
-
   end
-end
+end

data/lib/rubykiq/version.rb

@@ -1,3 +1,3 @@
 module Rubykiq
-  VERSION = "0.0.2" unless defined?(Rubykiq::VERSION)
-end
+  VERSION = '0.0.4' unless defined?(Rubykiq::VERSION)
+end

data/rubykiq.gemspec

@@ -1,23 +1,26 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rubykiq/version"
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rubykiq/version'
 
-Gem::Specification.new do |gem|
-  gem.add_dependency "redis", ">= 3.0"
-  gem.add_dependency "redis-namespace", ">= 1.0"
-  gem.add_dependency "multi_json", ">= 1.0"
-  gem.add_dependency "connection_pool", ">= 1.0"
-  gem.add_development_dependency "bundler", ">= 1.0"
-  gem.name          = "rubykiq"
-  gem.version       = Rubykiq::VERSION
-  gem.authors       = ["Karl Freeman"]
-  gem.email         = ["karlfreeman@gmail.com"]
-  gem.license       = "MIT"
-  gem.description   = %q{Sidekiq agnostic enqueuing using Redis}
-  gem.summary       = %q{Sidekiq agnostic enqueuing using Redis}
-  gem.homepage      = "https://github.com/karlfreeman/rubykiq"
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.require_paths = ["lib"]
-  gem.required_ruby_version = ">= 1.9.2"
-end
+Gem::Specification.new do |spec|
+  spec.name          = 'rubykiq'
+  spec.version       = Rubykiq::VERSION
+  spec.authors       = ['Karl Freeman']
+  spec.email         = ['karlfreeman@gmail.com']
+  spec.summary       = %q{Sidekiq agnostic enqueuing using Redis}
+  spec.description   = %q{Sidekiq agnostic enqueuing using Redis}
+  spec.homepage      = 'https://github.com/karlfreeman/rubykiq'
+  spec.license       = 'MIT'
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 1.9.3'
+
+  spec.add_dependency 'redis', '>= 3.0'
+  spec.add_dependency 'redis-namespace', '>= 1.0'
+  spec.add_dependency 'multi_json', '>= 1.0'
+  spec.add_dependency 'connection_pool', '>= 1.0'
+end

data/spec/spec_helper.rb

@@ -1,44 +1,34 @@
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require "bundler"
+require 'bundler'
 Bundler.setup
-begin; require "awesome_print"; rescue LoadError; end
 
-require "rspec"
-
-require "support/pry"
-require "support/timecop"
-require "support/simplecov"
+%w(support).each do |dir|
+  Dir.glob(File.expand_path("../#{dir}/**/*.rb", __FILE__), &method(:require))
+end
 
-require "rubykiq"
+require 'rubykiq'
 
 # used as a stupid mixin class
 class DummyClass
 end
 
-#
 RSpec.configure do |config|
 
-  #
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
 
-  #
   def jruby?
     defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
   end
 
-  #
   def wrap_in_synchrony?(driver)
-
     yield unless driver == :synchrony
-
     EM.synchrony do
       yield if block_given?
       EM.stop
     end
-
   end
 
-end
+end

data/spec/support/pry.rb

@@ -1,3 +1,3 @@
-if !ENV["CI"] && defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
-  require "pry"
-end
+if !ENV['CI'] && defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
+  require 'pry'
+end

data/spec/support/simplecov.rb

@@ -1,15 +1,9 @@
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
-
-  require "simplecov"
-
-  if ENV["CI"]
-    require "coveralls"
-    Coveralls.wear!
-    SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  end
-
+if ENV['CI'] && defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
+  require 'simplecov'
+  require 'coveralls'
+  Coveralls.wear!
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.start do
-    add_filter "vendor"
+    add_filter 'vendor'
   end
-
-end
+end

data/spec/support/timecop.rb

@@ -1,2 +1,2 @@
-require "timecop"
-Timecop.freeze
+require 'timecop'
+Timecop.freeze

data/spec/unit/client_spec.rb

@@ -1,6 +1,6 @@
-require "spec_helper"
-require "hiredis"
-require "em-synchrony"
+require 'spec_helper'
+require 'hiredis'
+require 'em-synchrony'
 
 describe Rubykiq::Client do
 
@@ -12,9 +12,9 @@ describe Rubykiq::Client do
     Timecop.return
   end
 
-  let (:ruby_client) { Rubykiq::Client.new }
-  let (:hiredis_client) { Rubykiq::Client.new(:driver => :hiredis) }
-  let (:synchrony_client) { Rubykiq::Client.new(:driver => :synchrony) }
+  let (:ruby_client) { Rubykiq::Client.new(driver: :ruby, namespace: :ruby) }
+  let (:hiredis_client) { Rubykiq::Client.new(driver: :hiredis, namespace: :hiredis) }
+  let (:synchrony_client) { Rubykiq::Client.new(driver: :synchrony, namespace: :synchrony) }
 
   # eg with a variety of drivers
   [:ruby, :hiredis, :synchrony].each do |driver|
@@ -22,53 +22,53 @@ describe Rubykiq::Client do
     # skip incompatible drivers when running in JRuby
     next if jruby? && (driver == :hiredis || :synchrony)
 
-    context "with #{driver}" do
+    context "using driver '#{driver}'" do
 
       # make sure the let is the current client being tested
-      let(:client) { self.send("#{driver}_client") }
+      let(:client) { send("#{driver}_client") }
 
       describe :defaults do
         subject { client }
-        its(:namespace) { should be_nil }
+        its(:namespace) { should eq driver }
         its(:driver) { should be driver }
         its(:retry) { should be_true }
-        its(:queue) { should eq "default" }
+        its(:queue) { should eq 'default' }
       end
 
       describe :push do
 
         context :validations do
 
-          context "with an incorrect message type" do
-            it "raises an ArgumentError" do
-              expect{ client.push([]) }.to raise_error(ArgumentError, /Message must be a Hash/)
-              expect{ client.push("{}") }.to raise_error(ArgumentError, /Message must be a Hash/)
-              expect{ client.push(DummyClass.new) }.to raise_error(ArgumentError, /Message must be a Hash/)
+          context 'with an incorrect message type' do
+            it 'raises an ArgumentError' do
+              expect { client.push([]) }.to raise_error(ArgumentError, /Message must be a Hash/)
+              expect { client.push('{}') }.to raise_error(ArgumentError, /Message must be a Hash/)
+              expect { client.push(DummyClass.new) }.to raise_error(ArgumentError, /Message must be a Hash/)
             end
           end
 
-          context "without a class" do
-            it "raises an ArgumentError" do
-              expect{ client.push(:args => ['foo', 1, { :bat => "bar" }]) }.to raise_error(ArgumentError, /Message must include a class/)
+          context 'without a class' do
+            it 'raises an ArgumentError' do
+              expect { client.push(args: ['foo', 1, { bat: 'bar' }]) }.to raise_error(ArgumentError, /Message must include a class/)
             end
           end
 
-          context "with an incorrect args type" do
-            it "raises an ArgumentError" do
-              expect{ client.push(:class => "MyWorker", :args => { :bat => "bar" }) }.to raise_error(ArgumentError, /Message args must be an Array/)
+          context 'with an incorrect args type' do
+            it 'raises an ArgumentError' do
+              expect { client.push(class: 'MyWorker', args: { bat: 'bar' }) }.to raise_error(ArgumentError, /Message args must be an Array/)
             end
           end
 
-          context "with an incorrect class type" do
-            it "raises an ArgumentError" do
-              expect{ client.push(:class => DummyClass, :args => ["foo", 1, { :bat => "bar" }]) }.to raise_error(ArgumentError, /Message class must be a String representation of the class name/)
+          context 'with an incorrect class type' do
+            it 'raises an ArgumentError' do
+              expect { client.push(class: DummyClass, args: ['foo', 1, { bat: 'bar' }]) }.to raise_error(ArgumentError, /Message class must be a String representation of the class name/)
             end
           end
 
         end
 
         # eg singular and batch
-        args = [[{:bat => "bar"}],[[{:bat => "bar"}],[{:bat => "foo"}]]]
+        args = [[{ bat: 'bar' }], [[{ bat: 'bar' }], [{ bat: 'foo' }]]]
         args.each do |args|
 
           context "with args #{args}" do
@@ -81,13 +81,13 @@ describe Rubykiq::Client do
                   connection.flushdb
                 end
 
-                expect { client.push(:class => "MyWorker", :args => args) }.to change {
-                  client.connection_pool do |connection| connection.llen("queue:default"); end
+                expect { client.push(class: 'MyWorker', args: args) }.to change {
+                  client.connection_pool do |connection| connection.llen('queue:default'); end
                 }.from(0).to(args.length)
 
-                raw_jobs = client.connection_pool do |connection| connection.lrange("queue:default", 0, args.length); end
+                raw_jobs = client.connection_pool do |connection| connection.lrange('queue:default', 0, args.length); end
                 raw_jobs.each do |job|
-                  job = MultiJson.decode(job, :symbolize_keys => true)
+                  job = MultiJson.decode(job, symbolize_keys: true)
                   expect(job).to have_key(:jid)
                 end
 
@@ -96,10 +96,10 @@ describe Rubykiq::Client do
             end
 
             # eg with a variety of different time types
-            times = [ Time.now, DateTime.now, Time.now.utc.iso8601, Time.now.to_f ]
+            times = [Time.now, DateTime.now, Time.now.utc.iso8601, Time.now.to_f]
             times.each do |time|
 
-              context "with time #{time} ( #{time.class} )" do
+              context "with time #{time} (#{time.class})" do
 
                 it "should create #{args.length} job(s)" do
 
@@ -109,13 +109,13 @@ describe Rubykiq::Client do
                       connection.flushdb
                     end
 
-                    expect { client.push(:class => "MyWorker", :args => args, :at => time) }.to change {
-                      client.connection_pool do |connection| connection.zcard("schedule"); end
+                    expect { client.push(class: 'MyWorker', args: args, at: time) }.to change {
+                      client.connection_pool do |connection| connection.zcard('schedule'); end
                     }.from(0).to(args.length)
 
-                    raw_jobs = client.connection_pool do |connection| connection.zrange("schedule", 0, args.length); end
+                    raw_jobs = client.connection_pool do |connection| connection.zrange('schedule', 0, args.length); end
                     raw_jobs.each do |job|
-                      job = MultiJson.decode(job, :symbolize_keys => true)
+                      job = MultiJson.decode(job, symbolize_keys: true)
                       expect(job).to have_key(:at)
                       expect(job[:at]).to be_within(1).of(Time.now.to_f)
                     end
@@ -138,4 +138,4 @@ describe Rubykiq::Client do
 
   end
 
-end
+end

data/spec/unit/connection_spec.rb

@@ -1,11 +1,11 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Rubykiq::Connection do
 
   describe :defaults do
     subject { Rubykiq::Connection.new }
     its(:namespace) { should be_nil }
-    its(:host) { should eq "localhost" }
+    its(:host) { should eq 'localhost' }
     its(:port) { should be 6379 }
     its(:db) { should be 0 }
     its(:password) { should be_nil }
@@ -14,15 +14,15 @@ describe Rubykiq::Connection do
   describe :options do
 
     context :custom do
-      subject { Rubykiq::Connection.new(:namespace => "yyy") }
-      its(:namespace) { should eq "yyy" }
+      subject { Rubykiq::Connection.new(namespace: 'yyy') }
+      its(:namespace) { should eq 'yyy' }
     end
 
     context :inherited_settings do
-      it "should work" do
-        client = Rubykiq::Client.new(:namespace => "xxx")
+      it 'should work' do
+        client = Rubykiq::Client.new(namespace: 'xxx')
         client.connection_pool do |connection|
-          expect(connection.namespace).to eq "xxx"
+          expect(connection.namespace).to eq 'xxx'
         end
       end
     end
@@ -32,7 +32,7 @@ describe Rubykiq::Connection do
   describe :env do
     subject { Rubykiq::Connection.new }
 
-    [{:name => "REDISTOGO_URL", :value => "redistogo"}, {:name => "REDIS_PROVIDER", :value => "redisprovider"}, {:name => "REDIS_URL", :value => "redisurl"} ].each do | test_case |
+    [{ name: 'REDISTOGO_URL', value: 'redistogo' }, { name: 'REDIS_PROVIDER', value: 'redisprovider' }, { name: 'REDIS_URL', value: 'redisurl' }].each do | test_case |
       context "with ENV[#{test_case[:name]}]" do
         before do
           ENV[test_case[:name]] = "redis://#{test_case[:value]}:6379/0"
@@ -46,4 +46,4 @@ describe Rubykiq::Connection do
 
   end
 
-end
+end

data/spec/unit/rubykiq_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Rubykiq do
 
@@ -22,10 +22,10 @@ describe Rubykiq do
 
     describe key do
       subject { Rubykiq }
-      it {should respond_to key }
-      it {should respond_to "#{key}=".to_sym }
+      it { should respond_to key }
+      it { should respond_to "#{key}=".to_sym }
     end
 
   end
 
-end
+end

metadata

@@ -1,83 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rubykiq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Karl Freeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Sidekiq agnostic enqueuing using Redis
@@ -89,7 +75,7 @@ extra_rdoc_files: []
 files:
 - .document
 - .gitignore
-- .rspec
+- .rubocop.yml
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -120,17 +106,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Sidekiq agnostic enqueuing using Redis

data/.rspec

@@ -1,3 +0,0 @@
---color
---order random
---format RSpec::Smart::Formatter