queue_classic 2.1.1 → 2.1.2

data/lib/queue_classic.rb

@@ -61,6 +61,11 @@ module QC
     default_queue.send(sym, *args, &block)
   end
 
+  # Ensure QC.respond_to?(:enqueue) equals true (ruby 1.9 only)
+  def self.respond_to_missing?(method_name, include_private = false)
+    default_queue.respond_to?(method_name)
+  end
+
   def self.default_queue
     @default_queue ||= begin
       Queue.new(QUEUE)

data/lib/queue_classic/conn.rb

@@ -86,7 +86,7 @@ module QC
     def connect
       log(:at => "establish_conn")
       conn = PGconn.connect(
-        db_url.host,
+        db_url.host.gsub(/%2F/i, '/'), # host or percent-encoded socket path
         db_url.port || 5432,
         nil, '', #opts, tty
         db_url.path.gsub("/",""), # database name

data/lib/queue_classic/worker.rb

@@ -41,20 +41,11 @@ module QC
       Process.wait(@cpid)
     end
 
-    # This method will lock a job & evaluate the code defined by the job.
-    # Also, this method will make the best attempt to delete the job
-    # from the queue before returning.
+    # This method will lock a job & process the job.
     def work
       if job = lock_job
         QC.log_yield(:at => "work", :job => job[:id]) do
-          begin
-            call(job)
-          rescue => e
-            handle_failure(job, e)
-          ensure
-            @queue.delete(job[:id])
-            log(:at => "delete_job", :job => job[:id])
-          end
+          process(job)
         end
       end
     end
@@ -90,6 +81,21 @@ module QC
       job
     end
 
+    # A job is processed by evaluating the target code.
+    # Errors are delegated to the handle_failure method.
+    # Also, this method will make the best attempt to delete the job
+    # from the queue before returning.
+    def process(job)
+      begin
+        call(job)
+      rescue => e
+        handle_failure(job, e)
+      ensure
+        @queue.delete(job[:id])
+        log(:at => "delete_job", :job => job[:id])
+      end
+    end
+
     # Each job includes a method column. We will use ruby's eval
     # to grab the ruby object from memory. We send the method to
     # the object and pass the args.

data/readme.md

@@ -1,6 +1,6 @@
 # queue_classic
 
-v2.1.1
+v2.1.2
 
 queue_classic provides a simple interface to a PostgreSQL-backed message queue. queue_classic specializes in concurrent locking and minimizing database load while providing a simple, intuitive developer experience. queue_classic assumes that you are already using PostgreSQL in your production environment and that adding another dependency (e.g. redis, beanstalkd, 0mq) is undesirable.
 
@@ -47,7 +47,7 @@ QC.enqueue("Kernel.puts", {"hello" => "world"})
 QC.enqueue("Kernel.puts", ["hello", "world"])
 
 # This method uses a non-default queue.
-p_queue = QC::Queue.new(q_name: "priority_queue")
+p_queue = QC::Queue.new("priority_queue")
 p_queue.enqueue("Kernel.puts", ["hello", "world"])
 ```
 
@@ -83,7 +83,7 @@ $ bundle exec rake qc:work
 Setup a worker to work a non-default queue.
 
 ```bash
-$ QUEUE="p_queue" bundle exec rake qc:work
+$ QUEUE="priority_queue" bundle exec rake qc:work
 ```
 
 #### Custom Worker
@@ -110,13 +110,7 @@ worker = MyWorker.new(max_attempts: 10, listening_worker: true)
 loop do
 	job = worker.lock_job
 	Thread.new do
-		begin
-			Timeout::timeout(5) {worker.call(job)}
-		rescue => e
-			handle_failure(job, e)
-		ensure
-			worker.delete(job[:id])
-		end
+	  Timeout::timeout(5) { worker.process(job) }
 	end
 end
 ```

data/sql/create_table.sql

@@ -1,5 +1,5 @@
 CREATE TABLE queue_classic_jobs (
-  id serial PRIMARY KEY,
+  id bigserial PRIMARY KEY,
   q_name varchar(255),
   method varchar(255),
   args text,

data/sql/ddl.sql

@@ -6,7 +6,7 @@
 CREATE OR REPLACE FUNCTION lock_head(q_name varchar, top_boundary integer)
 RETURNS SETOF queue_classic_jobs AS $$
 DECLARE
-  unlocked integer;
+  unlocked bigint;
   relative_top integer;
   job_count integer;
 BEGIN

data/test/helper.rb

@@ -21,6 +21,32 @@ class QCTest < MiniTest::Unit::TestCase
     QC::Conn.execute("SET client_min_messages TO 'warning'")
     QC::Setup.drop
     QC::Setup.create
+    QC::Conn.execute(<<EOS)
+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;
+$$;
+EOS
     QC::Conn.disconnect
   end
 

data/test/queue_test.rb

@@ -6,9 +6,16 @@ class QueueTest < QCTest
     QC.enqueue("Klass.method")
   end
 
+  def test_respond_to
+    assert_equal(true, QC.respond_to?(:enqueue))
+  end
+
   def test_lock
     QC.enqueue("Klass.method")
-    expected = {:id=>"1", :method=>"Klass.method", :args=>[]}
+
+    # See helper.rb for more information about the large initial id
+    # number.
+    expected = {:id=>(2**34).to_s, :method=>"Klass.method", :args=>[]}
     assert_equal(expected, QC.lock)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors: