rasti-web 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec9566c3c8cf96790406973506e6d9322ec10bc2
-  data.tar.gz: 25e1535210a4212bb3733281376cfc7b2f3384ea
+  metadata.gz: 9172df969941d8ed2283476d1dc516f664db5f5d
+  data.tar.gz: 241e91821c0b1ebcea756210a53371c7ee66da7c
 SHA512:
-  metadata.gz: d0f0f7cdbc4ddc35f0a8638c9537507b13622e41fc792104d4e4275ac8a366b9460cddb8b50d892626bce440546411b3663e89af1b064a2e2143bd9821d7d383
-  data.tar.gz: 069d05769cb012f2b3f987f1317570a429951c9713eae3c1c37ad1b2928f00b357cf08c5df48680fc30f620190273470af33bfbde2f2fa918019c5f53637b72a
+  metadata.gz: 04d240bc622d210776cbab344355d7bc076adf3958a20eea4a7b28b3e2bad1d0bf629986e34fa32565b60263eaf6b74356e2b60307c419a50e9014d87d1be95b
+  data.tar.gz: dce35f9da9aee7a7de97881601301e6b44f71ab7710ec424fa691e9889591f2578e3bbb6ab02a692e4550791fdc9233c5430ad580d5f0c9dfcdff91e00aa1228

data/lib/rasti/web/channel.rb

@@ -1,26 +1,39 @@
 module Rasti
   module Web
+
     class Channel
 
-      attr_reader :streams
+      attr_reader :id
 
       def initialize(id)
+        @id = id
+        @subscriptions = {}
         @mutex = Mutex.new
-        @channel = Restruct::Channel.new id: Restruct::Id[Web.channels_prefix][id]
-        @streams = []
-        listen
       end
 
       def subscribe
-        Stream.new.tap do |stream|
-          mutex.synchronize do
-            streams << stream
+        stream = Stream.new
+        
+        subscription_id = broadcaster.subscribe id do |message|
+          if stream.open?
+            stream.write message
+          else
+            sid = mutex.synchronize { subscriptions.delete stream }
+            broadcaster.unsubscribe sid
           end
         end
+
+        mutex.synchronize { subscriptions[stream] = subscription_id }
+
+        stream
       end
 
       def publish(message)
-        channel.publish message
+        broadcaster.publish id, message
+      end
+
+      def self.broadcaster
+        @broadcaster ||= Broadcaster.new id: Web.channels_prefix
       end
 
       def self.[](id)
@@ -30,26 +43,12 @@ module Rasti
 
       private
 
-      attr_reader :mutex, :channel
+      attr_reader :subscriptions, :mutex
 
-      def listen
-        Thread.new do
-          channel.subscribe do |message|
-            broadcast message
-          end
-        end
+      def broadcaster
+        self.class.broadcaster
       end
 
-      def broadcast(message)
-        mutex.synchronize do
-          streams.delete_if(&:closed?)
-          Rasti::Web.logger.debug(Channel) { "Broadcasting (#{streams.count} connections) -> #{message}" } unless streams.empty?
-          streams.each do |stream|
-            stream.write message
-          end
-        end
-      end
-      
     end
   end
 end

data/lib/rasti/web/stream.rb

@@ -15,7 +15,7 @@ module Rasti
       end
 
       def each
-        while opened?
+        while open?
           message = @queue.pop
           yield message if message
           sleep TIMEOUT
@@ -30,7 +30,7 @@ module Rasti
         @closed
       end
 
-      def opened?
+      def open?
         !closed?
       end
 

data/lib/rasti/web/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module Web
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/lib/rasti/web.rb

@@ -7,7 +7,7 @@ require 'class_config'
 require 'forwardable'
 require 'logger'
 require 'hash_ext'
-require 'restruct'
+require 'broadcaster'
 
 require_relative 'web/route'
 require_relative 'web/router'
@@ -34,7 +34,7 @@ module Rasti
     attr_config :default_layout, 'layout'
     attr_config :helpers, []
     attr_config :logger, Logger.new(STDOUT)
-    attr_config :channels_prefix, Restruct::Id['rasti-web']['channels']
+    attr_config :channels_prefix, 'rasti-web:channels'
 
     after_config do |config|
       config.helpers.each { |h| ViewContext.send :include, h }

data/rasti-web.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'class_config', '~> 0.0.2'
   spec.add_dependency 'hash_ext', '~> 0.1'
   spec.add_dependency 'content-type', '~> 0.0'
-  spec.add_dependency 'restruct', '~> 0.2'
+  spec.add_dependency 'broadcaster', '~> 0.1'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 11.0'

data/spec/minitest_helper.rb

@@ -15,4 +15,8 @@ Rasti::Web.configure do |config|
   config.views_path = File.expand_path '../views', __FILE__
   config.helpers << ContextMethodHelper
   config.logger.level = Logger::ERROR
+end
+
+Broadcaster.configure do |config|
+  config.logger = Rasti::Web.logger
 end

data/spec/streaming_spec.rb

@@ -5,6 +5,14 @@ describe 'Straming' do
   let(:request) { Rack::Request.new Hash.new }
   let(:response) { Rack::Response.new }
   let(:render) { Rasti::Web::Render.new request, response }
+
+  def wait_for(&block)
+    Timeout.timeout(3) do
+      while !block.call
+        sleep 0.0001
+      end
+    end
+  end
   
   it 'Server sent events' do
     render.server_sent_events :channel_1
@@ -16,13 +24,13 @@ describe 'Straming' do
     response.body.must_be_instance_of Rasti::Web::Stream
 
     events = []
-    thread = Thread.new do
+    
+    Thread.new do
       response.body.each { |e| events << e }
     end
 
     channel_1 = Rasti::Web::Channel[:channel_1]
     channel_2 = Rasti::Web::Channel[:channel_2]
-    sleep 0.05 # Wait for establish connection
 
     3.times do |i|
       data = {text: "Tick #{i}"}
@@ -31,11 +39,7 @@ describe 'Straming' do
       channel_2.publish event
     end
 
-    Timeout.timeout(3) do
-      while events.count < 3; 
-        sleep 0.0001 # Wait for subscriptions
-      end
-    end
+    wait_for { events.count == 3 }
     
     response.body.close 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: restruct
+  name: broadcaster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement