rasti-web 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 831a4d1eeebc387c8e40196939035027bb83f63e
-  data.tar.gz: 2e0f0a273055f0d863d008744f2a22d48e885731
+  metadata.gz: 39d44ecda3273b692c0f8ffd3e10cc863a9de55b
+  data.tar.gz: b0abe6f3e033b6490cd97410a2310e05e85ac683
 SHA512:
-  metadata.gz: 7316d529b5ac6595603cb9f26bec14dcf5e70ece674987f99a27bf7388fbd22dfeeb05e8d0c08c0d7bf37a7df02318eff0c6672858291c7761139d9ddad4930f
-  data.tar.gz: ff916df63a04677a72dab94f3f0cec2ef4ea5f0324f7461833ca93b0331da9df9e40c6b6be184cfe7a6f185d7ef53ec025b4bcf9584b32e52ad232dd82485af0
+  metadata.gz: b7784e46d19cea8a8962fcc4c4b261e098eca09a51b0e96aa52e1d027a547658dd5224fd64022987b5bc7f4ae9f801f3f2300442de38e47307a8c5abe07568f7
+  data.tar.gz: 53b8cc43486cfea71985d15869d5a5eb62617fd9579e5134cc6793ffae88e0aab296999f3cd60fbcea0c9b9f9c688d1f89423fcb1646be5bc4cf91ba1181383b

data/.travis.yml

@@ -7,4 +7,6 @@ rvm:
   - 2.3.0
   - jruby
 before_install:
-  - gem install bundler
+  - gem install bundler
+services:
+  - redis-server

data/lib/rasti/web/channel.rb

@@ -2,33 +2,53 @@ module Rasti
   module Web
     class Channel
 
-      def initialize
+      attr_reader :streams
+
+      def initialize(id)
         @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
+          mutex.synchronize do
+            streams << stream
           end
         end
       end
 
       def publish(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
+        channel.publish message
       end
 
       def self.[](id)
-        @channels ||= Hash.new { |h,k| h[k] = Channel.new }
+        @channels ||= Hash.new { |h,k| h[k] = self.new id }
         @channels[id]
       end
+
+      private
+
+      attr_reader :mutex, :channel
+
+      def listen
+        Thread.new do
+          channel.subscribe do |message|
+            broadcast message
+          end
+        end
+      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

data/lib/rasti/web/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module Web
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/lib/rasti/web.rb

@@ -7,6 +7,7 @@ require 'class_config'
 require 'forwardable'
 require 'logger'
 require 'hash_ext'
+require 'restruct'
 
 require_relative 'web/route'
 require_relative 'web/router'
@@ -33,6 +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']
 
     after_config do |config|
       config.helpers.each { |h| ViewContext.send :include, h }

data/rasti-web.gemspec

@@ -24,6 +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_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 11.0'

data/spec/streaming_spec.rb

@@ -20,13 +20,21 @@ describe 'Straming' do
       response.body.each { |e| events << e }
     end
 
+    channel = Rasti::Web::Channel[:test_channel]
+    sleep 0.05 # Wait for establish connection
+
     3.times do |i|
       data = {text: "Tick #{i}"}
       event = Rasti::Web::ServerSentEvent.new data, id: i, event: 'tick'
-      Rasti::Web::Channel[:test_channel].publish event
+      channel.publish event
     end
 
-    while events.count < 3; sleep 0.0001 end
+    Timeout.timeout(3) do
+      while events.count < 3; 
+        sleep 0.0001 # Wait for subscriptions
+      end
+    end
+    
     response.body.close 
 
     events.must_equal 3.times.map { |i| "id: #{i}\nevent: tick\ndata: {\"text\":\"Tick #{i}\"}\n\n" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: restruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement