danthes 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # d'Anthès
 
+## 1.0.2 (September 7 2012)
+
+* Subscription callback through sign call
+* On subscription connect callback
+* On subscription error callback
+* Transport disabling
+
 ## 1.0.1 (August 26 2012)
 
 * Generator for redis config file

data/README.md

@@ -39,7 +39,7 @@ It's not necessary to include faye's connect.js since that will be handled autom
 
 ## Serving Faye over HTTPS (with Thin)
 
-To serve Faye over HTTPS you could create a thin configuration file `config/private_pub_thin.yml` similar to the following:
+To serve Faye over HTTPS you could create a thin configuration file `config/danthes_thin.yml` similar to the following:
 
 ```yaml
 ---

data/app/assets/javascripts/danthes.js.coffee

@@ -93,15 +93,19 @@ window.Danthes = class Danthes
     channel = options.channel
     unless @subscriptions[channel]?
       @subscriptions[channel] = {}
-      @subscriptions[channel]['opts'] = options
+      @subscriptions[channel]['callback'] = options['callback'] if options['callback']?
+      @subscriptions[channel]['opts'] =
+        signature: options['signature']
+        timestamp: options['timestamp']     
       @faye (faye) =>
-        subscription = faye.subscribe channel, (message) =>
-          @handleResponse(message)
+        subscription = faye.subscribe channel, (message) => @handleResponse(message)
         if subscription?
           @subscriptions[channel]['sub'] = subscription
           subscription.callback =>
+            options['connect']?(subscription)
             @debugMessage "subscription for #{channel} is active now"
           subscription.errback (error) =>
+            options['error']?(subscription, error)
             @debugMessage "error for #{channel}: #{error.message}"
   
   # Handle response from Faye
@@ -114,6 +118,15 @@ window.Danthes = class Danthes
     if callback = @subscriptions[channel]['callback']
       callback(message.data, channel)
   
+  # Disable transports
+  # @param [String] name of transport
+  @disableTransport: (transport) ->
+    return unless transport in ['websocket', 'long-polling', 'callback-polling', 'in-process']
+    unless transport in @disables
+      @disables.push(transport)
+      @debugMessage "#{transport} faye transport will be disabled"
+    true
+  
   # Subscribe to channel with callback
   # @param channel [String] Channel name
   # @param callback [Function] Callback function

data/lib/danthes/version.rb

@@ -1,3 +1,3 @@
 module Danthes
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/coffeescripts/danthes_spec.js.coffee

@@ -6,7 +6,7 @@ describe "Danthes", ->
     faye = {subscribe: jasmine.createSpy()}
     spyOn(pub, 'faye').andCallFake (callback) ->
       callback(faye)
-    options = {server: "server", channel: "#{channel}"}
+    options = {server: "server", channel: "#{channel}", timestamp: 1234567890, signature: '1234567890'}
     pub.sign(options)
     return [faye, options]
   
@@ -79,7 +79,7 @@ describe "Danthes", ->
     [faye, options] = signToChannel('somechannel')
     expect(faye.subscribe).toHaveBeenCalled()
     expect(pub.server).toEqual("server")
-    expect(pub.subscriptions.somechannel.opts).toEqual(options)
+    expect(pub.subscriptions.somechannel.opts).toEqual(timestamp: options['timestamp'], signature: options['signature'])
 
   it "connects to faye server, adds extension, and executes callbacks", ->
     callback = jasmine.createSpy()
@@ -96,6 +96,41 @@ describe "Danthes", ->
     expect(client.addExtension).toHaveBeenCalledWith(pub.fayeExtension)
     expect(callback).toHaveBeenCalledWith(client)
     
+  it "adds transport to disables", ->
+    expect(pub.disableTransport('websocket')).toBeTruthy()
+    expect(pub.disables).toEqual(['websocket'])
+  
+  it "adds transport to disables only one time", ->
+    pub.disableTransport('websocket')
+    pub.disableTransport('websocket')
+    expect(pub.disables).toEqual(['websocket'])
+    
+  it "returns false if not accepted transport wants to be disabled", ->
+    expect(pub.disableTransport('websocket123')).toBeUndefined()
+    expect(pub.disables).toEqual([])
+    
+  it "connects to faye server, and executes disable once", ->
+    callback = jasmine.createSpy()
+    client = {addExtension: jasmine.createSpy(), disable: jasmine.createSpy()}
+    window.Faye = {}
+    window.Faye.Client = (server) -> client
+    pub.server = "server"
+    pub.disableTransport('websocket')
+    pub.connectToFaye()
+    expect(client.disable).toHaveBeenCalledWith('websocket')
+    
+  it "connects to faye server, and executes disable once", ->
+    callback = jasmine.createSpy()
+    client = {addExtension: jasmine.createSpy(), disable: jasmine.createSpy()}
+    window.Faye = {}
+    window.Faye.Client = (server) -> client
+    pub.server = "server"
+    pub.disableTransport('websocket')
+    pub.disableTransport('long-polling')
+    pub.connectToFaye()
+    expect(client.disable).toHaveBeenCalledWith('websocket')
+    expect(client.disable).toHaveBeenCalledWith('long-polling')
+    
   it "adds subscription faye object into channel object", ->
     sub = {callback: jasmine.createSpy(), errback: jasmine.createSpy()}
     pub.fayeClient = {subscribe: jasmine.createSpy().andReturn(sub)}
@@ -105,6 +140,26 @@ describe "Danthes", ->
     expect(sub.errback).toHaveBeenCalled()
     expect(pub.subscriptions.somechannel.sub).toEqual(sub)
     
+  it "adds subscription faye object into channel object and call connect callback after connection", ->
+    sub = 
+      callback: (f) -> 
+        f()
+      errback: jasmine.createSpy()
+    pub.fayeClient = {subscribe: jasmine.createSpy().andReturn(sub)}
+    options = {server: "server", channel: 'somechannel', connect: jasmine.createSpy()}
+    pub.sign(options)
+    expect(options.connect).toHaveBeenCalledWith(sub)
+  
+  it "adds subscription faye object into channel object and call error callback after connection", ->
+    sub = 
+      callback: jasmine.createSpy()
+      errback: (f) -> 
+        f('error')
+    pub.fayeClient = {subscribe: jasmine.createSpy().andReturn(sub)}
+    options = {server: "server", channel: 'somechannel', error: jasmine.createSpy()}
+    pub.sign(options)
+    expect(options.error).toHaveBeenCalledWith(sub, 'error')
+        
   it "removes subscription to the channel", ->
     sub = {callback: jasmine.createSpy(), errback: jasmine.createSpy(), cancel: jasmine.createSpy()}
     pub.fayeClient = {subscribe: jasmine.createSpy().andReturn(sub)}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danthes
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye