sidetiq 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9aeea39b2397a68571939038f6aa704d7d82ea2
-  data.tar.gz: 96f94bd883e67ecab0d63ce4a7afaa655e67fa00
+  metadata.gz: 3baafa1fdc03a9ebae36e49a19cc51c4480ff400
+  data.tar.gz: 96e849289c2324d0942014256e3ff2de5748dd64
 SHA512:
-  metadata.gz: 24a9e7de6f0e33660867a0eaab73139a0509339e0e34b0691656026a671a8ef0aea4bd01522660b457146339a908fe7a583782d26b2d5d9000b4c24fe07f804e
-  data.tar.gz: 1913b8bd90640e4a0574b6b7555fd7c601b23b03bf4ac9d8ccfc4594393ad4b24d6d28d3959b7a7d899c92b2a3a73ec32e18260650ecceae3b4d5d05907e6145
+  metadata.gz: 57d0a387e531eb91be1bb19266e4e2a9fd2e84e9da0658d5d7c955bb977ef548385b72db30201f3f07956796017f3e1d705ac91a14e0363c8b4899f5e860fb93
+  data.tar.gz: 5e56ab0f15722182c346c5e97a4c6d4211522a634e61bcd281aeaa146b35c2d3873ff8ef7ee13bd37c572608954cd8beb182a02e3dfef2f2f600e97b5ad94595

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.4.1
+-----
+
+- Use Sidekiq's JSON wrappers instead of the json gem directly.
+- Allow tick used by Clock#tick to be overridden.
+- Bump Sidekiq dependency to >= 2.15.0
+
 0.4.0
 -----
 

data/README.md

@@ -1,5 +1,5 @@
-Sidetiq
-=======
+![Sidetiq](http://f.cl.ly/items/1W3k0R2V2x3n3S1t1M0B/sidetiq.png)
+=========
 
 [![Build Status](https://travis-ci.org/tobiassvn/sidetiq.png)](https://travis-ci.org/tobiassvn/sidetiq)
 [![Dependency Status](https://gemnasium.com/tobiassvn/sidetiq.png)](https://gemnasium.com/tobiassvn/sidetiq)
@@ -13,14 +13,16 @@ Overview
 
 Sidetiq provides a simple API for defining recurring workers for Sidekiq.
 
-- Cuncurrency and fault-tolerance using Celluloid actors.
+- Concurrency and fault-tolerance using Celluloid actors.
 
-- Flexible DSL based on [ice_cube](http://seejohnrun.github.com/ice_cube/)
+- Flexible DSL based on [ice_cube](http://seejohnrun.github.com/ice_cube/).
 
 - Distributed, Redis-based locking to synchronize multiple Sidetiq processes.
 
 - Web extension with extensive monitoring of recurring jobs.
 
+- Sidetiq runs in your Sidekiq processes. No extra resources required.
+
 Usage
 -----
 

data/lib/sidetiq/clock.rb

@@ -42,8 +42,7 @@ module Sidetiq
     #   # => Hash of Sidetiq::Schedule objects
     #
     # Returns a hash of Sidetiq::Schedule instances.
-    def tick
-      tick = gettime
+    def tick(tick = gettime)
       Sidetiq.workers.each do |worker|
         Sidetiq.handler.dispatch(worker, tick)
       end

data/lib/sidetiq/lock/meta_data.rb

@@ -13,12 +13,12 @@ module Sidetiq
         end
 
         def from_json(json = "")
-          # Avoid TypeError when nil is passed to JSON.parse.
+          # Avoid TypeError when nil is passed to Sidekiq.load_json.
           json = "" if json.nil?
 
-          hash = JSON.parse(json, symbolize_names: true)
+          hash = Sidekiq.load_json(json).symbolize_keys
           new(hash)
-        rescue JSON::ParserError => e
+        rescue StandardError => e
           if json != ""
             # Looks like garbage lock metadata, so report it.
             handle_exception(e, context: "Garbage lock meta data detected: #{json}")

data/lib/sidetiq/middleware/history.rb

@@ -41,7 +41,7 @@ module Sidetiq
         Sidekiq.redis do |redis|
           list_name = "sidetiq:#{worker.class.name}:history"
 
-          redis.lpush(list_name, JSON.dump(entry))
+          redis.lpush(list_name, Sidekiq.dump_json(entry))
           redis.ltrim(list_name, 0, Sidetiq.config.worker_history - 1)
         end
       end

data/lib/sidetiq/version.rb

@@ -8,7 +8,7 @@ module Sidetiq
     MINOR = 4
 
     # Public: Sidetiq patch level.
-    PATCH = 0
+    PATCH = 1
 
     # Public: Sidetiq version suffix.
     SUFFIX = nil

data/lib/sidetiq/views/history.erb

@@ -19,7 +19,7 @@
         </thead>
 
         <% @history.each do |entry| %>
-        <% entry = JSON.parse(entry, symbolize_names: true) %>
+        <% entry = Sidekiq.load_json(entry).symbolize_keys %>
         <tr class="<%= 'error' if entry[:status] == 'failure' %>">
           <td><%= entry[:status].capitalize %></td>
           <td><%= Time.parse(entry[:timestamp]).strftime("%m/%d/%Y %I:%M:%S%p") %></td>

data/sidetiq.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.extensions    = []
 
-  gem.add_dependency 'sidekiq',   '~> 2.14.0'
+  gem.add_dependency 'sidekiq',   '~> 2.15.0'
   gem.add_dependency 'celluloid', '>= 0.14.1'
   gem.add_dependency 'ice_cube',  '~> 0.11.0'
-  gem.add_dependency 'json'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'sinatra'

data/test/helper.rb

@@ -34,13 +34,13 @@ end
 class Sidekiq::Client
   # Sidekiq testing helper now overwrites raw_push so we need to use
   # raw_push_old below to keep tests as is.
-  # https://github.com/mperham/sidekiq/blob/v2.12.4/lib/sidekiq/client.rb#L39
+  # https://github.com/mperham/sidekiq/blob/master/lib/sidekiq/testing.rb
   def self.push_old(item)
     normed = normalize_item(item)
     payload = process_single(item['class'], normed)
 
     pushed = false
-    pushed = raw_push_old([payload]) if payload
+    pushed = self.__send__(:raw_push_real, [payload]) if payload
     pushed ? payload['jid'] : nil
   end
 end

data/test/test_history.rb

@@ -13,7 +13,7 @@ class TestHistory < Sidetiq::TestCase
       redis.lrange('sidetiq:TestHistory::HistoryWorker:history', 0, -1)
     end
 
-    actual = JSON.parse(entry[0], symbolize_names: true)
+    actual = Sidekiq.load_json(entry[0]).symbolize_keys
 
     assert_equal 'success', actual[:status]
 
@@ -37,7 +37,7 @@ class TestHistory < Sidetiq::TestCase
       redis.lrange('sidetiq:TestHistory::HistoryWorker:history', 0, -1)
     end
 
-    actual = JSON.parse(entry[0], symbolize_names: true)
+    actual = Sidekiq.load_json(entry[0]).symbolize_keys
 
     assert_equal 'failure', actual[:status]
 

data/test/test_lock_meta_data.rb

@@ -78,7 +78,7 @@ class TestLockMetaData < Sidetiq::TestCase
     hash = { timestamp: 42, owner: "me", key: "foobar" }
     md = Sidetiq::Lock::MetaData.new(hash)
 
-    assert_equal hash, JSON.parse(md.to_json, symbolize_names: true)
+    assert_equal hash, Sidekiq.load_json(md.to_json).symbolize_keys
   end
 
   def test_to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidetiq
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tobias Svensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.15.0
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement