queue_classic 2.0.0 → 2.0.1

data/lib/queue_classic.rb

@@ -12,9 +12,6 @@ require "queue_classic/worker"
 require "queue_classic/setup"
 
 module QC
-  # ENV["LOG_LEVEL"] is used in Scrolls
-  Scrolls::Log.start
-
   Root = File.expand_path("..", File.dirname(__FILE__))
   SqlFunctions = File.join(QC::Root, "/sql/ddl.sql")
   DropSqlFunctions = File.join(QC::Root, "/sql/drop_ddl.sql")

data/lib/queue_classic/conn.rb

@@ -12,6 +12,7 @@ module QC
         result.length > 1 ? result : result.pop
       rescue PGError => e
         log(:error => e.inspect)
+        disconnect
         raise
       end
     end
@@ -64,6 +65,7 @@ module QC
 
     def disconnect
       connection.finish
+    ensure
       @connection = nil
     end
 

data/lib/queue_classic/okjson.rb

@@ -1,4 +1,3 @@
-module QC
 # encoding: UTF-8
 #
 # Copyright 2011, 2012 Keith Rarick
@@ -28,6 +27,7 @@ require 'stringio'
 # Some parts adapted from
 # http://golang.org/src/pkg/json/decode.go and
 # http://golang.org/src/pkg/utf8/utf8.go
+module QC
 module OkJson
   extend self
 
@@ -220,9 +220,9 @@ module OkJson
   end
 
 
-  def nulltok(s);  s[0,4] == 'null'  && [:val, 'null',  nil]   end
-  def truetok(s);  s[0,4] == 'true'  && [:val, 'true',  true]  end
-  def falsetok(s); s[0,5] == 'false' && [:val, 'false', false] end
+  def nulltok(s);  s[0,4] == 'null'  ? [:val, 'null',  nil]   : [] end
+  def truetok(s);  s[0,4] == 'true'  ? [:val, 'true',  true]  : [] end
+  def falsetok(s); s[0,5] == 'false' ? [:val, 'false', false] : [] end
 
 
   def numtok(s)
@@ -235,6 +235,8 @@ module OkJson
       else
         [:val, m[0], Integer(m[0])]
       end
+    else
+      []
     end
   end
 
@@ -375,15 +377,6 @@ module OkJson
   end
 
 
-  def unsubst(u)
-    if u < Usurrself || u > Umax || surrogate?(u)
-      return Ucharerr, Ucharerr
-    end
-    u -= Usurrself
-    [Usurr1 + ((u>>10)&0x3ff), Usurr2 + (u&0x3ff)]
-  end
-
-
   def surrogate?(u)
     Usurr1 <= u && u < Usurr3
   end
@@ -473,15 +466,18 @@ module OkJson
       else
         c = s[r]
         case true
+        when rubydoesenc
+          begin
+            c.ord # will raise an error if c is invalid UTF-8
+            t.write(c)
+          rescue
+            t.write(Ustrerr)
+          end
         when Spc <= c && c <= ?~
           t.putc(c)
-        when rubydoesenc
-          u = c.ord
-          surrenc(t, u)
         else
-          u, size = uchardec(s, r)
-          r += size - 1 # we add one more at the bottom of the loop
-          surrenc(t, u)
+          n = ucharcopy(t, s, r) # ensure valid UTF-8 output
+          r += n - 1 # r is incremented below
         end
       end
       r += 1
@@ -491,28 +487,6 @@ module OkJson
   end
 
 
-  def surrenc(t, u)
-    if u < 0x10000
-      t.print('\\u')
-      hexenc4(t, u)
-    else
-      u1, u2 = unsubst(u)
-      t.print('\\u')
-      hexenc4(t, u1)
-      t.print('\\u')
-      hexenc4(t, u2)
-    end
-  end
-
-
-  def hexenc4(t, u)
-    t.putc(Hex[(u>>12)&0xf])
-    t.putc(Hex[(u>>8)&0xf])
-    t.putc(Hex[(u>>4)&0xf])
-    t.putc(Hex[u&0xf])
-  end
-
-
   def numenc(x)
     if ((x.nan? || x.infinite?) rescue false)
       raise Error, "Numeric cannot be represented: #{x}"
@@ -521,60 +495,77 @@ module OkJson
   end
 
 
-  # Decodes unicode character u from UTF-8
-  # bytes in string s at position i.
-  # Returns u and the number of bytes read.
-  def uchardec(s, i)
+  # Copies the valid UTF-8 bytes of a single character
+  # from string s at position i to I/O object t, and
+  # returns the number of bytes copied.
+  # If no valid UTF-8 char exists at position i,
+  # ucharcopy writes Ustrerr and returns 1.
+  def ucharcopy(t, s, i)
     n = s.length - i
-    return [Ucharerr, 1] if n < 1
+    raise Utf8Error if n < 1
 
     c0 = s[i].ord
 
     # 1-byte, 7-bit sequence?
     if c0 < Utagx
-      return [c0, 1]
+      t.putc(c0)
+      return 1
     end
 
-    # unexpected continuation byte?
-    return [Ucharerr, 1] if c0 < Utag2
+    raise Utf8Error if c0 < Utag2 # unexpected continuation byte?
 
-    # need continuation byte
-    return [Ucharerr, 1] if n < 2
+    raise Utf8Error if n < 2 # need continuation byte
     c1 = s[i+1].ord
-    return [Ucharerr, 1] if c1 < Utagx || Utag2 <= c1
+    raise Utf8Error if c1 < Utagx || Utag2 <= c1
 
     # 2-byte, 11-bit sequence?
     if c0 < Utag3
-      u = (c0&Umask2)<<6 | (c1&Umaskx)
-      return [Ucharerr, 1] if u <= Uchar1max
-      return [u, 2]
+      raise Utf8Error if ((c0&Umask2)<<6 | (c1&Umaskx)) <= Uchar1max
+      t.putc(c0)
+      t.putc(c1)
+      return 2
     end
 
     # need second continuation byte
-    return [Ucharerr, 1] if n < 3
+    raise Utf8Error if n < 3
+
     c2 = s[i+2].ord
-    return [Ucharerr, 1] if c2 < Utagx || Utag2 <= c2
+    raise Utf8Error if c2 < Utagx || Utag2 <= c2
 
     # 3-byte, 16-bit sequence?
     if c0 < Utag4
       u = (c0&Umask3)<<12 | (c1&Umaskx)<<6 | (c2&Umaskx)
-      return [Ucharerr, 1] if u <= Uchar2max
-      return [u, 3]
+      raise Utf8Error if u <= Uchar2max
+      t.putc(c0)
+      t.putc(c1)
+      t.putc(c2)
+      return 3
     end
 
     # need third continuation byte
-    return [Ucharerr, 1] if n < 4
+    raise Utf8Error if n < 4
     c3 = s[i+3].ord
-    return [Ucharerr, 1] if c3 < Utagx || Utag2 <= c3
+    raise Utf8Error if c3 < Utagx || Utag2 <= c3
 
     # 4-byte, 21-bit sequence?
     if c0 < Utag5
       u = (c0&Umask4)<<18 | (c1&Umaskx)<<12 | (c2&Umaskx)<<6 | (c3&Umaskx)
-      return [Ucharerr, 1] if u <= Uchar3max
-      return [u, 4]
-    end
+      raise Utf8Error if u <= Uchar3max
+      t.putc(c0)
+      t.putc(c1)
+      t.putc(c2)
+      t.putc(c3)
+      return 4
+    end
+
+    raise Utf8Error
+  rescue Utf8Error
+    t.write(Ustrerr)
+    return 1
+  end
+
 
-    return [Ucharerr, 1]
+  class Utf8Error < ::StandardError
   end
 
 
@@ -595,14 +586,13 @@ module OkJson
   Uchar2max = (1<<11) - 1
   Uchar3max = (1<<16) - 1
   Ucharerr = 0xFFFD # unicode "replacement char"
+  Ustrerr = "\xef\xbf\xbd" # unicode "replacement char"
   Usurrself = 0x10000
   Usurr1 = 0xd800
   Usurr2 = 0xdc00
   Usurr3 = 0xe000
-  Umax = 0x10ffff
 
   Spc = ' '[0]
   Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
-  Hex = '0123456789abcdef'
 end
 end

data/lib/queue_classic/queue.rb

@@ -21,11 +21,11 @@ module QC
     end
 
     def delete_all
-      Queries.delete_all(@name)
+      Queries.delete_all(name)
     end
 
     def count
-      Queries.count(@name)
+      Queries.count(name)
     end
 
   end

data/readme.md

@@ -135,7 +135,7 @@ end
 ## Configure
 
 All configuration takes place in the form of environment vars.
-See [queue_classic.rb](https://github.com/ryandotsmith/queue_classic/blob/master/lib/queue_classic.rb#L29-66)
+See [queue_classic.rb](https://github.com/ryandotsmith/queue_classic/blob/master/lib/queue_classic.rb#L23-62)
 for a list of options.
 
 ## Usage
@@ -262,7 +262,7 @@ require "queue_classic"
 QC::Worker.new.start
 ```
 
-#### Sublcass QC::Worker
+#### Subclass QC::Worker
 
 Now that we have seen how to run a worker process, let's take a look at how to customize a worker.
 The class `QC::Worker` will probably suit most of your needs; however, there are some mechanisms
@@ -278,7 +278,7 @@ class MyWorker < QC::Worker
 
   # retry the job
   def handle_failure(job, exception)
-    @queue.enqueue(job[:method], job[:args])
+    @queue.enqueue(job[:method], *job[:args])
   end
 
   # the forked proc needs a new db connection
@@ -444,24 +444,10 @@ database.
 
 To achieve this we will create a helper method:
 
-```ruby
-
-def qc_txn
-  begin
-    QC.database.execute("BEGIN")
-    yield
-    QC.database.execute("COMMIT")
-  rescue Exception
-    QC.database.execute("ROLLBACK")
-    raise
-  end
-end
-```
-
 Now in your application code you can do something like:
 
 ```ruby
-qc_txn do
+QC::Conn.transaction do
   Account.all.each do |act|
     QC.enqueue("Emailer.send_notice", act.id)
   end
@@ -579,3 +565,7 @@ $ createdb queue_classic_test
 $ export QC_DATABASE_URL="postgres://username:pass@localhost/queue_classic_test"
 $ rake
 ```
+
+### License
+
+queue_classic is released under the MIT License (http://www.opensource.org/licenses/mit-license.php).

data/test/queue_test.rb

@@ -56,4 +56,21 @@ class QueueTest < QCTest
     assert_equal(0, queue.count)
   end
 
+  def test_repair_after_error
+    queue = QC::Queue.new("queue_classic_jobs", false)
+    queue.enqueue("Klass.method")
+    assert_equal(1, queue.count)
+    connection = QC::Conn.connection
+    saved_method = connection.method(:exec)
+    def connection.exec(*args)
+      raise PGError
+    end
+    assert_raises(PG::Error) { queue.enqueue("Klass.other_method") }    
+    assert_equal(1, queue.count)
+    queue.enqueue("Klass.other_method")
+    assert_equal(2, queue.count)
+  rescue PG::Error
+    QC::Conn.disconnect
+    assert false, "Expected to QC repair after connection error"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: scrolls
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.2.1
 description: queue_classic is a queueing library for Ruby apps. (Rails, Sinatra, Etc...)
   queue_classic features asynchronous job polling, database maintained locks and no
   ridiculous dependencies. As a matter of fact, queue_classic only requires pg.
@@ -67,7 +67,8 @@ files:
 - test/queue_test.rb
 - test/worker_test.rb
 homepage: http://github.com/ryandotsmith/queue_classic
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: