resque_solo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc87df1fa353f94c1d75b20c2dc6ef9f5978637b
-  data.tar.gz: 51df2fed96c31280f6ed8fb64851529fc75fcda4
+  metadata.gz: 9e954b4d2492942672efaf828eda9cef99bae229
+  data.tar.gz: 4527347e8170f87fb2a16463eec8bda7bfaed3c6
 SHA512:
-  metadata.gz: 927e45014a436a39aba1017cbd153d43218f3d82bee878f88f1efbc0e0d0d86e854eb03b46a626df9ad377c77b73e2e76286e7c73fb314cd9466fa8ef4e1ccf6
-  data.tar.gz: ab499a6bb2587de31fd05a37d4092a59a79572d67e1349ff86d836066b85249be8d7505883935e187b81e25f5f2d3fa19055f4658f3e05b5a680bc45e90fde3c
+  metadata.gz: 0714a8209c9eddfef035591ccb049bf3d308827d015893067b2928ccf038c7b79a281ccb1f88ed60396446d7528a4270dd8ac87d9d152c9afb3887d61839157b
+  data.tar.gz: eadf6059eb2c9c59baefcb7d5c73d0caf11dfb911bd55514909bf2d86436f4e3609fc35f1e14a73f5f0953426f2e3a5b2785e46cd72a8470746c638924b18875

data/lib/resque_ext/job.rb

@@ -3,7 +3,7 @@ module Resque
     class << self
       # Mark an item as queued
       def create_solo(queue, klass, *args)
-        item = {class: klass.to_s, args: args}
+        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)
         create_return_value = false

data/lib/resque_ext/resque.rb

@@ -1,11 +1,11 @@
 module Resque
   class << self
     def enqueued?(klass, *args)
-      enqueued_in?(queue_from_class(klass), klass, *args )
+      enqueued_in?(queue_from_class(klass), klass, *args)
     end
 
     def enqueued_in?(queue, klass, *args)
-      item = {class: klass.to_s, args: args}
+      item = { class: klass.to_s, args: args }
       return nil unless ResqueSolo::Queue.is_unique?(item)
       ResqueSolo::Queue.queued?(queue, item)
     end

data/lib/resque_solo.rb

@@ -1,6 +1,6 @@
-require 'resque'
-require 'resque_ext/job'
-require 'resque_ext/resque'
-require 'resque_solo/version'
-require 'resque_solo/queue'
-require 'resque_solo/unique_job'
+require "resque"
+require "resque_ext/job"
+require "resque_ext/resque"
+require "resque_solo/version"
+require "resque_solo/queue"
+require "resque_solo/unique_job"

data/lib/resque_solo/queue.rb

@@ -53,8 +53,8 @@ module ResqueSolo
 
         redis.lrange(redis_queue, 0, -1).each do |string|
           json = Resque.decode(string)
-          next unless json['class'] == klass
-          next unless json['args'] == args if args.any?
+          next unless json["class"] == klass
+          next if args.any? && json["args"] != args
           ResqueSolo::Queue.mark_unqueued(queue, json)
         end
       end
@@ -64,14 +64,14 @@ module ResqueSolo
         redis.del(*keys) if keys.any?
       end
 
-    private
+      private
 
       def redis
         Resque.redis
       end
 
       def item_class(item)
-        item[:class] || item['class']
+        item[:class] || item["class"]
       end
 
       def const_for(item)

data/lib/resque_solo/unique_job.rb

@@ -1,4 +1,4 @@
-require 'digest/md5'
+require "digest/md5"
 
 module Resque
   module Plugins
@@ -31,7 +31,7 @@ module Resque
         #   end
         # end
         def ttl
-          @ttl || -1
+          @ttl ||= -1
         end
 
         # The default ttl of a persisting key is 0, i.e. immediately deleted.
@@ -45,7 +45,7 @@ module Resque
         #   end
         # end
         def lock_after_execution_period
-          @lock_after_execution_period || 0
+          @lock_after_execution_period ||= 0
         end
       end
     end

data/lib/resque_solo/version.rb

@@ -1,3 +1,3 @@
 module ResqueSolo
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_solo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,26 +87,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/resque_ext/job.rb
 - lib/resque_ext/resque.rb
 - lib/resque_solo.rb
 - lib/resque_solo/queue.rb
 - lib/resque_solo/unique_job.rb
 - lib/resque_solo/version.rb
-- resque_solo.gemspec
-- test/fake_jobs.rb
-- test/job_test.rb
-- test/queue_test.rb
-- test/resque_test.rb
-- test/test_helper.rb
-- test/unique_job_test.rb
 homepage: https://github.com/neighborland/resque_solo
 licenses:
 - MIT
@@ -127,15 +115,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Resque plugin to add unique jobs
-test_files:
-- test/fake_jobs.rb
-- test/job_test.rb
-- test/queue_test.rb
-- test/resque_test.rb
-- test/test_helper.rb
-- test/unique_job_test.rb
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,6 +0,0 @@
-.bundle
-.config
-Gemfile.lock
-coverage
-pkg
-tmp

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.1.1

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
-  - 2.1
-  - 2.0.0
-  - 1.9.3

data/Gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  unless ENV['TRAVIS']
-    gem 'pry-byebug', platform: :mri_21
-  end
-  gem 'simplecov', require: false
-end
-
-gemspec

data/Rakefile

@@ -1,12 +0,0 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-desc 'Run tests'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-task default: :test

data/resque_solo.gemspec

@@ -1,29 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'resque_solo/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "resque_solo"
-  spec.version       = ResqueSolo::VERSION
-  spec.authors       = ["Tee Parham"]
-  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/neighborland/resque_solo"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = []
-  spec.test_files    = spec.files.grep(%r{^(test|features)/})
-  spec.require_paths = %w(lib)
-
-  spec.required_ruby_version = ">= 1.9.3"
-
-  spec.add_dependency "resque", "~> 1.25.1"
-
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "fakeredis", "~> 0.4"
-  spec.add_development_dependency "minitest", "~> 5.3"
-  spec.add_development_dependency "rake", "~> 10.1"
-end

data/test/fake_jobs.rb

@@ -1,38 +0,0 @@
-class FakeJob
-  @queue = :normal
-end
-
-class FakeUniqueJob
-  include Resque::Plugins::UniqueJob
-  @queue = :unique
-
-  def self.perform(_)
-  end
-end
-
-class FailingUniqueJob
-  include Resque::Plugins::UniqueJob
-  @queue = :unique
-
-  def self.perform(_)
-    raise "Fail"
-  end
-end
-
-class UniqueJobWithTtl
-  include Resque::Plugins::UniqueJob
-  @queue = :unique_with_ttl
-  @ttl = 300
-
-  def self.perform(*_)
-  end
-end
-
-class UniqueJobWithLock
-  include Resque::Plugins::UniqueJob
-  @queue = :unique_with_lock
-  @lock_after_execution_period = 150
-
-  def self.perform(*_)
-  end
-end

data/test/job_test.rb

@@ -1,107 +0,0 @@
-require 'test_helper'
-
-class JobTest < MiniTest::Spec
-  before do
-    Resque.redis.flushall
-  end
-
-  it "enqueue identical jobs once" do
-    Resque.enqueue FakeUniqueJob, "x"
-    Resque.enqueue FakeUniqueJob, "x"
-    assert_equal 1, Resque.size(:unique)
-  end
-
-  it "allow the same jobs to be executed one after the other" do
-    Resque.enqueue FakeUniqueJob, "foo"
-    Resque.enqueue FakeUniqueJob, "foo"
-    assert_equal 1, Resque.size(:unique)
-    Resque.reserve(:unique)
-    assert_equal 0, Resque.size(:unique)
-    Resque.enqueue FakeUniqueJob, "foo"
-    Resque.enqueue FakeUniqueJob, "foo"
-    assert_equal 1, Resque.size(:unique)
-  end
-
-  it "consider equivalent hashes regardless of key order" do
-    Resque.enqueue FakeUniqueJob, bar: 1, foo: 2
-    Resque.enqueue FakeUniqueJob, foo: 2, bar: 1
-    assert_equal 1, Resque.size(:unique)
-  end
-
-  it "treat string and symbol keys equally" do
-    Resque.enqueue FakeUniqueJob, bar: 1, foo: 1
-    Resque.enqueue FakeUniqueJob, bar: 1, "foo" => 1
-    assert_equal 1, Resque.size(:unique)
-  end
-
-  it "mark jobs as unqueued, when Job.destroy is killing them" do
-    Resque.enqueue FakeUniqueJob, "foo"
-    Resque.enqueue FakeUniqueJob, "foo"
-    assert_equal 1, Resque.size(:unique)
-    Resque::Job.destroy(:unique, FakeUniqueJob)
-    assert_equal 0, Resque.size(:unique)
-    Resque.enqueue FakeUniqueJob, "foo"
-    Resque.enqueue FakeUniqueJob, "foo"
-    assert_equal 1, Resque.size(:unique)
-  end
-
-  it "mark jobs as unqueued when they raise an exception" do
-    2.times { Resque.enqueue( FailingUniqueJob, "foo" ) }
-    assert_equal 1, Resque.size(:unique)
-    worker = Resque::Worker.new(:unique)
-    worker.work 0
-    assert_equal 0, Resque.size(:unique)
-    2.times { Resque.enqueue( FailingUniqueJob, "foo" ) }
-    assert_equal 1, Resque.size(:unique)
-  end
-
-  it "report if a unique job is enqueued" do
-    Resque.enqueue FakeUniqueJob, "foo"
-    assert Resque.enqueued?(FakeUniqueJob, "foo")
-    refute Resque.enqueued?(FakeUniqueJob, "bar")
-  end
-
-  it "report if a unique job is enqueued in another queue" do
-    default_queue = FakeUniqueJob.instance_variable_get(:@queue)
-    FakeUniqueJob.instance_variable_set(:@queue, :other)
-    Resque.enqueue FakeUniqueJob, "foo"
-    assert Resque.enqueued_in?(:other, FakeUniqueJob, "foo")
-    FakeUniqueJob.instance_variable_set(:@queue, default_queue)
-    refute Resque.enqueued?(FakeUniqueJob, "foo")
-  end
-
-  it "cleanup when a queue is destroyed" do
-    Resque.enqueue FakeUniqueJob, "foo"
-    Resque.enqueue FailingUniqueJob, "foo"
-    Resque.remove_queue(:unique)
-    Resque.enqueue(FakeUniqueJob, "foo")
-    assert_equal 1, Resque.size(:unique)
-  end
-
-  it "honor ttl in the redis key" do
-    Resque.enqueue UniqueJobWithTtl
-    assert Resque.enqueued?(UniqueJobWithTtl)
-    keys = Resque.redis.keys "solo:queue:unique_with_ttl:job:*"
-    assert_equal 1, keys.length
-    assert_in_delta UniqueJobWithTtl.ttl, Resque.redis.ttl(keys.first), 2
-  end
-
-  it "not allow the same job to be enqueued after execution if lock_after_execution_period is set" do
-    Resque.enqueue UniqueJobWithLock, "foo"
-    Resque.enqueue UniqueJobWithLock, "foo"
-    assert_equal 1, Resque.size(:unique_with_lock)
-    Resque.reserve(:unique_with_lock)
-    assert_equal 0, Resque.size(:unique_with_lock)
-    Resque.enqueue UniqueJobWithLock, "foo"
-    assert_equal 0, Resque.size(:unique_with_lock)
-  end
-
-  it "honor lock_after_execution_period in the redis key" do
-    Resque.enqueue UniqueJobWithLock
-    Resque.reserve(:unique_with_lock)
-    keys = Resque.redis.keys "solo:queue:unique_with_lock:job:*"
-    assert_equal 1, keys.length
-    assert_in_delta UniqueJobWithLock.lock_after_execution_period, Resque.redis.ttl(keys.first), 2
-  end
-  
-end

data/test/queue_test.rb

@@ -1,57 +0,0 @@
-require 'test_helper'
-
-module ResqueSolo
-  class QueueTest < MiniTest::Spec
-    describe ".is_unique?" do
-      it "is false for non-unique job" do
-        refute Queue.is_unique?(class: 'FakeJob')
-      end
-  
-      it "is false for invalid job class" do
-        refute Queue.is_unique?(class: 'InvalidJob')
-      end
-  
-      it "is true for unique job" do
-        assert Queue.is_unique?(class: 'FakeUniqueJob')
-      end
-    end
-    
-    describe ".item_ttl" do
-      it "is -1 for non-unique job" do
-        assert_equal -1, Queue.item_ttl(class: 'FakeJob')
-      end
-
-      it "is -1 for invalid job class" do
-        assert_equal -1, Queue.item_ttl(class: 'InvalidJob')
-      end
-
-      it "is -1 for unique job" do
-        assert_equal -1, Queue.item_ttl(class: 'FakeUniqueJob')
-      end
-
-      it "is job TTL" do
-        assert_equal 300, UniqueJobWithTtl.ttl
-        assert_equal 300, Queue.item_ttl(class: 'UniqueJobWithTtl')
-      end
-    end
-
-    describe ".lock_after_execution_period" do
-      it "is 0 for non-unique job" do
-        assert_equal 0, Queue.lock_after_execution_period(class: 'FakeJob')
-      end
-
-      it "is 0 for invalid job class" do
-        assert_equal 0, Queue.lock_after_execution_period(class: 'InvalidJob')
-      end
-
-      it "is 0 for unique job" do
-        assert_equal 0, Queue.lock_after_execution_period(class: 'FakeUniqueJob')
-      end
-
-      it "is 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

@@ -1,26 +0,0 @@
-require 'test_helper'
-
-class ResqueTest < MiniTest::Spec
-  before do
-    Resque.redis.flushall
-  end
-
-  it "is a valid plugin" do
-    Resque::Plugin.lint(Resque::Plugins::UniqueJob)
-  end
-
-  it "enqueues normal jobs" do
-    Resque.enqueue FakeJob, "x"
-    Resque.enqueue FakeJob, "x"
-    assert_equal 2, Resque.size(:normal)
-  end
-
-  it "is not able to report if a non-unique job was enqueued" do
-    assert_nil Resque.enqueued?(FakeJob)
-  end
-
-  it "does not raise when deleting an empty queue" do
-    Resque.remove_queue(:unique)
-  end
-
-end

data/test/test_helper.rb

@@ -1,14 +0,0 @@
-if ENV['SIMPLE_COV']
-  require 'simplecov'
-  SimpleCov.start
-end
-
-require 'minitest/autorun'
-require 'resque_solo'
-require 'fake_jobs'
-require 'fakeredis'
-begin
-  require 'pry-byebug'
-rescue LoadError
-  # ignore
-end

data/test/unique_job_test.rb

@@ -1,5 +0,0 @@
-require 'test_helper'
-
-class UniqueJobTest < MiniTest::Spec
-
-end