queue_classic 3.1.0 → 3.2.0.RC1

data/test/helper.rb

@@ -1,12 +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"
+require_relative '../lib/queue_classic'
 require "stringio"
 require "minitest/autorun"
 
@@ -51,4 +48,14 @@ class QCTest < Minitest::Test
     $stdout = original_stdout
   end
 
+  def with_env(temporary_environment)
+    original_environment = {}
+    temporary_environment.each do |name, value|
+      original_environment[name] = ENV[name]
+      ENV[name] = value
+    end
+    yield
+  ensure
+    original_environment.each { |name, value| ENV[name] = value }
+  end
 end

data/test/helper.sql

@@ -0,0 +1,25 @@
+DO $$
+-- Set initial sequence to a large number to test the entire toolchain
+-- works on integers with higher bits set.
+DECLARE
+    quoted_name text;
+    quoted_size text;
+BEGIN
+    -- Find the name of the relevant sequence.
+    --
+    -- pg_get_serial_sequence quotes identifiers as part of its
+    -- behavior.
+    SELECT name
+    INTO STRICT quoted_name
+    FROM pg_get_serial_sequence('queue_classic_jobs', 'id') AS name;
+
+    -- Don't quote, because ALTER SEQUENCE RESTART doesn't like
+    -- general literals, only unquoted numeric literals.
+    SELECT pow(2, 34)::text AS size
+    INTO STRICT quoted_size;
+
+    EXECUTE 'ALTER SEQUENCE ' || quoted_name ||
+        ' RESTART ' || quoted_size || ';';
+END;
+$$;
+

data/test/lib/queue_classic_rails_connection_test.rb

@@ -22,10 +22,10 @@ class QueueClassicRailsConnectionTest < QCTest
   end
 
   def test_does_not_use_active_record_connection_if_env_var_set
-    ENV['QC_RAILS_DATABASE'] = 'false'
-    connection = get_connection
-    assert_raises(MockExpectationError) { connection.verify }
-    ENV['QC_RAILS_DATABASE'] = 'true'
+    with_env 'QC_RAILS_DATABASE' => 'false' do
+      connection = get_connection
+      assert_raises(MockExpectationError) { connection.verify }
+    end
   end
 
   private

data/test/lib/queue_classic_test.rb

@@ -1,6 +1,13 @@
 require File.expand_path("../../helper.rb", __FILE__)
 
 class QueueClassicTest < QCTest
+  def test_only_delegate_calls_to_queue_it_understands
+    e = assert_raises(NoMethodError) do
+      QC.probably_not
+    end
+    assert_match "undefined method `probably_not' for QC:Module", e.message
+  end
+
   def test_default_conn_adapter_default_value
     assert(QC.default_conn_adapter.is_a?(QC::ConnAdapter))
   end
@@ -17,11 +24,11 @@ class QueueClassicTest < QCTest
   def test_unlock_jobs_of_dead_workers
     # Insert a locked job
     adapter = QC::ConnAdapter.new
-    query = "INSERT INTO #{QC::TABLE_NAME} (q_name, method, args, locked_by, locked_at) VALUES ('whatever', 'Kernel.puts', '[\"ok?\"]', 0, (CURRENT_TIMESTAMP))"
+    query = "INSERT INTO #{QC.table_name} (q_name, method, args, locked_by, locked_at) VALUES ('whatever', 'Kernel.puts', '[\"ok?\"]', 0, (CURRENT_TIMESTAMP))"
     adapter.execute(query)
 
     # We should have no unlocked jobs
-    query_locked_jobs = "SELECT * FROM #{QC::TABLE_NAME} WHERE locked_at IS NULL"
+    query_locked_jobs = "SELECT * FROM #{QC.table_name} WHERE locked_at IS NULL"
     res = adapter.connection.exec(query_locked_jobs)
     assert_equal(0, res.count)
 

data/test/queue_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper.rb", __FILE__)
+require_relative 'helper'
 
 class QueueTest < QCTest
 
@@ -28,12 +28,14 @@ class QueueTest < QCTest
   end
 
   def test_lock_with_future_job_with_enqueue_in
+    now = Time.now
     QC.enqueue_in(2, "Klass.method")
     assert_nil QC.lock
     sleep 2
     job = QC.lock
     assert_equal("Klass.method", job[:method])
     assert_equal([], job[:args])
+    assert_equal((now + 2).to_i, job[:scheduled_at].to_i)
   end
 
   def test_lock_with_future_job_with_enqueue_at_with_a_time_object
@@ -44,6 +46,7 @@ class QueueTest < QCTest
     job = QC.lock
     assert_equal("Klass.method", job[:method])
     assert_equal([], job[:args])
+    assert_equal(future.to_i, job[:scheduled_at].to_i)
   end
 
   def test_lock_with_future_job_with_enqueue_at_with_a_float_timestamp
@@ -129,9 +132,50 @@ class QueueTest < QCTest
     QC.default_queue = nil
   end
 
+  def test_multi_threaded_server_can_specified_connection
+    adapter1 = QC::ConnAdapter.new
+    adapter2 = QC::ConnAdapter.new
+    q1 = q2 = nil
+
+    QC.default_conn_adapter = adapter1
+
+    t1 = Thread.new do
+      QC.default_conn_adapter = adapter1
+      q1 = QC::Queue.new('queue1').conn_adapter
+    end
+
+    t2 = Thread.new do
+      QC.default_conn_adapter = adapter2
+      q2 = QC::Queue.new('queue2').conn_adapter
+    end
+
+    t1.join
+    t2.join
+
+    assert_equal adapter1, q1
+    assert_equal adapter2, q2
+  end
+
+  def test_multi_threaded_server_each_thread_acquires_unique_connection
+    q1 = q2 = nil
+
+    t1 = Thread.new do
+      q1 = QC::Queue.new('queue1').conn_adapter
+    end
+
+    t2 = Thread.new do
+      q2 = QC::Queue.new('queue2').conn_adapter
+    end
+
+    t1.join
+    t2.join
+
+    refute_equal q1, q2
+  end
+
   def test_enqueue_triggers_notify
     adapter = QC.default_conn_adapter
-    adapter.execute('LISTEN "' + QC::QUEUE + '"')
+    adapter.execute('LISTEN "' + QC.queue + '"')
     adapter.send(:drain_notify)
 
     msgs = adapter.send(:wait_for_notify, 0.25)
@@ -142,4 +186,23 @@ class QueueTest < QCTest
     assert_equal(1, msgs.length)
   end
 
+  def test_enqueue_returns_job_id
+    enqueued_job = QC.enqueue("Klass.method")
+    locked_job = QC.lock
+    assert_equal enqueued_job, "id" => locked_job[:id]
+  end
+
+  def test_enqueue_in_returns_job_id
+    enqueued_job = QC.enqueue_in(1, "Klass.method")
+    sleep 1
+    locked_job = QC.lock
+    assert_equal enqueued_job, "id" => locked_job[:id]
+  end
+
+  def test_enqueue_at_returns_job_id
+    enqueued_job = QC.enqueue_at(Time.now + 1, "Klass.method")
+    sleep 1
+    locked_job = QC.lock
+    assert_equal enqueued_job, "id" => locked_job[:id]
+  end
 end

data/test/worker_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper.rb", __FILE__)
+require_relative 'helper'
 
 module TestObject
   extend self
@@ -27,7 +27,6 @@ class TestWorker < QC::Worker
 end
 
 class WorkerTest < QCTest
-
   def test_work
     QC.enqueue("TestObject.no_args")
     worker = TestWorker.new
@@ -122,7 +121,7 @@ class WorkerTest < QCTest
     t.join
   end
 
-  def test_worker_ueses_one_conn
+  def test_worker_uses_one_conn
     skip "This test is broken and needs to be fixed."
 
     QC.enqueue("TestObject.no_args")
@@ -178,50 +177,43 @@ class WorkerTest < QCTest
   end
 
   def test_init_worker_with_arg
-    set_database 'postgres:///invalid'
-
-    conn = PG::Connection.connect(dbname: 'queue_classic_test')
-    QC::Worker.new connection: conn
+    with_database 'postgres:///invalid' do
+      conn = PG::Connection.connect(dbname: 'queue_classic_test')
+      QC::Worker.new connection: conn
 
-    conn.close
-  ensure
-    reset_database
+      conn.close
+    end
   end
 
   def test_init_worker_with_database_url
-    set_database ENV['DATABASE_URL'] || ENV['QC_DATABASE_URL']
+    with_database ENV['DATABASE_URL'] || ENV['QC_DATABASE_URL'] do
+      worker = QC::Worker.new
+      QC.enqueue("TestObject.no_args")
+      worker.lock_job
 
-    worker = QC::Worker.new
-    QC.enqueue("TestObject.no_args")
-    worker.lock_job
-
-    QC.default_conn_adapter.disconnect
-  ensure
-    reset_database
+      QC.default_conn_adapter.disconnect
+    end
   end
 
   def test_init_worker_without_conn
-    set_database nil
-
-    assert_raises(ArgumentError) { QC::Worker.new }
-
-  ensure
-    reset_database
+    with_database nil do
+      assert_raises(ArgumentError) { QC::Worker.new }
+    end
   end
 
   private
 
-  def set_database(url)
-    @database_url = ENV['DATABASE_URL']
-    @qc_database_url = ENV['QC_DATABASE_URL']
+  def with_database(url)
+    original_conn_adapter = QC.default_conn_adapter
+    original_database_url = ENV['DATABASE_URL']
+    original_qc_database_url = ENV['QC_DATABASE_URL']
+
     ENV['DATABASE_URL'] = ENV['QC_DATABASE_URL'] = url
-    @conn_adapter = QC.default_conn_adapter
     QC.default_conn_adapter = nil
-  end
-
-  def reset_database
-    ENV['DATABASE_URL'] = @database_url
-    ENV['QC_DATABASE_URL'] = @qc_database_url
-    QC.default_conn_adapter = @conn_adapter
+    yield
+  ensure
+    ENV['DATABASE_URL'] = original_database_url
+    ENV['QC_DATABASE_URL'] = original_qc_database_url
+    QC.default_conn_adapter = original_conn_adapter
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0.RC1
 platform: ruby
 authors:
 - Ryan Smith (♠ ace hacker)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -38,19 +38,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
+- CONTRIBUTING.md
+- Gemfile
+- LICENSE.txt
 - README.md
+- Rakefile
+- changelog
 - 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
 - lib/generators/queue_classic/templates/update_queue_classic_3_0_2.rb
 - lib/generators/queue_classic/templates/update_queue_classic_3_1_0.rb
 - lib/queue_classic.rb
+- lib/queue_classic/config.rb
 - lib/queue_classic/conn_adapter.rb
 - lib/queue_classic/queue.rb
 - lib/queue_classic/railtie.rb
 - lib/queue_classic/setup.rb
 - lib/queue_classic/tasks.rb
+- lib/queue_classic/version.rb
 - lib/queue_classic/worker.rb
+- queue_classic.gemspec
 - sql/create_table.sql
 - sql/ddl.sql
 - sql/downgrade_from_3_0_0.sql
@@ -59,7 +69,9 @@ files:
 - sql/update_to_3_0_0.sql
 - sql/update_to_3_1_0.sql
 - test/benchmark_test.rb
+- test/config_test.rb
 - test/helper.rb
+- test/helper.sql
 - test/lib/queue_classic_rails_connection_test.rb
 - test/lib/queue_classic_test.rb
 - test/queue_test.rb
@@ -79,17 +91,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple, efficient worker queue for Ruby & PostgreSQL.
 test_files:
 - test/benchmark_test.rb
+- test/config_test.rb
+- test/helper.rb
+- test/helper.sql
 - test/lib/queue_classic_rails_connection_test.rb
 - test/lib/queue_classic_test.rb
 - test/queue_test.rb