highcarb 0.2.1 → 0.2.2

data/lib/highcarb/command.rb

@@ -28,6 +28,7 @@ module HighCarb
 
         opt "http-port", "HTTP server port", default: 9090
         opt "ws-port", "WebSockets port", default: 9091
+        opt "ws", "Enable/Disable WebSockets", default: true
 
         opt "skip-libs", "Don't download vendor libraries, like Deck.js and jQuery"
 

data/lib/highcarb/services.rb

@@ -11,8 +11,10 @@ module HighCarb
 
     def start!(command, logger, auth)
       EM.run do
-        EM::WebSocket.start(host: '0.0.0.0', port: command.options["ws-port"] ) do |websocket|
-          WSConnection.new websocket, logger
+        if command.options["ws"]
+          EM::WebSocket.start(host: '0.0.0.0', port: command.options["ws-port"] ) do |websocket|
+            WSConnection.new websocket, logger
+          end
         end
 
         Thin::Server.start(

data/lib/highcarb/version.rb

@@ -1,3 +1,3 @@
 module HighCarb
-  Version = "0.2.1"
+  Version = "0.2.2"
 end

data/resources/views/index.coffee

@@ -14,6 +14,11 @@ $ ->
   # we can receive commands to change the current slide
   toJson = JSON.stringify
 
+
+  # Don't initialize the websocket if we don't have any URL
+  return unless EnableWebSocketsURL
+
+
   channel = new WebSocket WebSocketsURL
   channel.onmessage = (msgEvent) ->
     msg = JSON.parse(msgEvent.data)

data/resources/views/index.haml

@@ -15,6 +15,7 @@
     %script{ src: "/assets/vendor/deck.js/extensions/hash/deck.hash.js" }
 
     :javascript
+      window.EnableWebSocketsURL = #{!!options["no-ws"]};
       window.WebSocketsURL = "ws://" + location.hostname + ":#{options["ws-port"].to_json}/";
 
     = load_coffe "index"

data/resources/views/remote.coffee

@@ -2,6 +2,9 @@
 window.WebSocket = MozWebSocket if MozWebSocket?
 
 $ ->
+  # Don't initialize the websocket if we don't have any URL
+  return unless EnableWebSocketsURL
+
   $(".slides").
     load("/slides").
     delegate(".slide", "click", (event) ->

data/resources/views/remote.haml

@@ -54,6 +54,7 @@
     .slides Loading ...
 
     :javascript
+      window.EnableWebSocketsURL = #{!!options["ws"]};
       window.WebSocketsURL = "ws://" + location.hostname + ":#{options["ws-port"].to_json}/";
 
     = load_coffe "remote"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highcarb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: