meerkat 0.2.1 → 0.3.0

data/Gemfile.lock

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

data/lib/meerkat/backend/pg.rb

@@ -1,38 +1,72 @@
 require 'pg'
+require 'date'
 
 module Meerkat
   module Backend
     class PG
+      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'
+        @pg.exec "CREATE TABLE IF NOT EXISTS #{TABLENAME} (topic varchar(1024), json text, timestamp timestamp default now())"
+
+        @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
       end
 
       def publish(route, json)
-        @pg.exec "SELECT pg_notify($1, $2)", [route, json]
+        @pg.transaction do |conn|
+          conn.exec "DELETE FROM #{TABLENAME} WHERE timestamp < now() - interval '5 seconds'"
+          conn.exec "INSERT INTO #{TABLENAME} (topic, json) VALUES ($1, $2)", [route, json]
+          conn.exec "NOTIFY #{TABLENAME}"
+        end
       end
 
       def subscribe(route, &callback)
-        pg = PGconn.connect @pg_uri
-        pg.exec "LISTEN #{PGconn.quote_ident route}"
-        EM.watch(pg.socket, SubscribeClient, pg, callback) { |c| c.notify_readable = true }
+        if @subs[route]
+          @subs[route] << callback
+        else
+          @subs[route] = [callback]
+        end
+        [route, callback]
       end
 
-      def unsubscribe(pg)
-        pg.detach
+      def unsubscribe(sid)
+        @subs[sid[0]].delete sid[1]
       end
 
       module SubscribeClient
         def initialize(pg, cb)
           @pg = pg
           @cb = cb
+          @last_check = Time.now
         end
+
         def notify_readable
           @pg.consume_input
-          msg = @pg.notifies
-          @cb.call(msg[:extra]) if msg
+          @cb.call if @pg.notifies
         end
-        
+
         def unbind
           @pg.close
         end

data/lib/meerkat/version.rb

@@ -1,3 +1,3 @@
 module Meerkat
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/backend/pg_spec.rb

@@ -15,6 +15,19 @@ describe 'Postgres backend' do
     wait!
   end
 
+  it 'can publish and subscribe multiple messages' do
+    b = Meerkat::Backend::PG.new :dbname => 'postgres'
+    i = 5
+    j = 0
+    b.subscribe '/' do |msg| 
+      j += 1
+      assert_equal 'messsage', msg
+      done! if j == i
+    end
+    i.times { b.publish '/', 'messsage' }
+    wait!
+  end
+
   it 'can unsubscribe' do
     b = Meerkat::Backend::PG.new :dbname => 'postgres'
     sid = b.subscribe 'route' do |msg| 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meerkat
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70351112360820 !ruby/object:Gem::Requirement
+  requirement: &70227841623860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351112360820
+  version_requirements: *70227841623860
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70351112360220 !ruby/object:Gem::Requirement
+  requirement: &70227841623420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351112360220
+  version_requirements: *70227841623420
 - !ruby/object:Gem::Dependency
   name: thin_async
-  requirement: &70351112358160 !ruby/object:Gem::Requirement
+  requirement: &70227841622800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351112358160
+  version_requirements: *70227841622800
 - !ruby/object:Gem::Dependency
   name: thin-async-test
-  requirement: &70351112357740 !ruby/object:Gem::Requirement
+  requirement: &70227841622140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351112357740
+  version_requirements: *70227841622140
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
-  requirement: &70351112357320 !ruby/object:Gem::Requirement
+  requirement: &70227841621520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351112357320
+  version_requirements: *70227841621520
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70351112356720 !ruby/object:Gem::Requirement
+  requirement: &70227841620900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351112356720
+  version_requirements: *70227841620900
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70351112356100 !ruby/object:Gem::Requirement
+  requirement: &70227841620300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351112356100
+  version_requirements: *70227841620300
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70351112355500 !ruby/object:Gem::Requirement
+  requirement: &70227841619680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351112355500
+  version_requirements: *70227841619680
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70351112354800 !ruby/object:Gem::Requirement
+  requirement: &70227841619260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351112354800
+  version_requirements: *70227841619260
 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: -2377445987046880713
+      hash: 914174044667917372
 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: -2377445987046880713
+      hash: 914174044667917372
 requirements: []
 rubyforge_project: meerkat
 rubygems_version: 1.8.6