garufa 0.0.1.beta.1 → 0.0.1.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed1fb1125ed40c4f3cc0a19dcae61dff59691948
-  data.tar.gz: 30e670e78a6ecdf3c678a8a32523bce7ad768ee9
+  metadata.gz: 0bbc4d733e7b71f96bdb8b0d0929daffd9042615
+  data.tar.gz: 2c3d7c91f49298af24a5f1e6f05ea9a3c4345354
 SHA512:
-  metadata.gz: c92cfa90de87f3256e6b9e7888438d6ae2c014458ea4fd630a9f44e516861dece549eb9a47ee08c3b9384d7f1b962a7734bf8a26b3bb90dacb031b123790c567
-  data.tar.gz: f294190202d0cc16e2a7bd95e9d34d213ffaa003bcc473c67800e166ae6a9d409d91331ead19d5c02e77889e5f891250266520e2ece44291999897282f8db2ba
+  metadata.gz: 5a44c756812053df6672f5a123635785ad017dfa92ce5d6cf86fd6937f956f91eb9ffa451783afadea861ce41dd3ac9a5dcf9ea18d02c11c42bdc977754e21ec
+  data.tar.gz: 3e41c06d811cdb818a0282566d0817ff3ffcacbd936b1d8ef78785f6d97299ba91715d2dfedb6feb9fe5c09bd2adf767c733e0aafb0c0bbab98286bdbdbd280e

data/garufa.gemspec

@@ -4,15 +4,15 @@ $:.push File.expand_path("../lib", __FILE__)
 require 'garufa/version'
 
 Gem::Specification.new do |s|
-  s.name              = "garufa"
-  s.version           = Garufa::VERSION
-  s.summary           = "Websocket server compatible with Pusher."
-  s.description       = "Garufa is a websocket server compatible with the Pusher service protocol."
-  s.authors           = ["Juan Manuel Cuello"]
-  s.email             = ["juanmacuello@gmail.com"]
-  s.homepage          = "http://github.com/Juanmcuello/garufa"
-  s.bindir            = 'bin'
-  s.executables       << 'garufa'
+  s.name        = "garufa"
+  s.version     = Garufa::VERSION
+  s.summary     = "Websocket server compatible with Pusher."
+  s.description = "Garufa is a websocket server compatible with the Pusher protocol."
+  s.authors     = ["Juan Manuel Cuello"]
+  s.email       = ["juanmacuello@gmail.com"]
+  s.homepage    = "http://github.com/Juanmcuello/garufa"
+  s.bindir      = 'bin'
+  s.executables << 'garufa'
 
   s.files = Dir[
     "LICENSE",
@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
   s.add_dependency "cuba"
   s.add_dependency "signature"
   s.add_development_dependency "rake"
+  s.add_development_dependency "minitest", '~> 5.3.1'
 end

data/lib/garufa/subscriptions.rb

@@ -39,7 +39,7 @@ module Garufa
     private
 
     def subscriptions
-      @subscriptions ||= Hash.new(Set.new)
+      @subscriptions ||= Hash.new { |h, k| h[k] = Set.new }
     end
   end
 

data/lib/garufa/version.rb

@@ -1,4 +1,4 @@
 module Garufa
-  VERSION = '0.0.1.beta.1'
+  VERSION = '0.0.1.beta.2'
 end
 

data/test/connection.rb

@@ -11,6 +11,18 @@ module Garufa
 
     describe '.handle_incomming_data' do
 
+      describe 'pusher:ping' do
+
+        let(:data) { { event: 'pusher:ping', data: { channel: 'ch1' } } }
+
+        it 'should response with pong' do
+          message = Message.pong
+          @socket.expect :send, true, [message.to_json]
+          @connection.handle_incomming_data data.to_json
+          @socket.verify
+        end
+      end
+
       describe 'pusher:subscribe' do
 
         let(:data) { { event: 'pusher:subscribe', data: { channel: 'ch1' } } }
@@ -70,6 +82,25 @@ module Garufa
           end
         end
       end
+
+      describe 'pusher:unsubscribe' do
+
+        let(:channel) { 'ch1' }
+        let(:data_subscribe) { { event: 'pusher:subscribe', data: { channel: channel } } }
+        let(:data_unsubscribe) { { event: 'pusher:unsubscribe', data: { channel: channel } } }
+
+        before do
+          @socket.expect :send, true, [String]
+          @connection.handle_incomming_data data_subscribe.to_json
+        end
+
+        it 'should remove Subscription from Subscriptions' do
+          count = Subscriptions.all[channel].count
+          @connection.handle_incomming_data data_unsubscribe.to_json
+          Subscriptions.all[channel].count.must_equal count - 1
+        end
+
+      end
     end
   end
 end

data/test/message.rb

@@ -27,11 +27,11 @@ module Garufa
 
     describe '.channel_event' do
 
-     let(:channel) { 'channel-123' }
-     let(:event) { 'my-event' }
-     let(:data) { { itemId: 1, value: 'Sample Item' } }
+      let(:channel) { 'channel-123' }
+      let(:event) { 'my-event' }
+      let(:data) { { itemId: 1, value: 'Sample Item' } }
 
-     before do
+      before do
         @message = Message.channel_event channel, event, data
       end
 

data/test/subscriptions.rb

@@ -0,0 +1,56 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+module Garufa
+  describe Subscriptions do
+
+    let(:channel) { 'channel1' }
+    let(:data) { { 'channel' => channel } }
+
+    describe '.remove' do
+
+      before do
+        @subscription = Subscription.new(data, nil)
+        Subscriptions.add @subscription
+      end
+
+      it 'should remove subscription to channel' do
+        count = Subscriptions.all[channel].count
+        Subscriptions.remove @subscription
+        Subscriptions.all[channel].count.must_equal count - 1
+      end
+    end
+
+    describe '.add' do
+
+      before do
+        @connection = MiniTest::Mock.new
+        @connection.expect :socket_id, true
+        @connection.expect :send_message, true, [Message]
+      end
+
+      it 'should add a new subscription to channel' do
+        count = Subscriptions.all[channel].count
+        Subscriptions.add Subscription.new(data, @connection)
+        Subscriptions.all[channel].count.must_equal count + 1
+      end
+    end
+
+    describe '.notify' do
+
+      let(:event) { 'my-event' }
+
+      it 'should notify to subscribed subscriptions' do
+
+        @connection = MiniTest::Mock.new
+        @connection.expect :socket_id, true
+        @connection.expect(:send_message, true) do |m|
+          Message.channel_event(channel, event, nil).to_json == m.to_json
+        end
+
+        Subscriptions.add Subscription.new(data, @connection)
+        Subscriptions.notify([channel], event)
+        @connection.verify
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garufa
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.1
+  version: 0.0.1.beta.2
 platform: ruby
 authors:
 - Juan Manuel Cuello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
@@ -80,7 +80,21 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Garufa is a websocket server compatible with the Pusher service protocol.
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.3.1
+description: Garufa is a websocket server compatible with the Pusher protocol.
 email:
 - juanmacuello@gmail.com
 executables:
@@ -107,6 +121,7 @@ files:
 - garufa.gemspec
 - test/helper.rb
 - test/message.rb
+- test/subscriptions.rb
 - test/connection.rb
 homepage: http://github.com/Juanmcuello/garufa
 licenses: []