meerkat 0.3.1 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/Gemfile.lock +1 -1
  2. data/lib/meerkat/backend/pg.rb +32 -24
  3. data/lib/meerkat/version.rb +1 -1
  4. metadata +21 -21
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- meerkat (0.3.1)
4
+ meerkat (0.3.2)
5
5
  em-hiredis
6
6
  eventmachine
7
7
  pg
data/lib/meerkat/backend/pg.rb CHANGED
@@ -1,5 +1,4 @@
1
1
  require 'pg'
2
- require 'date'
3
2
 
4
3
  module Meerkat
5
4
  module Backend
@@ -7,32 +6,12 @@ module Meerkat
7
6
  TABLENAME = 'meerkat_pubsub'.freeze
8
7
 
9
8
  def initialize(pg_uri = nil)
9
+ @pg_uri = pg_uri
10
10
  @subs = {}
11
11
  @pg = PGconn.connect pg_uri
12
- @pg.exec 'SET client_min_messages = warning'
13
- table = @pg.exec "SELECT true FROM pg_tables WHERE tablename = $1", [TABLENAME]
14
- @pg.exec "CREATE TABLE #{TABLENAME} (topic varchar(1024), json text, timestamp timestamp default now())" if table.count == 0
15
-
16
12
  @last_check = @pg.exec('SELECT now() as now').first['now']
17
-
18
- @sub_client = PGconn.connect pg_uri
19
- @sub_client.exec "LISTEN #{TABLENAME}"
20
- EM.next_tick {
21
- EM.watch(@sub_client.socket, SubscribeClient, @sub_client, lambda {on_notify}) { |c| c.notify_readable = true }
22
- }
23
- end
24
-
25
- def on_notify
26
- @pg.async_exec "SELECT topic, json, timestamp FROM #{TABLENAME} WHERE timestamp > $1 ORDER BY timestamp ASC", [@last_check] do |rows|
27
- rows.each do |row|
28
- @last_check = row['timestamp']
29
- @subs.each do |topic, callbacks|
30
- if topic == row['topic']
31
- callbacks.each { |cb| cb.call row['json'] }
32
- end
33
- end
34
- end
35
- end
13
+ create_table
14
+ start_listener
36
15
  end
37
16
 
38
17
  def publish(route, json)
@@ -56,6 +35,35 @@ module Meerkat
56
35
  @subs[sid[0]].delete sid[1]
57
36
  end
58
37
 
38
+ private
39
+ def start_listener
40
+ @sub_client = PGconn.connect @pg_uri
41
+ @sub_client.exec "LISTEN #{TABLENAME}"
42
+ EM.next_tick {
43
+ EM.watch(@sub_client.socket, SubscribeClient, @sub_client, lambda {on_notify}) { |c| c.notify_readable = true }
44
+ }
45
+ end
46
+
47
+ def create_table
48
+ @pg.transaction do |conn|
49
+ table = conn.exec "SELECT true FROM pg_tables WHERE tablename = $1", [TABLENAME]
50
+ conn.exec "CREATE TABLE #{TABLENAME} (topic varchar(1024), json text, timestamp timestamp default now())" if table.count == 0
51
+ end
52
+ end
53
+
54
+ def on_notify
55
+ @pg.async_exec "SELECT topic, json, timestamp FROM #{TABLENAME} WHERE timestamp > $1 ORDER BY timestamp ASC", [@last_check] do |rows|
56
+ rows.each do |row|
57
+ @last_check = row['timestamp']
58
+ @subs.each do |topic, callbacks|
59
+ if topic == row['topic']
60
+ callbacks.each { |cb| cb.call row['json'] }
61
+ end
62
+ end
63
+ end
64
+ end
65
+ end
66
+
59
67
  module SubscribeClient
60
68
  def initialize(pg, cb)
61
69
  @pg = pg
data/lib/meerkat/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Meerkat
2
- VERSION = "0.3.1"
2
+ VERSION = "0.3.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: meerkat
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-10-25 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: minitest
16
- requirement: &70243208948620 !ruby/object:Gem::Requirement
16
+ requirement: &70298242914000 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70243208948620
24
+ version_requirements: *70298242914000
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rack-test
27
- requirement: &70243208945920 !ruby/object:Gem::Requirement
27
+ requirement: &70298242910980 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70243208945920
35
+ version_requirements: *70298242910980
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: thin_async
38
- requirement: &70243208943420 !ruby/object:Gem::Requirement
38
+ requirement: &70298242907840 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70243208943420
46
+ version_requirements: *70298242907840
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: thin-async-test
49
- requirement: &70243208939840 !ruby/object:Gem::Requirement
49
+ requirement: &70298242903320 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70243208939840
57
+ version_requirements: *70298242903320
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: em-minitest-spec
60
- requirement: &70243208937020 !ruby/object:Gem::Requirement
60
+ requirement: &70298242899220 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70243208937020
68
+ version_requirements: *70298242899220
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: yajl-ruby
71
- requirement: &70243208935420 !ruby/object:Gem::Requirement
71
+ requirement: &70298242898200 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70243208935420
79
+ version_requirements: *70298242898200
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: eventmachine
82
- requirement: &70243208934240 !ruby/object:Gem::Requirement
82
+ requirement: &70298242896720 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70243208934240
90
+ version_requirements: *70298242896720
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: em-hiredis
93
- requirement: &70243208933220 !ruby/object:Gem::Requirement
93
+ requirement: &70298242895440 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70243208933220
101
+ version_requirements: *70298242895440
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: pg
104
- requirement: &70243208931540 !ruby/object:Gem::Requirement
104
+ requirement: &70298242893980 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70243208931540
112
+ version_requirements: *70298242893980
113
113
  description: Requires an evented Ruby dispatcher, like Thin
114
114
  email:
115
115
  - carl.hoerberg@gmail.com
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
151
151
  version: '0'
152
152
  segments:
153
153
  - 0
154
- hash: 3061186822734734922
154
+ hash: 2476941847532448728
155
155
  required_rubygems_version: !ruby/object:Gem::Requirement
156
156
  none: false
157
157
  requirements:
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
160
160
  version: '0'
161
161
  segments:
162
162
  - 0
163
- hash: 3061186822734734922
163
+ hash: 2476941847532448728
164
164
  requirements: []
165
165
  rubyforge_project: meerkat
166
166
  rubygems_version: 1.8.6