meerkat 0.4.0 → 0.4.1

data/Gemfile.lock

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

data/examples/app.rb

@@ -2,12 +2,13 @@ require 'sinatra/base'
 require 'haml'
 
 class App < Sinatra::Base
-  get '*' do
-    @route = params[:splat].join
+  get '/' do
     haml :index
   end
-  post '*' do
-    Meerkat.publish params[:splat].join, params[:message]
+
+  post '/' do
+    puts params
+    Meerkat.publish params[:topic], params[:message]
     204
   end
 end

data/examples/views/index.haml

@@ -6,27 +6,47 @@
   %fieldset
     %legend Publish
     %form#pub{:method => :post}
-      %input{:name => 'message'}
-      %input{:type=>'submit', :value => 'Send'}
+      %label
+        Topic:
+        %input{:name => 'topic', :value => 'foo'}
+      %label
+        Message:
+        %input{:name => 'message'}
+      %input{:type => 'submit', :value => 'Send'}
 
   %fieldset
     %legend Subscribe
-    %p 
-      Subscribing to 
-      %strong= @route
+    %label
+      Subscribe to 
+      %input#sub_topic{:name => 'topic', :value => 'foo'}
+    %input#start_subscribe{:type => 'submit', :value => 'Start!'}
+
     %ul#stream
+
   :javascript
-    var source = new EventSource('/stream#{@route}');
-    var stream = document.getElementById('stream');
-    source.addEventListener('message', function(e) {
-      var li = document.createElement('li');
-      li.innerHTML = JSON.parse(e.data);
-      stream.appendChild(li);
-    }, false);
+    var source;
+    function subscribe_to(topic) {
+      if (source != null) { source.close() }
+      source = new EventSource('/stream/' + topic)
+      var stream = document.getElementById('stream')
+      source.onmessage = function(e) {
+        console.log(e)
+        var li = document.createElement('li')
+        li.innerHTML = JSON.parse(e.data)
+        stream.appendChild(li)
+      }
+    }
 
     $(function() {
       $("#pub").submit(function() {
         $.post(this.action, $(this).serialize())
         return false
       });
+
+      $("#start_subscribe").click(function() {
+        subscribe_to($("#sub_topic").val())
+        return false
+      });
+
+      subscribe_to($("#sub_topic").val())
     })

data/lib/meerkat/backend/redis.rb

@@ -4,12 +4,11 @@ module Meerkat
   module Backend
     class Redis
       def initialize(redis_uri = nil)
-        @redis_uri = redis_uri
         @subs = {}
-        EM.next_tick { 
+        EM.next_tick do
           @sub = EM::Hiredis.connect redis_uri 
           @pub = EM::Hiredis.connect redis_uri 
-        }
+        end
       end
 
       def publish(topic, json)
@@ -21,12 +20,12 @@ module Meerkat
           @subs[topic] << callback
         else
           @subs[topic] = [ callback ]
-          EM.next_tick {
+          EM.next_tick do
             @sub.psubscribe topic 
             @sub.on :pmessage do |topic, channel, message|
-              @subs[topic].each { |c| c.call channel, message }
+              @subs[topic].each { |cb| cb.call channel, message }
             end
-          }
+          end
         end
         [topic, callback]
       end

data/lib/meerkat/rackadapter.rb

@@ -14,9 +14,11 @@ module Meerkat
     def call(env)
       body = DeferrableBody.new
 
-      EM.next_tick { 
-        env['async.callback'].call [200, {'Content-Type' => 'text/event-stream'}, body] 
+      headers = {
+        'Content-Type' => 'text/event-stream',
+        'X-Accel-Buffering' => 'no', # http://wiki.nginx.org/X-accel#X-Accel-Buffering
       }
+      EM.next_tick { env['async.callback'].call [200, headers, body] }
       EM.next_tick { body << "retry: #{@retry}\n" }
       EM.add_periodic_timer(@keep_alive) { body << ":\n" }
       EM.add_timer(@timeout) { body.succeed } if @timeout
@@ -26,7 +28,7 @@ module Meerkat
         body << "event: #{topic}\n"
         body << "data: #{json}\n\n"
       end
-      env['async.close'].callback do
+      body.errback do
         Meerkat.unsubscribe sub
       end
 

data/lib/meerkat/version.rb

@@ -1,3 +1,3 @@
 module Meerkat
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meerkat
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-25 00:00:00.000000000Z
+date: 2011-10-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70273991486880 !ruby/object:Gem::Requirement
+  requirement: &70352680163120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273991486880
+  version_requirements: *70352680163120
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70273991486440 !ruby/object:Gem::Requirement
+  requirement: &70352680162700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273991486440
+  version_requirements: *70352680162700
 - !ruby/object:Gem::Dependency
   name: thin_async
-  requirement: &70273991486000 !ruby/object:Gem::Requirement
+  requirement: &70352680162280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273991486000
+  version_requirements: *70352680162280
 - !ruby/object:Gem::Dependency
   name: thin-async-test
-  requirement: &70273991485580 !ruby/object:Gem::Requirement
+  requirement: &70352680161860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273991485580
+  version_requirements: *70352680161860
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
-  requirement: &70273991485160 !ruby/object:Gem::Requirement
+  requirement: &70352680161420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273991485160
+  version_requirements: *70352680161420
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70273991484740 !ruby/object:Gem::Requirement
+  requirement: &70352680160960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273991484740
+  version_requirements: *70352680160960
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70273991484320 !ruby/object:Gem::Requirement
+  requirement: &70352680160440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273991484320
+  version_requirements: *70352680160440
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70273991483900 !ruby/object:Gem::Requirement
+  requirement: &70352680159960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273991483900
+  version_requirements: *70352680159960
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70273991483480 !ruby/object:Gem::Requirement
+  requirement: &70352680159360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273991483480
+  version_requirements: *70352680159360
 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: -2704897263514401478
+      hash: 3801501159995886278
 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: -2704897263514401478
+      hash: 3801501159995886278
 requirements: []
 rubyforge_project: meerkat
 rubygems_version: 1.8.6