Remove the kind parameter

Author: nono

Gemfile

@@ -1,3 +1,2 @@
 source :rubygems
-
 gemspec

README.md

@@ -2,22 +2,24 @@ Board for LinuxFr.org
 =====================
 
 Users of the LinuxFr.org website can chat on a space called the board
-(« la tribune » in french). This was an experiment for notifying the users
+(« la tribune » in french). This is an experiment for notifying the users
 when something is said with Server-Sent Event / EventSource.
 
-For the moment, I won't use it because:
+For the moment, there are some difficulties:
 
-- the current board daemon works
 - I was hoping to simplify largely its logic, but it's not the case
+  → maybe, it will be better if I also refactor code in the Rails part
 - Goliath can't listen on UNIX socket
+  → it's no longer the case (fixed in the git repository)
 - EventSource is not supported by most browsers
-  and I'm not very confident in the polyfills for it
+  → I need to try the polyfills
 
 
 See also
 --------
 
-* [Git repository](http://github.com/nono/board-see-LinuxFr.org)
+* [Git repository](http://github.com/nono/board-sse-LinuxFr.org)
+* [Current board](https://github.com/nono/Board-LinuxFr.org)
 
 
 Copyright

board-linuxfr.gemspec

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require './lib/board-linuxfr/version'
+require './lib/board-linuxfr'
 
 Gem::Specification.new do |s|
   s.name         = "board-linuxfr"

lib/board-linuxfr.rb

@@ -1,19 +1,24 @@
 require "goliath"
 require "yajl"
-require "board-linuxfr/redis_plugin"
 
 
 class BoardLinuxfr < Goliath::API
+  autoload :Cache,       "board-linuxfr/cache"
+  autoload :RedisPlugin, "board-linuxfr/redis_plugin"
+  autoload :VERSION,     "board-linuxfr/version"
+
   plugin RedisPlugin
 
   def response(env)
     env.logger.debug "New client: #{env['PATH_INFO']}"
-    send_msg = ->(msg) {
-      env.logger.debug " -> #{msg}"
-      env.stream_send("data: #{msg}\nid: #{msg[:id]}\n\n")
+    send_msg  = ->(args) {
+      id, msg = *args
+      env.logger.info " -> #{id}. #{msg}"
+      env.stream_send("data: #{args.last}\nid: #{args.first}\n\n")
     }
-    event_id     = env['HTTP_LAST_EVENT_ID']
-    chan_name    = env['PATH_INFO'].delete('/b/')
+    event_id  = env['HTTP_LAST_EVENT_ID']
+    chan_name = env['PATH_INFO'].split('/', 3).last
+    env.logger.info "chan_name = #{chan_name.inspect}"
     env['cache'] = status[:cache][chan_name]
     env['chan']  = status[:channels][chan_name]
     env['sid']   = env['chan'].subscribe &send_msg

lib/board-linuxfr/cache.rb

@@ -1,7 +1,4 @@
-require "goliath/api"
-
-
-class BoardLinuxfr < Goliath::API
+class BoardLinuxfr
   class Cache
     CAPACITY = 10
 

lib/board-linuxfr/redis_plugin.rb

@@ -5,9 +5,8 @@
 require "board-linuxfr/cache"
 
 
-class BoardLinuxfr < Goliath::API
+class BoardLinuxfr
   class RedisPlugin
-
     def initialize(port, config, status, logger)
       logger.info "Initializing the Redis plugin"
       @logger = logger
@@ -24,10 +23,10 @@ def run
           end
 
           on.pmessage do |pattern, chan, msg|
-            _, chan, id, kind = *chan.split('/')
-            @logger.info "New message: [#{chan}] #{id}. #{kind}> #{msg}"
+            _, chan, id = *chan.split('/')
+            @logger.info "New message: [#{chan.inspect}] #{id}. #{msg}"
             [@chans, @cache].each do |storage|
-              storage[chan].push(id: id, kind: kind, msg: msg)
+              storage[chan].push [id, msg]
             end
           end