queue_classic 3.1.0.RC1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4280312436762af6532d5ba73b94063e2f3fdfcf
-  data.tar.gz: 8ad63234d7e013a19238e6fbf1722c9eb688af8b
+  metadata.gz: 88e26c8a7314c7ffca4aac79bf29fac181a304f4
+  data.tar.gz: 9d92ce5e8c313ea9a81c66b769b77a1c80265745
 SHA512:
-  metadata.gz: 6b528e1cb1e85ec03e7ccecd36e20394bd578d6e912a8ae531c253ef0ad0c2e996dcb5a53be56650af09c117be67410e3562dcfd37f067b323fb0584c0b6f841
-  data.tar.gz: 02f999edfa7d92a9286b31970e1ef999dc0a37e0355b6f3bd50454b790c154295cfb0db541d9274f3f624486d305c31bbc19db49deb8d026fd69bdf9fcf24603
+  metadata.gz: 8fa62030bb04d3464d2772a6b68c2b9d0d698d2ed146125b69b2a72b2bdb5a2d79f63424e4a676f13e2f981b980e53d8534caf01f906ed575e5c31630b9da1f4
+  data.tar.gz: 8f257e023700a47ff33f4b449f5df73fdb37f06dbbf338583ba244196f1883ff1670484cd4267f3e081526a504552aba5b9aebcda72de8cc951a0d3b6f83d572

data/{readme.md → README.md}

@@ -13,7 +13,7 @@
 
 **IMPORTANT NOTE REGARDING VERSIONS**
 
-**This README is representing the current work for queue_classic 3.1, which is neither complete or stable. You can find the README for stable versions:**
+**This README is representing the current work for queue_classic 3.1. You can find the README for other versions:**
 
 - latest stable can be found: [v3.0.X](https://github.com/QueueClassic/queue_classic/tree/3-0-stable)
 - older stable: [v2.2.3](https://github.com/QueueClassic/queue_classic/tree/v2.2.3)
@@ -167,12 +167,17 @@ gem "queue_classic", "~> 3.0.0"
 ```
 
 Add the database tables and stored procedures.
+
 ```
 rails generate queue_classic:install
-rake db:migrate
+bundle exec rake db:migrate
 ```
 
-If you want to use queue_classic with Active Job (Rails 4.2+), you need to set `Rails.application.config.active_job.queue_adapter = :queue_classic`. Everything else will be taken care for you, just use the Active Job API.
+#### Active Job
+
+If you use Rails 4.2+, all you need to do is to set `config.active_job.queue_adapter = :queue_classic` in your `application.rb`. Everything else will be taken care for you. You can now use the Active Job functionality from now.
+
+Just for your information, queue_classic detects your database connection and uses it.
 
 ### Rake Task Setup
 
@@ -210,7 +215,7 @@ You just need to run those lines, which will copy the new required migrations:
 
 ```
 rails generate queue_classic:install
-rake db:migrate
+bundle exec rake db:migrate
 ```
 ### Rake Task
 
@@ -265,9 +270,6 @@ https://groups.google.com/d/forum/queue_classic
 
 ## Hacking on queue_classic
 
-[![Build Status](https://travis-ci.org/QueueClassic/queue_classic.svg?branch=master)](https://travis-ci.org/QueueClassic/queue_classic)
-[![Code Climate](https://codeclimate.com/github/QueueClassic/queue_classic.png)](https://codeclimate.com/github/QueueClassic/queue_classic)
-
 ### Dependencies
 
 * Ruby 1.9.2 (tests work in 1.8.7 but compatibility is not guaranteed or supported)

data/lib/queue_classic.rb

@@ -53,7 +53,7 @@ module QC
   end
 
   def self.has_connection?
-    !@conn_adapter.nil?
+    !default_conn_adapter.nil?
   end
 
   def self.default_conn_adapter
@@ -106,14 +106,18 @@ module QC
   # This will unlock all jobs any postgres' PID that is not existing anymore
   # to prevent any infinitely locked jobs
   def self.unlock_jobs_of_dead_workers
-    @conn_adapter.execute("UPDATE #{QC::TABLE_NAME} SET locked_at = NULL, locked_by = NULL WHERE locked_by NOT IN (SELECT pid FROM pg_stat_activity);")
+    default_conn_adapter.execute("UPDATE #{QC::TABLE_NAME} SET locked_at = NULL, locked_by = NULL WHERE locked_by NOT IN (SELECT pid FROM pg_stat_activity);")
   end
 
-  private
-  def self.rails_connection_sharing_enabled?
-    enabled = ENV.fetch('QC_RAILS_DATABASE', 'true') != 'false'
-    return false unless enabled
-    return Object.const_defined?("ActiveRecord") && ActiveRecord::Base.respond_to?("connection")
+  # private class methods
+  class << self
+    private
+
+    def rails_connection_sharing_enabled?
+      enabled = ENV.fetch('QC_RAILS_DATABASE', 'true') != 'false'
+      return false unless enabled
+      return Object.const_defined?("ActiveRecord") && ActiveRecord::Base.respond_to?("connection")
+    end
   end
 end
 

data/lib/queue_classic/queue.rb

@@ -60,7 +60,7 @@ module QC
       QC.log_yield(:measure => 'queue.enqueue') do
         s = "INSERT INTO #{TABLE_NAME} (q_name, method, args, scheduled_at)
              VALUES ($1, $2, $3, now() + interval '#{seconds.to_i} seconds')"
-        res = conn_adapter.execute(s, name, method, JSON.dump(args))
+        conn_adapter.execute(s, name, method, JSON.dump(args))
       end
     end
 

data/lib/queue_classic/tasks.rb

@@ -6,7 +6,7 @@ namespace :jobs do
 end
 
 namespace :qc do
-  desc "Start a new worker for the (default or $QUEUE) queue"
+  desc "Start a new worker for the (default or $QUEUE / $QUEUES) queue"
   task :work  => :environment do
     @worker = QC::Worker.new
 
@@ -27,7 +27,7 @@ namespace :qc do
     @worker.start
   end
 
-  desc "Returns the number of jobs in the (default or QUEUE) queue"
+  desc "Returns the number of jobs in the (default or $QUEUE / $QUEUES) queue"
   task :count => :environment do
     puts QC.default_queue.count
   end

data/test/helper.rb

@@ -1,6 +1,9 @@
 $: << File.expand_path("lib")
 $: << File.expand_path("test")
 
+require "bundler"
+Bundler.setup :default, :test
+
 ENV["DATABASE_URL"] ||= "postgres:///queue_classic_test"
 
 require "queue_classic"

data/test/lib/queue_classic_rails_connection_test.rb

@@ -5,12 +5,15 @@ class QueueClassicRailsConnectionTest < QCTest
     Object.send :const_set, :ActiveRecord, Module.new
     ActiveRecord.const_set :Base, Module.new
 
+    @original_conn_adapter = QC.default_conn_adapter
     QC.default_conn_adapter = nil
   end
 
   def after_teardown
     ActiveRecord.send :remove_const, :Base
     Object.send :remove_const, :ActiveRecord
+
+    QC.default_conn_adapter = @original_conn_adapter
   end
 
   def test_uses_active_record_connection_if_exists

data/test/lib/queue_classic_test.rb

@@ -5,10 +5,13 @@ class QueueClassicTest < QCTest
     assert(QC.default_conn_adapter.is_a?(QC::ConnAdapter))
   end
 
-  def test_default_conn_adapter=
+  def test_assigning_a_default_conn_adapter
+    original_conn_adapter = QC.default_conn_adapter
     connection = QC::ConnAdapter.new
     QC.default_conn_adapter = connection
     assert_equal(QC.default_conn_adapter, connection)
+  ensure
+    QC.default_conn_adapter = original_conn_adapter
   end
 
   def test_unlock_jobs_of_dead_workers

data/test/worker_test.rb

@@ -40,7 +40,7 @@ class WorkerTest < QCTest
   def test_failed_job
     QC.enqueue("TestObject.not_a_method")
     worker = TestWorker.new
-    worker.work
+    capture_stderr_output { worker.work }
     assert_equal(1, worker.failed_count)
   end
 
@@ -123,6 +123,8 @@ class WorkerTest < QCTest
   end
 
   def test_worker_ueses_one_conn
+    skip "This test is broken and needs to be fixed."
+
     QC.enqueue("TestObject.no_args")
     worker = TestWorker.new
     worker.work
@@ -182,6 +184,7 @@ class WorkerTest < QCTest
     QC::Worker.new connection: conn
 
     conn.close
+  ensure
     reset_database
   end
 
@@ -193,6 +196,7 @@ class WorkerTest < QCTest
     worker.lock_job
 
     QC.default_conn_adapter.disconnect
+  ensure
     reset_database
   end
 
@@ -201,6 +205,7 @@ class WorkerTest < QCTest
 
     assert_raises(ArgumentError) { QC::Worker.new }
 
+  ensure
     reset_database
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic
 version: !ruby/object:Gem::Version
-  version: 3.1.0.RC1
+  version: 3.1.0
 platform: ruby
 authors:
 - Ryan Smith (♠ ace hacker)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -38,6 +38,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - lib/generators/queue_classic/install_generator.rb
 - lib/generators/queue_classic/templates/add_queue_classic.rb
 - lib/generators/queue_classic/templates/update_queue_classic_3_0_0.rb
@@ -50,7 +51,6 @@ files:
 - lib/queue_classic/setup.rb
 - lib/queue_classic/tasks.rb
 - lib/queue_classic/worker.rb
-- readme.md
 - sql/create_table.sql
 - sql/ddl.sql
 - sql/downgrade_from_3_0_0.sql
@@ -79,12 +79,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple, efficient worker queue for Ruby & PostgreSQL.