pg_queue 0.0.2 → 0.0.3

data/bin/queue_worker

@@ -1,12 +1,6 @@
 #!/usr/bin/env ruby
 require "pg_queue"
 
-class MailQueue
-  def self.perform(email)
-    puts email
-  end
-end
-
 worker = PgQueue::Worker.new
 
 ["INT", "TERM"].each do |signal|

data/lib/pg_queue/pg_extensions.rb

@@ -37,5 +37,17 @@ module PgQueue
     def unlisten(key)
       exec("UNLISTEN #{key}")
     end
+
+    def new_connection
+      PGconn.open(
+        :host => host,
+        :port => port,
+        :user => user,
+        :password => pass,
+        :dbname => db
+      ).tap do |conn|
+        conn.extend(PgExtensions)
+      end
+    end
   end
 end

data/lib/pg_queue/tasks.rb

@@ -0,0 +1,24 @@
+namespace :pg_queue do
+  desc "Start worker"
+  task :work do
+    worker = PgQueue::Worker.new
+
+    ["INT", "TERM"].each do |signal|
+      trap(signal) do
+        worker.stop
+      end
+    end
+
+    worker.start
+  end
+
+  desc "Drop jobs table"
+  task :drop_table do
+    PgQueue.connection.exec("DROP TABLE IF EXISTS pg_queue_jobs")
+  end
+
+  desc "Create jobs table"
+  task :create_table => :drop_table do
+    PgQueue.connection.exec("CREATE TABLE pg_queue_jobs (id SERIAL, class_name VARCHAR, args TEXT)")
+  end
+end

data/lib/pg_queue/version.rb

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

data/lib/pg_queue/worker.rb

@@ -26,8 +26,7 @@ module PgQueue
 
     def stop
       @running = false
-      PgQueue.connection = nil
-      PgQueue.connection.notify(:pg_queue_jobs, "stop")
+      PgQueue.connection.new_connection.notify(:pg_queue_jobs, "stop")
     end
 
     def running?
@@ -43,6 +42,7 @@ module PgQueue
       rescue => ex
         PgQueue.logger.fatal(ex)
         PgQueue.logger.fatal(ex.message)
+        PgQueue.logger.fatal(ex.backtrace)
       end
     end
   end

data/lib/pg_queue.rb

@@ -17,14 +17,13 @@ module PgQueue
   end
 
   def self.connection
-    @connection ||= begin
-      conn = PGconn.open(:dbname => 'pg_queue_test')
-      conn.extend(PgQueue::PgExtensions)
-    end
+    @connection
   end
 
   def self.connection=(object)
-    @connection = object
+    @connection = object.tap do |conn|
+      conn.extend(PgQueue::PgExtensions) if object.respond_to?(:exec)
+    end
   end
 
   def self.enqueue(klass, *args)

data/spec/pg_queue/worker_spec.rb

@@ -42,8 +42,7 @@ describe PgQueue::Worker do
     end
 
     it "notifies worker to stop" do
-      PgQueue.should_receive(:connection=).with(nil)
-      PgQueue.should_receive(:connection).and_return(connection)
+      PgQueue.connection.should_receive(:new_connection).and_return(connection)
       connection.should_receive(:notify).with(:pg_queue_jobs, "stop")
 
       subject.should be_running

data/spec/pg_queue_spec.rb

@@ -1,10 +1,15 @@
 require "spec_helper"
 
 class MyLogger; end
-class MyDbConnection; end
+class MyDbConnection; def exec; end; end
 class MyQueue; end
 
 describe PgQueue do
+  before do
+    described_class.connection = MyDbConnection.new
+    described_class.logger = Logger.new("/dev/null")
+  end
+
   context "logging" do
     its(:logger) { should be_instance_of(Logger) }
 
@@ -19,25 +24,18 @@ describe PgQueue do
   end
 
   context "database connection" do
-    its(:connection) { should be_instance_of(PGconn) }
+    its(:connection) { should be_instance_of(MyDbConnection) }
 
     context "extensions" do
       subject { described_class.connection }
+
       it { should respond_to(:insert) }
       it { should respond_to(:notify) }
       it { should respond_to(:delete) }
       it { should respond_to(:first) }
       it { should respond_to(:listen) }
       it { should respond_to(:unlisten) }
-    end
-
-    it "defines a new connection" do
-      described_class.connection = MyDbConnection.new
-      described_class.connection.should be_instance_of(MyDbConnection)
-    end
-
-    after do
-      described_class.connection = nil
+      it { should respond_to(:new_connection) }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
+date: 2012-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70278043238320 !ruby/object:Gem::Requirement
+  requirement: &70341859292320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.2
   type: :runtime
   prerelease: false
-  version_requirements: *70278043238320
+  version_requirements: *70341859292320
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70278043237820 !ruby/object:Gem::Requirement
+  requirement: &70341859291820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70278043237820
+  version_requirements: *70341859291820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70278043237360 !ruby/object:Gem::Requirement
+  requirement: &70341859291360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70278043237360
+  version_requirements: *70341859291360
 description: Some experimentations with LISTEN/NOTIFY for background jobs
 email:
 - me@rafaelss.com
@@ -62,6 +62,7 @@ files:
 - lib/pg_queue.rb
 - lib/pg_queue/job.rb
 - lib/pg_queue/pg_extensions.rb
+- lib/pg_queue/tasks.rb
 - lib/pg_queue/version.rb
 - lib/pg_queue/worker.rb
 - pg_queue.gemspec