resque_solo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feb410b406d869198268c9ef1deb8ab9bdfab083
-  data.tar.gz: 0dce7d025d84ca420bdf552d671afb85e8a547ee
+  metadata.gz: c1ef30a085579575c5f402c14e17dcc5ea978422
+  data.tar.gz: 6a836d44d8a6b97145576eb7431a3d7a46b4280d
 SHA512:
-  metadata.gz: 981aff663802860c105b0f14ebcc1296b2a2505b8dc8a0914a82f47ad1024c16929dec8854466c4f5c0fb1334ba26073d350bca965c82dc9c984a39873bcc6b1
-  data.tar.gz: eb8082e18db68b11ba43c88b409954e689bdc16f6d0e9757215a877b89b4f3fc0068399a21b0809c96f5c533884bb0bfbeb69bf565a8f1567042eaa449047c06
+  metadata.gz: feb8bebe5927a2a4d44333a01cd975f462b81d4a65383f2b3ea3a985937f37020269a1a2b13fe2fca6a1531600f715c35a85a24f118944f005a3993b1e720ed8
+  data.tar.gz: 0bce6bcf55e8cb0fe344257b722d724430a4ce9025f850071e9284f5801fcda1bcb8ee4bb9a9b96eb03a86e41d9a69e66e645a9bf5cd29e24f2fb3f0961f4982

data/Gemfile

@@ -7,6 +7,7 @@ group :test do
   gem 'pry'
   gem 'pry-byebug', platform: :mri_20
   gem 'fakeredis'
+  gem 'simplecov', require: false
 end
 
 gemspec

data/LICENSE.txt

@@ -19,7 +19,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-Copyright (c) 2013 Tee Parham
+Copyright (c) 2013 Neighborland, Inc.
 
 MIT License
 

data/README.md

@@ -1,10 +1,10 @@
 # ResqueSolo
 
 [![Gem Version](https://badge.fury.io/rb/resque_solo.png)][gem]
-[![Build Status](https://api.travis-ci.org/teeparham/resque_solo.png)][build]
+[![Build Status](https://api.travis-ci.org/neighborland/resque_solo.png)][build]
 
 [gem]: http://badge.fury.io/rb/resque_solo
-[build]: https://travis-ci.org/teeparham/resque_solo
+[build]: https://travis-ci.org/neighborland/resque_solo
 
 ResqueSolo is a resque plugin to add unique jobs to resque.
 

data/lib/resque_ext/job.rb

@@ -1,13 +1,13 @@
 module Resque
   class Job
     class << self
-      # Mark an item as queued after Resque::Job.create has called Resque.push
+      # Mark an item as queued
       def create_solo(queue, klass, *args)
-        return create_without_solo(queue, klass, *args) if Resque.inline?
         item = {class: klass.to_s, args: args}
+        return create_without_solo(queue, klass, *args) if Resque.inline? || !ResqueSolo::Queue.is_unique?(item)
         return "EXISTED" if ResqueSolo::Queue.queued?(queue, item)
-        # multi returns array of keys
         create_return_value = false
+        # redis transaction block
         Resque.redis.multi do
           create_return_value = create_without_solo(queue, klass, *args)
           ResqueSolo::Queue.mark_queued(queue, item)
@@ -22,8 +22,7 @@ module Resque
         item
       end
 
-      # Mark all destroyed jobs as unqueued.
-      # The original method only returns the amount of jobs destroyed, but not the jobs themselves.
+      # Mark destroyed jobs as unqueued
       def destroy_solo(queue, klass, *args)
         ResqueSolo::Queue.destroy(queue, klass, *args) unless Resque.inline?
         destroy_without_solo(queue, klass, *args)

data/lib/resque_solo/queue.rb

@@ -75,8 +75,8 @@ module ResqueSolo
       end
 
       def const_for(item)
-        const_get item_class(item)
+        Resque::Job.new(nil, nil).constantize item_class(item)
       end
     end
   end
-end
+end

data/lib/resque_solo/version.rb

@@ -1,3 +1,3 @@
 module ResqueSolo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/resque_solo.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = %w(tee@neighborland.com)
   spec.description   = %q{Resque plugin to add unique jobs}
   spec.summary       = %q{Resque plugin to add unique jobs}
-  spec.homepage      = "https://github.com/teeparham/resque_solo"
+  spec.homepage      = "https://github.com/neighborland/resque_solo"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/test/queue_test.rb

@@ -1,5 +1,57 @@
 require 'test_helper'
 
-class QueueTest < Test::Unit::TestCase
+module ResqueSolo
+  class QueueTest < Test::Unit::TestCase
+    context ".is_unique?" do
+      should "be false for non-unique job" do
+        refute Queue.is_unique?(class: 'FakeJob')
+      end
+  
+      should "be false for invalid job class" do
+        refute Queue.is_unique?(class: 'InvalidJob')
+      end
+  
+      should "be true for unique job" do
+        assert Queue.is_unique?(class: 'FakeUniqueJob')
+      end
+    end
+    
+    context ".item_ttl" do
+      should "be -1 for non-unique job" do
+        assert_equal -1, Queue.item_ttl(class: 'FakeJob')
+      end
 
-end
+      should "be -1 for invalid job class" do
+        assert_equal -1, Queue.item_ttl(class: 'InvalidJob')
+      end
+
+      should "be -1 for unique job" do
+        assert_equal -1, Queue.item_ttl(class: 'FakeUniqueJob')
+      end
+
+      should "be job TTL" do
+        assert_equal 300, UniqueJobWithTtl.ttl
+        assert_equal 300, Queue.item_ttl(class: 'UniqueJobWithTtl')
+      end
+    end
+
+    context ".lock_after_execution_period" do
+      should "be 0 for non-unique job" do
+        assert_equal 0, Queue.lock_after_execution_period(class: 'FakeJob')
+      end
+
+      should "be 0 for invalid job class" do
+        assert_equal 0, Queue.lock_after_execution_period(class: 'InvalidJob')
+      end
+
+      should "be 0 for unique job" do
+        assert_equal 0, Queue.lock_after_execution_period(class: 'FakeUniqueJob')
+      end
+
+      should "be job lock period" do
+        assert_equal 150, UniqueJobWithLock.lock_after_execution_period
+        assert_equal 150, Queue.lock_after_execution_period(class: 'UniqueJobWithLock')
+      end
+    end
+  end
+end

data/test/resque_test.rb

@@ -5,6 +5,12 @@ class ResqueTest < Test::Unit::TestCase
     Resque.redis.flushall
   end
 
+  should "be a valid plugin" do
+    assert_nothing_raised do
+      Resque::Plugin.lint(Resque::Plugins::UniqueJob)
+    end
+  end
+
   should "enqueue normal jobs" do
     Resque.enqueue FakeJob, "x"
     Resque.enqueue FakeJob, "x"

data/test/test_helper.rb

@@ -1,3 +1,8 @@
+if ENV['SIMPLE_COV']
+  require 'simplecov'
+  SimpleCov.start
+end
+
 require 'test/unit'
 require 'shoulda-context'
 require 'mocha/setup'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_solo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -79,7 +79,7 @@ files:
 - test/resque_test.rb
 - test/test_helper.rb
 - test/unique_job_test.rb
-homepage: https://github.com/teeparham/resque_solo
+homepage: https://github.com/neighborland/resque_solo
 licenses:
 - MIT
 metadata: {}