garufa 1.1.0.rc.3 → 1.1.0.rc.4

data/bin/garufa.pid

@@ -1 +1 @@
-7939
+18609

data/garufa.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "goliath", "1.0.4"
   s.add_dependency "faye-websocket", "0.7.4"
-  s.add_dependency "cuba", "3.1.1"
+  s.add_dependency "cuba", "3.3.0"
   s.add_dependency "signature", "0.1.7"
   s.add_dependency "tilt", "2.0.1"
   s.add_dependency "yajl-ruby", "1.2.1"

data/lib/garufa/api/body_reader.rb

@@ -0,0 +1,10 @@
+module Garufa
+  module API
+    module BodyReader
+      def read_body
+        body = req.body.read; req.body.rewind
+        body
+      end
+    end
+  end
+end

data/lib/garufa/api/channel_filter.rb

@@ -1,7 +1,7 @@
 module Garufa
   module API
     module ChannelFilter
-      def channel_filter(params)
+      def filter(params)
         {
           info: params['info'].to_s.split(/\s*,\s*/),
           prefix: params['filter_by_prefix']
@@ -10,4 +10,3 @@ module Garufa
     end
   end
 end
-

data/lib/garufa/api/channel_stats.rb

@@ -0,0 +1,18 @@
+require 'garufa/subscriptions'
+
+module Garufa
+  module API
+    module ChannelStats
+      def channel_stats(channel)
+        Subscriptions.channel_stats(channel)
+      end
+
+      def channels_stats
+        Subscriptions.all.each_with_object({}) do |(channel, _), stats|
+          stats[channel] = channel_stats(channel)
+        end
+      end
+    end
+  end
+end
+

data/lib/garufa/api/channels.rb

@@ -1,4 +1,3 @@
-require 'cuba'
 require 'cuba/render'
 
 require 'yajl'
@@ -6,39 +5,27 @@ require 'yajl/json_gem'
 require 'tilt/yajl'
 
 require 'garufa/api/channel_filter'
+require 'garufa/api/channel_stats'
+require 'garufa/api/response_writer'
+require 'garufa/api/terminal_matcher'
 require 'garufa/api/settings_setter'
+require 'garufa/api/routes/channels'
 
 module Garufa
   module API
+
     class Channels < Cuba
       plugin Cuba::Render
       plugin ChannelFilter
+      plugin ChannelStats
+      plugin ResponseWriter
+      plugin TerminalMatcher
       plugin SettingsSetter
 
-      set :render, template_engine: 'yajl', views: File.expand_path("views", File.dirname(__FILE__))
-    end
-
-    Channels.define do
-
-      on get, "channels/:channel/users" do |channel|
-        stats = Subscriptions.channel_stats(channel)
-        res.write partial('users', stats: stats)
-      end
-
-      on get, "channels/:channel" do |channel|
-        filter = channel_filter(req.params)
-        stats = Subscriptions.channel_stats(channel)
-        res.write partial('channel', stats: stats, filter: filter)
-      end
-
-      on get, "channels" do
-        filter = channel_filter(req.params)
-        stats = Subscriptions.all.each_with_object({}) do |(channel, sub), obj|
-          obj[channel] = Subscriptions.channel_stats(channel)
-        end
+      set :render, template_engine: 'yajl'
+      set :render, views: File.expand_path("views", File.dirname(__FILE__))
 
-        res.write partial('channels', stats: stats, filter: filter)
-      end
+      include Routes::Channels
     end
   end
 end

data/lib/garufa/api/event_handler.rb

@@ -6,7 +6,10 @@ require 'garufa/message'
 module Garufa
   module API
     module EventHandler
-      def handle_events(body, params = {})
+      def handle_events(body, channel = nil, params = {})
+
+        params.merge!(channels: [channel]) if channel
+
         body_params = JSON.parse(body)
 
         # Some old api clients send channel and event in the url, while only data is

data/lib/garufa/api/events.rb

@@ -1,28 +1,15 @@
 require 'garufa/api/event_handler'
+require 'garufa/api/body_reader'
+require 'garufa/api/routes/events'
 
 module Garufa
   module API
-    class Events < Cuba; end
 
-    Events.plugin EventHandler
+    class Events < Cuba
+      plugin EventHandler
+      plugin BodyReader
 
-    Events.define do
-
-      res.status = 202
-      body = req.body.read
-
-      # Events
-      on "events" do
-        handle_events(body)
-        res.write "{}"
-      end
-
-      # Legacy events
-      on "channels/:channel_id/events" do |channel_id|
-        params = req.GET.merge(channels: [channel_id])
-        handle_events(body, params)
-        res.write "{}"
-      end
+      include Routes::Events
     end
   end
 end

data/lib/garufa/api/response_writer.rb

@@ -0,0 +1,9 @@
+module Garufa
+  module API
+    module ResponseWriter
+      def write(template, locals)
+        res.write partial(template, locals)
+      end
+    end
+  end
+end

data/lib/garufa/api/routes/channels.rb

@@ -0,0 +1,36 @@
+module Garufa
+  module API
+    module Routes
+      module Channels
+        def self.included(mod)
+          mod.define do
+            # GET channels/presence-channel
+            on terminalPrefix("presence-") do |channel|
+              write 'presence', stats: channel_stats(channel), filter: filter(req.params)
+            end
+
+            # GET channels/presence-channel/users
+            on "(presence-.*)/users" do |channel|
+              write 'presence_users',  stats: channel_stats(channel)
+            end
+
+            # GET channels/non-presence-channel/users
+            on ":channel/users" do |channel|
+              res.status = 400
+            end
+
+            # GET channels/non-presence-channel
+            on terminalPrefix("(?!presence-)") do |channel|
+              write 'non_presence', stats: channel_stats(channel)
+            end
+
+            # GET channels
+            on root do
+              write 'channels', stats: channels_stats, filter: filter(req.params)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/garufa/api/routes/events.rb

@@ -0,0 +1,26 @@
+module Garufa
+  module API
+    module Routes
+      module Events
+        def self.included(mod)
+
+          mod.define do
+            # Events
+            on "events" do
+              handle_events(read_body)
+              res.status = 202
+              res.write '{}'
+            end
+
+            # Legacy events
+            on "channels/:channel/events" do |channel|
+              handle_events(read_body, channel, req.GET)
+              res.status = 202
+              res.write '{}'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/garufa/api/server.rb

@@ -1,13 +1,15 @@
 require 'cuba'
+
 require 'garufa/api/authentication'
 require 'garufa/api/events'
 require 'garufa/api/channels'
 
 module Garufa
   module API
-    class Server < Cuba; end
 
-    Server.plugin Authentication
+    class Server < Cuba
+      plugin Authentication
+    end
 
     Server.define do
       on "apps/:app_id" do |app_id|
@@ -18,7 +20,7 @@ module Garufa
           run Events
         end
 
-        on get do
+        on get, 'channels' do
           run Channels
         end
       end

data/lib/garufa/api/terminal_matcher.rb

@@ -0,0 +1,9 @@
+module Garufa
+  module API
+    module TerminalMatcher
+      def terminalPrefix(prefix)
+        /(#{prefix}((?!\/).)*)\z/
+      end
+    end
+  end
+end

data/lib/garufa/connection.rb

@@ -122,8 +122,8 @@ module Garufa
       data = {}
 
       if subscription.presence_channel?
-        data[:presence] = Subscriptions.channels_data(channel)
-        data[:presence][:count] = Subscriptions.channel_size(channel)
+        stats = Subscriptions.channel_stats(channel)
+        data[:presence] = stats[:presence]
       end
 
       send_message Message.subscription_succeeded(channel, data)

data/lib/garufa/subscriptions.rb

@@ -50,25 +50,29 @@ module Garufa
       subs ? subs.size : 0
     end
 
-    def channels_data(channel)
-      response = { ids: [], hash: {} }
+    def presence_stats(channel)
+      return unless channel.start_with?('presence-')
+
+      data = { ids: [], hash: {} }
 
       (subscriptions[channel] || []).each do |sub|
+
         channel_data = JSON.parse(sub.channel_data)
         id, info = channel_data.values_at('user_id', 'user_info')
 
-        next if response[:ids].include? id
+        next if data[:ids].include? id
 
-        response[:ids] << id
-        response[:hash][id] = info
+        data[:ids] << id
+        data[:hash][id] = info
       end
-      response
+
+      data.merge(count: data[:ids].count)
     end
 
     def channel_stats(channel)
       {
         size: channel_size(channel),
-        presence: channels_data(channel)
+        presence: presence_stats(channel)
       }
     end
 

data/lib/garufa/version.rb

@@ -1,3 +1,3 @@
 module Garufa
-  VERSION = '1.1.0.rc.3'
+  VERSION = '1.1.0.rc.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garufa
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc.3
+  version: 1.1.0.rc.4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: signature
   requirement: !ruby/object:Gem::Requirement
@@ -151,13 +151,19 @@ files:
 - README.md
 - Rakefile
 - lib/garufa/version.rb
+- lib/garufa/api/body_reader.rb
+- lib/garufa/api/routes/channels.rb
+- lib/garufa/api/routes/events.rb
+- lib/garufa/api/terminal_matcher.rb
 - lib/garufa/api/channels.rb
 - lib/garufa/api/event_handler.rb
 - lib/garufa/api/server.rb
 - lib/garufa/api/authentication.rb
 - lib/garufa/api/channel_filter.rb
 - lib/garufa/api/events.rb
+- lib/garufa/api/response_writer.rb
 - lib/garufa/api/settings_setter.rb
+- lib/garufa/api/channel_stats.rb
 - lib/garufa/subscription.rb
 - lib/garufa/message.rb
 - lib/garufa/config.rb