power_strip 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18c31760b6c3e4d748e3ae3c241c84a10fd98370
-  data.tar.gz: c5e036376ee22d757e3b3ce0faa9a6614dbdb3ba
+  metadata.gz: 0c9e3d8262f810ab4fb28ccf752acbfafcaa6628
+  data.tar.gz: fcfa3d47d3739d813a03ae51664bd6efa68be337
 SHA512:
-  metadata.gz: efd68a3521ef9fad7fab697a061a323c6e1710d12ab5240bb3f1be25e1755fc4c4eba8fe84e0494a2765de32e4572ff4ca16333da9f00fa80adb6574437cd849
-  data.tar.gz: c2f32e98035971efe15be863c4a1ca51cca7f05c9f602b559f8733d2668b91a18cbdb097f0448e07c01534533c7ac141de3067a1181e44001b5b6182ebcbd9d9
+  metadata.gz: 4f2e2aff4dbc161af1a06d9e1f26284e6202ccb238c4ac9e4870ef437a2b09cb69ac6a617a2e5945b0571de26e9e86c69ffad212c2c7fbdf72aaac2cd8d9ef2b
+  data.tar.gz: fff40297418a13a67dc4d0ecbe7fd2b8f30d7aa2a91306c04c6d570a45c08d3fe1a414b54f6846bf184e2e7504f206b8017e6adb21aaed0c03b6394c87c55306

data/lib/power_strip.rb

@@ -30,12 +30,18 @@ module PowerStrip
   def on event_name, channel:, &block
     app.on event_name, channel: channel, &block
   end
+
+  class Channel
+    def on message, &block
+      PowerStrip.on(message, channel: name, &block)
+    end
+  end
 end
 
 begin
   require 'opal'
   Opal.append_path File.expand_path('../../opal', __FILE__)
-rescue
+rescue LoadError
   require 'sprockets'
   Sprockets.append_path File.expand_path('../js', __FILE__)
 end

data/lib/power_strip/app.rb

@@ -5,6 +5,7 @@ require 'json'
 
 require 'power_strip/channel_list'
 require 'power_strip/message'
+require 'power_strip/connection'
 
 module PowerStrip
   class App
@@ -22,8 +23,10 @@ module PowerStrip
           handlers[event] = []
         end
       end
+      @connections = {}
     end
 
+    # omg I'm so sorry this method looks like this.
     def call env
       if Faye::WebSocket.websocket? env
         socket = Faye::WebSocket.new(env)
@@ -31,46 +34,50 @@ module PowerStrip
         subscriptions = Set.new
 
         socket.on :message do |event|
-          message = Message.new(JSON.parse(event.data))
-          channel_name = message.channel
-          channel = channels[channel_name]
-
-          case message.event
-          when '@subscribe'
-            channel << socket
-            subscriptions << channel_name
-
-            socket.send({
-              event: :subscribed,
-              channel: channel_name,
-            }.to_json)
-          when '@unsubscribe'
-            channels[channel_name].delete socket
-            if channels[channel_name].empty?
-              channels.delete channel_name
-            end
-
-            subscriptions.delete channel_name
-
-            socket.send({
-              event: :unsubscribed,
-              channel: channel_name,
-            }.to_json)
-          else
-            @handlers[channel_name][message.event].each do |callback|
-              begin
-                callback[message, socket]
-              rescue => e
-                warn "[PowerStrip] #{e.inspect}"
+          begin
+            message = Message.new(JSON.parse(event.data))
+            channel_name = message.channel
+            channel = channels[channel_name]
+
+            case message.event
+            when '@subscribe'
+              channel << socket
+              subscriptions << channel
+
+              socket.send({
+                event: :subscribed,
+                channel: channel_name,
+              }.to_json)
+            when '@unsubscribe'
+              subscriptions.delete channel
+              channel.delete socket
+
+              socket.send({
+                event: :unsubscribed,
+                channel: channel_name,
+              }.to_json)
+            else
+              @handlers[channel_name][message.event].each do |callback|
+                begin
+                  callback[message, @connections[socket]]
+                rescue => e
+                  warn "[PowerStrip] #{e.inspect}"
+                end
               end
             end
+          rescue JSON::ParserError
+            # Ignore invalid JSON
           end
         end
 
+        socket.on :open do
+          @connections[socket] = Connection.new(socket)
+        end
+
         socket.on :close do
-          subscriptions.each do |channel_name|
-            channels[channel_name].delete socket
-          end
+          # Remove this connection from all channels it was subscribed to.
+          subscriptions.each { |channel| channel.delete socket }
+          @connections.delete socket
         end
 
         socket.rack_response

data/lib/power_strip/channel.rb

@@ -6,8 +6,9 @@ module PowerStrip
   class Channel
     attr_reader :name, :sockets
 
-    def initialize(name, redis:)
+    def initialize(name, channel_list: {}, redis:)
       @name = name
+      @channel_list = channel_list
       @redis = redis
       @sockets = Set.new
     end
@@ -18,6 +19,13 @@ module PowerStrip
 
     def delete socket
       @sockets.delete socket
+
+      # Tell the channel list to GC this channel
+      @channel_list.delete @name if empty?
+    end
+
+    def empty?
+      @sockets.empty?
     end
 
     def send event, message

data/lib/power_strip/channel_list.rb

@@ -5,7 +5,11 @@ module PowerStrip
     def initialize(redis:)
       @redis = redis
       @channels = Hash.new do |hash, channel|
-        hash[channel.to_s] = Channel.new(channel, redis: redis)
+        hash[channel.to_s] = Channel.new(
+          channel,
+          channel_list: self,
+          redis: redis,
+        )
       end
     end
 
@@ -20,5 +24,9 @@ module PowerStrip
     def delete channel_name
       @channels.delete channel_name.to_s
     end
+
+    def has_channel? channel_name
+      @channels.key? channel_name.to_s
+    end
   end
 end

data/lib/power_strip/connection.rb

@@ -0,0 +1,22 @@
+module PowerStrip
+  class Connection
+    attr_reader :metadata
+
+    def initialize socket
+      @socket = socket
+      @metadata = {}
+    end
+
+    def [] attribute
+      @metadata[attribute]
+    end
+
+    def []= attribute, value
+      @metadata[attribute] = value
+    end
+
+    def method_missing *args, &block
+      @socket.public_send *args, &block
+    end
+  end
+end

data/lib/power_strip/version.rb

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

data/opal/power_strip.rb

@@ -9,18 +9,36 @@ module PowerStrip
       @url = url
       @socket = Bowser.websocket(url)
       @socket.autoreconnect!
-      @subscriptions = []
+      @subscriptions = {}
 
-      @socket.on(:open) { @subscriptions.each(&:subscribe) }
+      @socket.on :open do
+        @subscriptions.each { |name, channel| channel.subscribe }
+      end
+      @socket.on :message do |event|
+        message = Message.new(event.data)
+        channel = @subscriptions[message.channel]
+
+        if channel
+          channel.receive_message message
+        end
+      end
     end
 
     def subscribe channel_name
-      channel = Channel.new(channel_name, @socket)
-      @subscriptions << channel
+      channel = Channel.new(channel_name, self)
 
-      if @socket.connected?
-        channel.subscribe
-      end
+      @subscriptions[channel_name] = channel
+      channel.subscribe
+
+      channel
+    end
+
+    def unsubscribe channel_name
+      channel = @subscriptions[channel_name]
+      return if channel.nil?
+
+      @subscriptions.delete channel
+      channel.unsubscribe
 
       channel
     end
@@ -38,39 +56,18 @@ module PowerStrip
 
       @socket.on native_event, &block
     end
-  end
-
-  Channel = Struct.new(:name, :socket) do
-    def on event_name, &block
-      socket.on :message do |event|
-        message = Message.new(event.data)
-
-        if message.channel == name && message.event == event_name
-          block.call message
-        end
-      end
-    end
-
-    def subscribe
-      socket.send_message(
-        event: :@subscribe,
-        channel: name,
-      )
-    end
 
-    def method_missing event, message
+    def send_message channel=nil, event=nil, data=nil
       promise = Promise.new
 
-      if socket.connected?
-        socket.send_message({
-          channel: name,
-          event: event,
-          data: message,
-        }.select { |k,v| v })
+      if @socket.connected?
+        @socket.send_message({ channel: channel, event: event, data: data }
+          .select { |k,v| v })
         promise.resolve true
       else
         Bowser.window.delay 1 do
-          send(event, message).then { promise.resolve true }
+          send_message(channel, event, data)
+            .then { promise.resolve true }
         end
       end
 
@@ -80,6 +77,42 @@ module PowerStrip
     end
   end
 
+  class Channel
+    attr_reader :name, :client
+
+    def initialize name, client
+      @name = name
+      @client = client
+      @handlers = Hash.new { |h, k| h[k] = [] }
+    end
+
+    def on event_name, handler=nil, &block
+      unless handler || block
+        raise ArgumentError, 'PowerStrip::Channel#on requires an event handler'
+      end
+
+      @handlers[event_name] << (handler || block)
+    end
+
+    def receive_message message
+      @handlers[message.event].each do |handler|
+        handler.call message
+      end
+    end
+
+    def subscribe
+      send :@subscribe, nil
+    end
+
+    def unsubscribe
+      send :@unsubscribe, nil
+    end
+
+    def send event, message=nil
+      client.send_message(name, event, message)
+    end
+  end
+
   class Message
     attr_reader :channel, :event, :data
 

data/power_strip.gemspec

@@ -18,6 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "faye-websocket", "~> 0.10.4"
+  spec.add_runtime_dependency "grand_central"
+  spec.add_runtime_dependency "redis"
+  spec.add_runtime_dependency "sprockets", "~> 3.6.0"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_strip
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -24,6 +24,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.4
+- !ruby/object:Gem::Dependency
+  name: grand_central
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +128,7 @@ files:
 - lib/power_strip/app.rb
 - lib/power_strip/channel.rb
 - lib/power_strip/channel_list.rb
+- lib/power_strip/connection.rb
 - lib/power_strip/message.rb
 - lib/power_strip/version.rb
 - opal/power_strip.rb
@@ -109,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Push data from server to client with Ruby