garufa 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b23c255cbedbe0579fd629e627f9ecc1b2cbfcea
-  data.tar.gz: 21b2d4e38370195fa0274e00c8cc4eb84d51b7e3
+  metadata.gz: 22a0ca00cbf5a46859528cb7d432de18fd51415e
+  data.tar.gz: 4b78467ab0979477e6c72dd113da8e1ff06dd1ca
 SHA512:
-  metadata.gz: 8d9c1c3cb181a9be6049d9e527da0b0c92253168da3a4d6d799d6b2ef9b43410497a282508548567359abc7325c041c83b695dbcedb3b52390500bb0d8d053d3
-  data.tar.gz: 31e02f6f0be8d7b79d4c0d7cca0512eef4a1295a0f3965eb12ea2f4754068d2bafcf7b2dbb1c12657a515d6c321da39c444eba03a58577e6ef029064953637ad
+  metadata.gz: a994bc4b5497f5d286765b591119ff93739f57f8aebb186c6f0655ced8fa561538d043d8a97088bf6100f6bbf6520a44d05ec07a1cc0f5f0df74530ca0208281
+  data.tar.gz: b5a43947171fe24cf4e84a1c7176dc55f4f674ce6e7730f8f98a8363643dcf9199474cdaa9b2bf039ac0545e12682d38e40761ae6047547895d247e817a36d16

data/README.md

@@ -1,6 +1,8 @@
 [![Build Status](https://travis-ci.org/Juanmcuello/garufa.png?branch=master)](https://travis-ci.org/Juanmcuello/garufa)
 [![Code Climate](https://codeclimate.com/github/Juanmcuello/garufa/badges/gpa.svg)](https://codeclimate.com/github/Juanmcuello/garufa)
 
+![logo](./doc/images/logo.png)
+
 Garufa
 ====
 

data/garufa.gemspec

@@ -29,10 +29,11 @@ Gem::Specification.new do |s|
   s.add_dependency "goliath", "1.0.4"
   s.add_dependency "faye-websocket", "0.7.4"
   s.add_dependency "websocket-driver", "0.3.5"
-  s.add_dependency "cuba", "3.3.0"
+  s.add_dependency "roda", "2.4.0"
   s.add_dependency "signature", "0.1.7"
   s.add_dependency "tilt", "2.0.1"
   s.add_dependency "yajl-ruby", "1.2.1"
+  s.add_development_dependency "rack-test", "0.6.3"
   s.add_development_dependency "rake", "10.3.2"
   s.add_development_dependency "minitest", "5.4.0"
 end

data/lib/garufa/api/authentication.rb

@@ -1,19 +1,20 @@
 require 'signature'
 require 'garufa/config'
 
-module Garufa
-  module API
-    module Authentication
-      def authenticate(app_id)
-        request = Signature::Request.new(req.request_method, req.path, req.params)
-        request.authenticate { |key| Signature::Token.new(key, Garufa::Config[:secret]) }
+module Authentication
+  module InstanceMethods
+    def authenticate(app_id)
+      r = Signature::Request.new(request.request_method, request.path, request.params)
+      r.authenticate { |key| Signature::Token.new(key, Garufa::Config[:secret]) }
 
-        if app_id != Garufa::Config[:app_id]
-          halt([400, {}, ["Token validated, but invalid for app #{app_id}"]])
-        end
-      rescue Signature::AuthenticationError
-        halt([401, {}, ['401 Unauthorized']])
+      if app_id != Garufa::Config[:app_id]
+        request.halt [400, {}, ["Token validated, but invalid for app #{app_id}"]]
       end
+
+    rescue Signature::AuthenticationError
+      request.halt [401, {}, ['401 Unauthorized']]
     end
   end
 end
+
+Roda.plugin Authentication

data/lib/garufa/api/body_reader.rb

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

data/lib/garufa/api/event_handler.rb

@@ -5,26 +5,24 @@ require 'garufa/message'
 
 module Garufa
   module API
-    module EventHandler
-      def handle_events(body, channel = nil, params = {})
+    class EventHandler
 
-        params.merge!(channels: [channel]) if channel
+      def handle(body)
+        notify JSON.parse(body)
+      end
 
-        body_params = JSON.parse(body)
+      def handle_legacy(body, channel, params)
+        notify params.merge(channels: [channel], data: JSON.parse(body))
+      end
 
-        # Some old api clients send channel and event in the url, while only data is
-        # in the body. New clients send everything in the body. We have to check where
-        # data is coming in to build the final params.
-        params.merge!(body_params['data'] ? body_params : { data: body_params })
+      private
 
+      def notify(params)
         message = Garufa::Message.new(params)
         options = { data: message.data, socket_id: message.socket_id }
 
-        # Process event deferred in order to response immediately.
+        # Notify event deferred in order to response immediately.
         EM.defer { Garufa::Subscriptions.notify message.channels, message.name, options }
-
-      rescue JSON::ParserError => e
-        env.logger.error e.inspect
       end
     end
   end

data/lib/garufa/api/filter.rb

@@ -0,0 +1,12 @@
+module Filter
+  module InstanceMethods
+    def filter
+      {
+        info: request.params['info'].to_s.split(/\s*,\s*/),
+        prefix: request.params['filter_by_prefix']
+      }
+    end
+  end
+end
+
+Roda.plugin Filter

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

@@ -2,31 +2,34 @@ 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)
+        Server.route('channels') do |r|
+          r.on 'channels' do
+
+            stats = Stats.new(Subscriptions.all)
+
+            # GET channels
+            r.is do
+              render 'channels', locals: { stats: stats.all_channels, filter: filter }
             end
 
-            # GET channels/presence-channel/users
-            on "(presence-.*)/users" do |channel|
-              write 'presence_users',  stats: channel_stats(channel)
+            # GET channels/presence-channel
+            r.is "presence-:channel" do |channel|
+              render 'presence', locals: { stats: stats.single_channel(channel), filter: filter }
             end
 
-            # GET channels/non-presence-channel/users
-            on ":channel/users" do |channel|
-              res.status = 400
+            # GET channels/presence-channel/users
+            r.is /(presence-.+)\/users/ do |channel|
+              render 'presence_users', locals: { stats: stats.single_channel(channel) }
             end
 
             # GET channels/non-presence-channel
-            on terminalPrefix("(?!presence-)") do |channel|
-              write 'non_presence', stats: channel_stats(channel)
+            r.is ":channel" do |channel|
+              render 'non_presence', locals: { stats: stats.single_channel(channel) }
             end
 
-            # GET channels
-            on root do
-              write 'channels', stats: channels_stats, filter: filter(req.params)
+            # GET channels/non-presence-channel/users
+            r.is ":channel/users" do |channel|
+              response.status = 400
             end
           end
         end

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

@@ -2,22 +2,20 @@ 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
+        Server.route('events') do |r|
+          r.is 'events' do
+            handler = EventHandler.new
+            handler.handle(read_body)
+            response.status = 202
+            '{}'
+          end
 
-            # Legacy events
-            on "channels/:channel/events" do |channel|
-              handle_events(read_body, channel, req.GET)
-              res.status = 202
-              res.write '{}'
-            end
+          # Legacy events
+          r.is 'channels/:channel/events' do |channel|
+            handler = EventHandler.new
+            handler.handle_legacy(read_body, channel, request.GET)
+            response.status = 202
+            '{}'
           end
         end
       end

data/lib/garufa/api/server.rb

@@ -1,27 +1,37 @@
-require 'cuba'
+require 'roda'
+require 'yajl'
+require 'yajl/json_gem'
+require 'tilt/yajl'
 
-require 'garufa/api/authentication'
-require 'garufa/api/events'
-require 'garufa/api/channels'
+require_relative '../subscriptions'
+require_relative 'stats'
+require_relative 'filter'
+require_relative 'authentication'
+require_relative 'body_reader'
+require_relative 'event_handler'
 
 module Garufa
   module API
+    class Server < Roda
 
-    class Server < Cuba
-      plugin Authentication
-    end
+      plugin :multi_route
+      plugin :render, { engine: 'yajl', views: File.expand_path("views", File.dirname(__FILE__)) }
 
-    Server.define do
-      on "apps/:app_id" do |app_id|
+      require_relative 'routes/channels'
+      require_relative 'routes/events'
 
-        authenticate(app_id)
+      route do |r|
+        r.on 'apps/:app_id' do |app_id|
 
-        on post do
-          run Events
-        end
+          authenticate(app_id)
+
+          r.get do
+            r.route 'channels'
+          end
 
-        on get, 'channels' do
-          run Channels
+          r.post do
+            r.route 'events'
+          end
         end
       end
     end

data/lib/garufa/api/stats.rb

@@ -0,0 +1,47 @@
+module Garufa
+  module API
+    class Stats
+
+      attr_reader :subscriptions
+
+      def initialize(subscriptions)
+        @subscriptions = subscriptions
+      end
+
+      def single_channel(channel)
+        { size: channel_size(channel), presence: presence(channel) }
+      end
+
+      def all_channels
+        subscriptions.each_with_object({}) do |(channel, _), stats|
+          stats[channel] = single_channel(channel)
+        end
+      end
+
+      private
+
+      def channel_size(channel)
+        (subscriptions[channel] || []).size
+      end
+
+      def presence(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 data[:ids].include?(id)
+
+          data[:ids] << id
+          data[:hash][id] = info
+        end
+
+        data.merge(count: data[:ids].count)
+      end
+    end
+  end
+end

data/lib/garufa/subscriptions.rb

@@ -5,19 +5,21 @@ module Garufa
   module Subscriptions
     extend self
 
+    @semaphore = Mutex.new
+
     def all
       subscriptions
     end
 
     def add(subscription)
       subs = subscriptions[subscription.channel] ||= Set.new
-      subs.add subscription
+      @semaphore.synchronize { subs.add subscription }
     end
 
     def remove(subscription)
       channel = subscription.channel
       subscriptions[channel].delete subscription
-      subscriptions.delete(channel) if channel_size(channel) == 0
+      subscriptions.delete(channel) if channel_size(channel).zero?
     end
 
     def notify(channels, event, options = {})
@@ -27,17 +29,21 @@ module Garufa
     end
 
     def notify_channel(channel, event, options)
-      return if channel_size(channel) == 0
+      return if channel_size(channel).zero?
 
-      subscriptions[channel].each do |sub|
-        # Skip notifying if the same socket_id is provided
-        next if sub.socket_id == options[:socket_id]
+      subs = subscriptions[channel]
 
-        # Skip notifying the same member (probably from different tabs)
-        next if sub.presence_channel? and sub.channel_data == options[:data]
+      @semaphore.synchronize {
+        subs.each do |sub|
+          # Skip notifying if the same socket_id is provided
+          next if sub.socket_id == options[:socket_id]
 
-        sub.notify Message.channel_event(channel, event, options[:data])
-      end
+          # Skip notifying the same member (probably from different tabs)
+          next if sub.presence_channel? and sub.channel_data == options[:data]
+
+          sub.notify Message.channel_event(channel, event, options[:data])
+        end
+      }
     end
 
     def include?(subscription)
@@ -46,34 +52,7 @@ module Garufa
     end
 
     def channel_size(channel)
-      subs = subscriptions[channel]
-      subs ? subs.size : 0
-    end
-
-    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 data[:ids].include? id
-
-        data[:ids] << id
-        data[:hash][id] = info
-      end
-
-      data.merge(count: data[:ids].count)
-    end
-
-    def channel_stats(channel)
-      {
-        size: channel_size(channel),
-        presence: presence_stats(channel)
-      }
+      (subscriptions[channel] || []).size
     end
 
     private

data/lib/garufa/version.rb

@@ -1,3 +1,3 @@
 module Garufa
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/test/api.rb

@@ -0,0 +1,171 @@
+require_relative 'helper'
+
+module Garufa
+
+  describe API do
+    include Rack::Test::Methods
+    include Garufa::Test::RackHelpers
+
+    def app
+      API::Server
+    end
+
+    let(:app_id) { Garufa::Config[:app_id] }
+    let(:uri)    { URI.parse("/apps/#{app_id}") }
+
+    describe 'Authentication' do
+      describe 'When app_id is invalid' do
+
+        let(:app_id) { "invalid-app-id" }
+
+        it 'should return 400 status code' do
+          signed_post uri
+          last_response.status.must_equal 400
+        end
+
+        it 'should response with error message' do
+          signed_post uri
+          message = "Token validated, but invalid for app #{app_id}"
+          last_response.body.must_equal message
+        end
+      end
+
+      describe 'When request is not signed' do
+        it 'should return 401 status code' do
+          post uri.path
+          last_response.status.must_equal 401
+        end
+      end
+
+      describe 'When request is signed' do
+        it 'should not return 401 status code' do
+          signed_post uri
+          last_response.status.wont_equal 401
+        end
+      end
+    end
+
+    describe 'events triggering' do
+
+      let(:handler) { Minitest::Mock.new }
+
+      describe 'requests to /events' do
+
+        let(:uri) { URI.parse("/apps/#{app_id}/events") }
+
+        before do
+          handler.expect :handle, nil, [String]
+        end
+
+        it 'should handle events' do
+          API::EventHandler.stub :new, handler do
+            signed_post uri
+            handler.verify
+          end
+        end
+
+        it 'should response 202 status code' do
+          API::EventHandler.stub :new, handler do
+            signed_post uri
+            last_response.status.must_equal 202
+          end
+        end
+
+        it 'should response empty json object' do
+          API::EventHandler.stub :new, handler do
+            signed_post uri
+            last_response.body.must_equal '{}'
+          end
+        end
+      end
+
+      describe '/channels/:channel/events' do
+
+        let(:channel) { 'channel-1' }
+        let(:uri)     { URI.parse("/apps/#{app_id}/channels/#{channel}/events") }
+
+        before do
+          handler.expect :handle_legacy, nil, [String, channel, Hash]
+        end
+
+        it 'should handle legacy events' do
+          API::EventHandler.stub :new, handler do
+            signed_post uri
+            handler.verify
+          end
+        end
+
+        it 'should response 202 status code' do
+          API::EventHandler.stub :new, handler do
+            signed_post uri
+            last_response.status.must_equal 202
+          end
+        end
+
+        it 'should response empty json object' do
+          API::EventHandler.stub :new, handler do
+            signed_post uri
+            last_response.body.must_equal '{}'
+          end
+        end
+      end
+    end
+
+    describe 'When getting channels info' do
+
+      let(:uri) { URI.parse("/apps/#{app_id}/channels") }
+
+      describe 'requests to /channels' do
+        it 'should response 200 status code' do
+          signed_get uri
+          last_response.status.must_equal 200
+        end
+
+        it 'should response with valid JSON' do
+          signed_get uri
+          JSON.parse(last_response.body).must_be_kind_of Hash
+        end
+      end
+
+      describe 'requests to /channels/presence-channel-1' do
+        it 'should response 200 status code' do
+          uri.path += '/presence-channel-1'
+          signed_get uri
+          last_response.status.must_equal 200
+        end
+
+        it 'should response with valid JSON' do
+          signed_get uri
+          uri.path += '/presence-channel-1'
+          signed_get uri
+          JSON.parse(last_response.body).must_be_kind_of Hash
+        end
+
+      end
+
+      describe 'requests to /channels/presence-channel-1/users' do
+        it 'should response 200 status code' do
+          uri.path += '/presence-channel-1/users'
+          signed_get uri
+          last_response.status.must_equal 200
+        end
+      end
+
+      describe 'requests to /channels/non-presence-channel-1' do
+        it 'should response 200 status code' do
+          uri.path += '/non-presence-channel-1'
+          signed_get uri
+          last_response.status.must_equal 200
+        end
+      end
+
+      describe 'requests to /channel-1/users' do
+        it 'should response 200 status code' do
+          uri.path += '/channel-1/users'
+          signed_get uri
+          last_response.status.must_equal 400
+        end
+      end
+    end
+  end
+end

data/test/connection.rb

@@ -2,7 +2,9 @@ require_relative 'helper'
 require 'logger'
 
 module Garufa
+
   describe Connection do
+    include Garufa::Test::ConnectionHelpers
 
     before do
       @socket = MiniTest::Mock.new
@@ -48,7 +50,7 @@ module Garufa
 
           let(:channel) { 'private-ch1' }
           let(:app_key) { Config[:app_key] }
-          let(:signature) { sign(@connection.socket_id, channel) }
+          let(:signature) { sign_string(@connection.socket_id, channel) }
           let(:data) { { event: 'pusher:subscribe', data: { channel: channel, auth: "#{app_key}:#{signature}" } } }
 
           it 'should response with subscription_succeeded' do

data/test/helper.rb

@@ -1,14 +1,50 @@
 require 'minitest'
 require 'minitest/autorun'
 require 'minitest/mock'
+require 'rack/test'
+require 'digest/md5'
 
 require_relative "../lib/garufa"
 
+Garufa::Config[:app_id]  = '123123123'
 Garufa::Config[:app_key] = '123123-123123'
-Garufa::Config[:secret] = '456456-456456'
+Garufa::Config[:secret]  = '456456-456456'
 
-def sign(socket_id, custom_string = nil)
-  string_to_sign = [socket_id, custom_string].join(':')
-  digest = OpenSSL::Digest::SHA256.new
-  return OpenSSL::HMAC.hexdigest(digest, Garufa::Config[:secret], string_to_sign)
+module Garufa
+  module Test
+
+    module ConnectionHelpers
+      def sign_string(socket_id, custom_string = nil)
+        string = [socket_id, custom_string].join(':')
+        secret = Garufa::Config[:secret]
+        digest = OpenSSL::Digest::SHA256.new
+
+        OpenSSL::HMAC.hexdigest(digest, secret, string)
+      end
+    end
+
+    module RackHelpers
+      def sign_params(verb, uri, params = {})
+        token   = Signature::Token.new(Garufa::Config[:app_key], Garufa::Config[:secret])
+        request = Signature::Request.new(verb.to_s.upcase, uri.path, params)
+
+        params.merge(request.sign(token))
+      end
+
+      def signed_post(uri, params = {})
+        if params.any?
+          body_md5 = Digest::MD5.hexdigest(params.to_json)
+        end
+
+        query_params = sign_params(:post, uri, params.merge(body_md5: body_md5))
+        uri.query = URI.encode_www_form(query_params)
+
+        post uri.to_s, params
+      end
+
+      def signed_get(uri)
+        get uri.to_s, sign_params(:get, uri)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garufa
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Juan Manuel Cuello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
-  name: cuba
+  name: roda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: signature
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -148,22 +162,16 @@ files:
 - README.md
 - Rakefile
 - bin/garufa
-- bin/garufa.pid
 - garufa.gemspec
 - lib/garufa.rb
 - lib/garufa/api/authentication.rb
 - lib/garufa/api/body_reader.rb
-- lib/garufa/api/channel_filter.rb
-- lib/garufa/api/channel_stats.rb
-- lib/garufa/api/channels.rb
 - lib/garufa/api/event_handler.rb
-- lib/garufa/api/events.rb
-- lib/garufa/api/response_writer.rb
+- lib/garufa/api/filter.rb
 - lib/garufa/api/routes/channels.rb
 - lib/garufa/api/routes/events.rb
 - lib/garufa/api/server.rb
-- lib/garufa/api/settings_setter.rb
-- lib/garufa/api/terminal_matcher.rb
+- lib/garufa/api/stats.rb
 - lib/garufa/api/views/channels.yajl
 - lib/garufa/api/views/non_presence.yajl
 - lib/garufa/api/views/presence.yajl
@@ -177,6 +185,7 @@ files:
 - lib/garufa/subscriptions.rb
 - lib/garufa/version.rb
 - lib/garufa/websocket.rb
+- test/api.rb
 - test/connection.rb
 - test/helper.rb
 - test/message.rb

data/bin/garufa.pid

@@ -1 +0,0 @@
-21238

data/lib/garufa/api/channel_filter.rb

@@ -1,12 +0,0 @@
-module Garufa
-  module API
-    module ChannelFilter
-      def filter(params)
-        {
-          info: params['info'].to_s.split(/\s*,\s*/),
-          prefix: params['filter_by_prefix']
-        }
-      end
-    end
-  end
-end

data/lib/garufa/api/channel_stats.rb

@@ -1,18 +0,0 @@
-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,31 +0,0 @@
-require 'cuba/render'
-
-require 'yajl'
-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'
-      set :render, views: File.expand_path("views", File.dirname(__FILE__))
-
-      include Routes::Channels
-    end
-  end
-end

data/lib/garufa/api/events.rb

@@ -1,15 +0,0 @@
-require 'garufa/api/event_handler'
-require 'garufa/api/body_reader'
-require 'garufa/api/routes/events'
-
-module Garufa
-  module API
-
-    class Events < Cuba
-      plugin EventHandler
-      plugin BodyReader
-
-      include Routes::Events
-    end
-  end
-end

data/lib/garufa/api/response_writer.rb

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

data/lib/garufa/api/settings_setter.rb

@@ -1,15 +0,0 @@
-module Garufa
-  module API
-    module SettingsSetter
-      module ClassMethods
-        def set(key, value)
-          if value.is_a? Hash
-            settings[key].merge! value
-          else
-            settings[key] = value
-          end
-        end
-      end
-    end
-  end
-end

data/lib/garufa/api/terminal_matcher.rb

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