meerkat 0.4.1 → 0.4.2

data/examples/app.rb

@@ -7,7 +7,6 @@ class App < Sinatra::Base
   end
 
   post '/' do
-    puts params
     Meerkat.publish params[:topic], params[:message]
     204
   end

data/examples/config.ru

@@ -3,8 +3,8 @@ require 'meerkat'
 require './app'
 
 #Meerkat.backend = Meerkat::Backend::InMemory.new
-#Meerkat.backend = Meerkat::Backend::Redis.new 
-Meerkat.backend = Meerkat::Backend::PG.new :dbname => 'postgres'
+Meerkat.backend = Meerkat::Backend::Redis.new 
+#Meerkat.backend = Meerkat::Backend::PG.new :dbname => 'postgres'
 map '/' do
   run App
 end

data/examples/views/index.haml

@@ -1,52 +1,52 @@
 !!!
-%head
-  %title Meerkat test
-  %script{:src=>'https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js', :type => 'text/javascript'}
-%body
-  %fieldset
-    %legend Publish
-    %form#pub{:method => :post}
-      %label
-        Topic:
-        %input{:name => 'topic', :value => 'foo'}
-      %label
-        Message:
-        %input{:name => 'message'}
-      %input{:type => 'submit', :value => 'Send'}
+%html
+  %head
+    %title Meerkat test
+    %script{:src=>'https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js', :type => 'text/javascript'}
+  %body
+    %fieldset
+      %legend Publish
+      %form#pub{:method => :post}
+        %label
+          Topic:
+          %input{:name => 'topic', :value => 'foo'}
+        %label
+          Message:
+          %input{:name => 'message'}
+        %input{:type => 'submit', :value => 'Send'}
 
-  %fieldset
-    %legend Subscribe
-    %label
-      Subscribe to 
-      %input#sub_topic{:name => 'topic', :value => 'foo'}
-    %input#start_subscribe{:type => 'submit', :value => 'Start!'}
+    %fieldset
+      %legend Subscribe
+      %label
+        Subscribe to 
+        %input#sub_topic{:name => 'topic', :value => 'foo'}
+      %input#start_subscribe{:type => 'submit', :value => 'Start!'}
 
-    %ul#stream
+      %ul#stream
 
-  :javascript
-    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)
+    :javascript
+      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) {
+          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
-      });
+      $(function() {
+        $("#pub").submit(function() {
+          $.post(this.action, $(this).serialize())
+          return false
+        });
 
-      $("#start_subscribe").click(function() {
-        subscribe_to($("#sub_topic").val())
-        return false
-      });
+        $("#start_subscribe").click(function() {
+          subscribe_to($("#sub_topic").val())
+          return false
+        });
 
-      subscribe_to($("#sub_topic").val())
-    })
+        subscribe_to($("#sub_topic").val())
+      })

data/lib/meerkat/backend/redis.rb

@@ -8,6 +8,9 @@ module Meerkat
         EM.next_tick do
           @sub = EM::Hiredis.connect redis_uri 
           @pub = EM::Hiredis.connect redis_uri 
+          @sub.on :pmessage do |topic, channel, message|
+            @subs[topic].each { |cb| cb.call channel, message }
+          end
         end
       end
 
@@ -22,9 +25,6 @@ module Meerkat
           @subs[topic] = [ callback ]
           EM.next_tick do
             @sub.psubscribe topic 
-            @sub.on :pmessage do |topic, channel, message|
-              @subs[topic].each { |cb| cb.call channel, message }
-            end
           end
         end
         [topic, callback]

data/lib/meerkat/rackadapter.rb

@@ -25,7 +25,7 @@ module Meerkat
 
       path_info = Rack::Utils.unescape env["PATH_INFO"]
       sub = Meerkat.subscribe(path_info) do |topic, json|
-        body << "event: #{topic}\n"
+        body << "event: #{topic}\n" unless path_info == topic
         body << "data: #{json}\n\n"
       end
       body.errback do

data/lib/meerkat/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meerkat
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
+date: 2011-10-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70352680163120 !ruby/object:Gem::Requirement
+  requirement: &70174238921400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352680163120
+  version_requirements: *70174238921400
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70352680162700 !ruby/object:Gem::Requirement
+  requirement: &70174238920780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352680162700
+  version_requirements: *70174238920780
 - !ruby/object:Gem::Dependency
   name: thin_async
-  requirement: &70352680162280 !ruby/object:Gem::Requirement
+  requirement: &70174238920140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352680162280
+  version_requirements: *70174238920140
 - !ruby/object:Gem::Dependency
   name: thin-async-test
-  requirement: &70352680161860 !ruby/object:Gem::Requirement
+  requirement: &70174238919320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352680161860
+  version_requirements: *70174238919320
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
-  requirement: &70352680161420 !ruby/object:Gem::Requirement
+  requirement: &70174238918880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352680161420
+  version_requirements: *70174238918880
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70352680160960 !ruby/object:Gem::Requirement
+  requirement: &70174238918400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70352680160960
+  version_requirements: *70174238918400
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70352680160440 !ruby/object:Gem::Requirement
+  requirement: &70174238914700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70352680160440
+  version_requirements: *70174238914700
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70352680159960 !ruby/object:Gem::Requirement
+  requirement: &70174238914060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70352680159960
+  version_requirements: *70174238914060
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70352680159360 !ruby/object:Gem::Requirement
+  requirement: &70174238913360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70352680159360
+  version_requirements: *70174238913360
 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: 3801501159995886278
+      hash: 2628710167676549953
 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: 3801501159995886278
+      hash: 2628710167676549953
 requirements: []
 rubyforge_project: meerkat
 rubygems_version: 1.8.6