meerkat 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meerkat (0.3.1)
+    meerkat (0.3.2)
       em-hiredis
       eventmachine
       pg

data/lib/meerkat/backend/pg.rb

@@ -1,5 +1,4 @@
 require 'pg'
-require 'date'
 
 module Meerkat
   module Backend
@@ -7,32 +6,12 @@ module Meerkat
       TABLENAME = 'meerkat_pubsub'.freeze
 
       def initialize(pg_uri = nil)
+        @pg_uri = pg_uri
         @subs = {}
         @pg = PGconn.connect pg_uri
-        @pg.exec 'SET client_min_messages = warning'
-        table = @pg.exec "SELECT true FROM pg_tables WHERE tablename = $1", [TABLENAME]
-        @pg.exec "CREATE TABLE #{TABLENAME} (topic varchar(1024), json text, timestamp timestamp default now())" if table.count == 0
-
         @last_check = @pg.exec('SELECT now() as now').first['now']
-
-        @sub_client = PGconn.connect pg_uri
-        @sub_client.exec "LISTEN #{TABLENAME}"
-        EM.next_tick {
-          EM.watch(@sub_client.socket, SubscribeClient, @sub_client, lambda {on_notify}) { |c| c.notify_readable = true }
-        }
-      end
-
-      def on_notify
-        @pg.async_exec "SELECT topic, json, timestamp FROM #{TABLENAME} WHERE timestamp > $1 ORDER BY timestamp ASC", [@last_check] do |rows|
-          rows.each do |row| 
-            @last_check = row['timestamp']
-            @subs.each do |topic, callbacks|
-              if topic == row['topic'] 
-                callbacks.each { |cb| cb.call row['json'] }
-              end
-            end
-          end
-        end
+        create_table
+        start_listener
       end
 
       def publish(route, json)
@@ -56,6 +35,35 @@ module Meerkat
         @subs[sid[0]].delete sid[1]
       end
 
+      private
+      def start_listener
+        @sub_client = PGconn.connect @pg_uri
+        @sub_client.exec "LISTEN #{TABLENAME}"
+        EM.next_tick {
+          EM.watch(@sub_client.socket, SubscribeClient, @sub_client, lambda {on_notify}) { |c| c.notify_readable = true }
+        }
+      end
+
+      def create_table
+        @pg.transaction do |conn|
+          table = conn.exec "SELECT true FROM pg_tables WHERE tablename = $1", [TABLENAME]
+          conn.exec "CREATE TABLE #{TABLENAME} (topic varchar(1024), json text, timestamp timestamp default now())" if table.count == 0
+        end
+      end
+
+      def on_notify
+        @pg.async_exec "SELECT topic, json, timestamp FROM #{TABLENAME} WHERE timestamp > $1 ORDER BY timestamp ASC", [@last_check] do |rows|
+          rows.each do |row| 
+            @last_check = row['timestamp']
+            @subs.each do |topic, callbacks|
+              if topic == row['topic'] 
+                callbacks.each { |cb| cb.call row['json'] }
+              end
+            end
+          end
+        end
+      end
+
       module SubscribeClient
         def initialize(pg, cb)
           @pg = pg

data/lib/meerkat/version.rb

@@ -1,3 +1,3 @@
 module Meerkat
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meerkat
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70243208948620 !ruby/object:Gem::Requirement
+  requirement: &70298242914000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243208948620
+  version_requirements: *70298242914000
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70243208945920 !ruby/object:Gem::Requirement
+  requirement: &70298242910980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243208945920
+  version_requirements: *70298242910980
 - !ruby/object:Gem::Dependency
   name: thin_async
-  requirement: &70243208943420 !ruby/object:Gem::Requirement
+  requirement: &70298242907840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243208943420
+  version_requirements: *70298242907840
 - !ruby/object:Gem::Dependency
   name: thin-async-test
-  requirement: &70243208939840 !ruby/object:Gem::Requirement
+  requirement: &70298242903320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243208939840
+  version_requirements: *70298242903320
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
-  requirement: &70243208937020 !ruby/object:Gem::Requirement
+  requirement: &70298242899220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243208937020
+  version_requirements: *70298242899220
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70243208935420 !ruby/object:Gem::Requirement
+  requirement: &70298242898200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243208935420
+  version_requirements: *70298242898200
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70243208934240 !ruby/object:Gem::Requirement
+  requirement: &70298242896720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243208934240
+  version_requirements: *70298242896720
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70243208933220 !ruby/object:Gem::Requirement
+  requirement: &70298242895440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243208933220
+  version_requirements: *70298242895440
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70243208931540 !ruby/object:Gem::Requirement
+  requirement: &70298242893980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243208931540
+  version_requirements: *70298242893980
 description: Requires an evented Ruby dispatcher, like Thin
 email:
 - carl.hoerberg@gmail.com
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3061186822734734922
+      hash: 2476941847532448728
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3061186822734734922
+      hash: 2476941847532448728
 requirements: []
 rubyforge_project: meerkat
 rubygems_version: 1.8.6