power_strip 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c9e3d8262f810ab4fb28ccf752acbfafcaa6628
-  data.tar.gz: fcfa3d47d3739d813a03ae51664bd6efa68be337
+SHA256:
+  metadata.gz: 653cf22671aa77f68902a8e7d90d08fd4e0c783f2c748f39f0af8f79ebfd225c
+  data.tar.gz: 3937236883fe65bc62e6cc75f46944b82d0a0a05fbb68f9f4bfd555a03162dd5
 SHA512:
-  metadata.gz: 4f2e2aff4dbc161af1a06d9e1f26284e6202ccb238c4ac9e4870ef437a2b09cb69ac6a617a2e5945b0571de26e9e86c69ffad212c2c7fbdf72aaac2cd8d9ef2b
-  data.tar.gz: fff40297418a13a67dc4d0ecbe7fd2b8f30d7aa2a91306c04c6d570a45c08d3fe1a414b54f6846bf184e2e7504f206b8017e6adb21aaed0c03b6394c87c55306
+  metadata.gz: 1c0c35f302b3f82ad8a8008badf015e4a8b421082c7ffd37b52d91c75ff77e2460c8a680ae77047551129880e1dd56e01439fe78dc15c6c0071eb8b706d09449
+  data.tar.gz: fe43d7691d6885a32064036383cd8e63d6edcfaec5c959df65a09f196354678f0e61b69667b5d9d1d1b6b679cf81a2ea2bc42ba4a6d07f666be673363ccb9d95

data/lib/power_strip/app.rb

@@ -45,24 +45,25 @@ module PowerStrip
               subscriptions << channel
 
               socket.send({
-                event: :subscribed,
                 channel: channel_name,
+                event: :subscribed,
               }.to_json)
             when '@unsubscribe'
               subscriptions.delete channel
               channel.delete socket
 
               socket.send({
-                event: :unsubscribed,
                 channel: channel_name,
+                event: :unsubscribed,
               }.to_json)
-            else
-              @handlers[channel_name][message.event].each do |callback|
-                begin
-                  callback[message, @connections[socket]]
-                rescue => e
-                  warn "[PowerStrip] #{e.inspect}"
-                end
+            end
+
+            @handlers[channel_name][message.event].each do |callback|
+              begin
+                callback[message.data, @connections[socket]]
+              rescue => e
+                warn "[PowerStrip] #{e.inspect}"
+                warn e.backtrace
               end
             end
           rescue JSON::ParserError
@@ -71,13 +72,29 @@ module PowerStrip
         end
 
         socket.on :open do
-          @connections[socket] = Connection.new(socket)
+          connection = Connection.new(socket)
+          @connections[socket] = connection
+          @handlers['meta'.freeze]['open'].each do |callback|
+            begin
+              callback[connection]
+            rescue => e
+              warn "[PowerStrip] #{e.inspect}"
+            end
+          end
         end
 
         socket.on :close do
           # Remove this connection from all channels it was subscribed to.
           subscriptions.each { |channel| channel.delete socket }
-          @connections.delete socket
+          connection = @connections.delete socket
+          channels.prune
+          @handlers['meta'.freeze]['close'].each do |callback|
+            begin
+              callback[connection]
+            rescue => e
+              warn "[PowerStrip] #{e.inspect}"
+            end
+          end
         end
 
         socket.rack_response
@@ -90,6 +107,10 @@ module PowerStrip
       @handlers[channel.to_s][event.to_s] << block
     end
 
+    def close channel_name
+      @handlers.delete channel_name.to_s
+    end
+
     def listen
       redis.dup.subscribe(:power_strip) do |on|
         on.message do |_, message|

data/lib/power_strip/channel.rb

@@ -37,5 +37,9 @@ module PowerStrip
       @redis.publish :power_strip, message.to_json
       self
     end
+
+    def close
+      PowerStrip.close name
+    end
   end
 end

data/lib/power_strip/channel_list.rb

@@ -2,6 +2,8 @@ require 'power_strip/channel'
 
 module PowerStrip
   class ChannelList
+    include Enumerable
+
     def initialize(redis:)
       @redis = redis
       @channels = Hash.new do |hash, channel|
@@ -17,6 +19,10 @@ module PowerStrip
       @channels[name.to_s]
     end
 
+    def each
+      @channels.each_value { |channel| yield channel }
+    end
+
     def to_a
       @channels.values
     end
@@ -28,5 +34,20 @@ module PowerStrip
     def has_channel? channel_name
       @channels.key? channel_name.to_s
     end
+
+    def inspect
+      longest_name = @channels.each_key.max_by(&:length).length
+
+      <<-EOF
+#<#{self.class.name}:0x#{(object_id * 2).to_s(16)}
+#{@channels.map { |name, channel| "  #{name.rjust(longest_name)}: #{channel.sockets.length}" }.join("\n") }>
+      EOF
+    end
+
+    def prune
+      @channels.reject! do |name, channel|
+        channel.empty?
+      end
+    end
   end
 end

data/lib/power_strip/connection.rb

@@ -15,6 +15,15 @@ module PowerStrip
       @metadata[attribute] = value
     end
 
+    def send message
+      case message
+      when Message, Hash
+        @socket.send message.to_json
+      when String
+        @socket.send message
+      end
+    end
+
     def method_missing *args, &block
       @socket.public_send *args, &block
     end

data/lib/power_strip/version.rb

@@ -1,3 +1,3 @@
 module PowerStrip
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/power_strip.rb

@@ -20,7 +20,14 @@ module PowerStrip
 
   def start(**args)
     @app = App.instance(**args)
-    @thread = Thread.new { app.listen }
+    @thread = Thread.new do
+      begin
+        app.listen
+      rescue => e
+        warn "[PowerStrip Handler Thread] #{e}"
+        warn e.backtrace
+      end
+    end
   end
 
   def [] channel
@@ -31,6 +38,10 @@ module PowerStrip
     app.on event_name, channel: channel, &block
   end
 
+  def close channel_name
+    app.close channel_name
+  end
+
   class Channel
     def on message, &block
       PowerStrip.on(message, channel: name, &block)

data/opal/power_strip.rb

@@ -5,14 +5,20 @@ module PowerStrip
   class Client
     attr_reader :url
 
-    def initialize(url)
+    def initialize(url, auto_resubscribe: true)
       @url = url
       @socket = Bowser.websocket(url)
       @socket.autoreconnect!
       @subscriptions = {}
 
       @socket.on :open do
-        @subscriptions.each { |name, channel| channel.subscribe }
+        if auto_resubscribe
+          @subscriptions.each do |name, channel|
+            channel.subscribe
+          end
+        else
+          @subscriptions = {}
+        end
       end
       @socket.on :message do |event|
         message = Message.new(event.data)
@@ -34,11 +40,10 @@ module PowerStrip
     end
 
     def unsubscribe channel_name
-      channel = @subscriptions[channel_name]
+      channel = @subscriptions.delete(channel_name)
       return if channel.nil?
 
-      @subscriptions.delete channel
-      channel.unsubscribe
+      channel.unsubscribe if @socket.connected?
 
       channel
     end
@@ -96,7 +101,7 @@ module PowerStrip
 
     def receive_message message
       @handlers[message.event].each do |handler|
-        handler.call message
+        handler.call message.data
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_strip
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Push data from server to client with Ruby