rasti-web-broadcaster 0.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c5ea9872ad3ad27ea065c433a32b300353bf158f
-  data.tar.gz: c617495332f8606763045bfa2215dbb15b87af31
+SHA256:
+  metadata.gz: 0e5290c1fe92680bd88bd05f57f91b1d49a6848516865a6da8cfdb8d47cf6f44
+  data.tar.gz: eef7f1069f999eddd07fe89a7d6059e95bd669fbae2030f75d2fef0b180bf2b5
 SHA512:
-  metadata.gz: bb1500dd98e5a7f7bd2237778152091081460517a7fe6d9099557b9a9f16ed44703f277429e38d9eeaa3a5a6772abee95c3325710e2c21bda03a7bb8a991f3ba
-  data.tar.gz: b387a4fc765699f4cb866e2338ecdcce9ee2114d74cafae042a7b88e6ac38b865ace9ac9ec0267aa6601a6c9cc01ff416087070f9fe87c401db681ffdfbcfce2
+  metadata.gz: db5ca61f44dcb3ebaab5557cca6c245a8e7bccca22833b2aaa0aa38428a0baa5e0c9b0f7c8133ac7fb7e132a2ee173d39e4135a486b747209ed90cadd2d71b60
+  data.tar.gz: 06bebe40478194b3dceea7fd7a2b670cd75997630170d7ab54b72f7142c57bcdaf3b94a2d6969bf26de1f3c3eeddd581a2bbe338fe205cf251fe14c6cc6db313

data/.travis.yml

@@ -1,13 +1,23 @@
 language: ruby
+
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
-  - 2.3.0
-  - 2.4.0
-  - jruby
-before_install:
-  - gem install bundler
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - jruby-9.2.9.0
+  - ruby-head
+  - jruby-head
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
 services:
   - redis-server

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://travis-ci.org/gabynaiman/rasti-web-broadcaster.svg?branch=master)](https://travis-ci.org/gabynaiman/rasti-web-broadcaster)
 [![Coverage Status](https://coveralls.io/repos/gabynaiman/rasti-web-broadcaster/badge.svg?branch=master)](https://coveralls.io/r/gabynaiman/rasti-web-broadcaster?branch=master)
 [![Code Climate](https://codeclimate.com/github/gabynaiman/rasti-web-broadcaster.svg)](https://codeclimate.com/github/gabynaiman/rasti-web-broadcaster)
-[![Dependency Status](https://gemnasium.com/gabynaiman/rasti-web-broadcaster.svg)](https://gemnasium.com/gabynaiman/rasti-web-broadcaster)
 
 Enable server sent events with rack middleware implemented over Faye and Broadcaster (Redis Pub/Sub)
 
@@ -30,7 +29,7 @@ Or install it yourself as:
 ```ruby
 Rasti::Web::Broadcaster.configure do |config|
   config.id = 'AppName'
-  config.redis_url = "redis://#{ENV['REDIS_HOST']}:#{ENV['REDIS_PORT']}"
+  config.redis_settings = "redis://#{ENV['REDIS_HOST']}:#{ENV['REDIS_PORT']}"
   config.logger = Logger.new "/log/#{ENV['RACK_ENV']}.log"
 end
 ```
@@ -38,6 +37,9 @@ end
 ### Rack middleware
 ```ruby
 use Rasti::Web::Broadcaster
+
+headers = {'Access-Control-Allow-Origin' => '*'}
+use Rasti::Web::Broadcaster, headers
 ```
 
 ### Publishing events from the web
@@ -51,7 +53,7 @@ Rasti::Web::Broadcaster.publish channel_id, data:  'hello'      # string or json
 ```ruby
 require 'broadcaster'
 
-broadcaster = Broadcaster.new id: 'AppName', redis_url: "redis://#{ENV['REDIS_HOST']}:#{ENV['REDIS_PORT']}"
+broadcaster = Broadcaster.new id: 'AppName', redis_settings: "redis://#{ENV['REDIS_HOST']}:#{ENV['REDIS_PORT']}"
 
 broadcaster.publish channel_id, data: 'hello'
 ```

data/lib/rasti/web/broadcaster.rb

@@ -3,6 +3,7 @@ require 'broadcaster'
 require 'class_config'
 
 require_relative 'broadcaster/safe_event_machine'
+require_relative 'broadcaster/safe_rack_lint'
 require_relative 'broadcaster/version'
 
 module Rasti
@@ -11,9 +12,12 @@ module Rasti
 
       extend ClassConfig
 
-      attr_config :id,        'rasti.web.broadcaster'
-      attr_config :redis_url, 'redis://localhost:6379'
-      attr_config :logger,    Logger.new(STDOUT)
+      attr_config :id,             'rasti.web.broadcaster'
+      attr_config :redis_client,   Redic
+      attr_config :redis_settings, 'redis://localhost:6379'
+      attr_config :logger,         Logger.new(STDOUT)
+
+      @mutex = Mutex.new
 
       class << self
 
@@ -26,18 +30,21 @@ module Rasti
         private
 
         def broadcaster
-          @broadcaster ||= ::Broadcaster.new configuration
+          @mutex.synchronize do
+            @broadcaster ||= ::Broadcaster.new configuration
+          end
         end
 
       end
 
-      def initialize(app)
+      def initialize(app, headers={})
         @app = app
+        @headers = headers
       end
 
       def call(env)
         if Faye::EventSource.eventsource? env
-          event_source = Faye::EventSource.new env
+          event_source = Faye::EventSource.new env, headers: @headers
           channel = env['PATH_INFO'][1..-1]
 
           subscription_id = self.class.subscribe channel do |message|

data/lib/rasti/web/broadcaster/safe_rack_lint.rb

@@ -0,0 +1,7 @@
+if defined?(Rack::Lint::HijackWrapper) && !Rack::Lint::HijackWrapper.instance_methods.include?(:to_int)
+  class Rack::Lint::HijackWrapper
+    def to_int
+      @io.to_i
+    end
+  end
+end

data/lib/rasti/web/broadcaster/version.rb

@@ -1,7 +1,7 @@
 module Rasti
   module Web
     class Broadcaster
-      VERSION = '0.1.0'
+      VERSION = '1.1.2'
     end
   end
 end

data/rasti-web-broadcaster.gemspec

@@ -18,13 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'faye-websocket', '~> 0.10'
-  spec.add_runtime_dependency 'broadcaster', '~> 0.1'
+  spec.add_runtime_dependency 'faye-websocket', '~> 0.11'
+  spec.add_runtime_dependency 'broadcaster', '~> 1.0', '>= 1.0.2'
   spec.add_runtime_dependency 'class_config', '~> 0.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 11.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'minitest', '~> 5.0', '< 5.11'
   spec.add_development_dependency 'minitest-colorin', '~> 0.1'
   spec.add_development_dependency 'minitest-line', '~> 0.6'
   spec.add_development_dependency 'simplecov', '~> 0.12'
@@ -32,13 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-nav', '~> 0.2'
   spec.add_development_dependency 'rack-test', '~> 0.6'
 
-  if RUBY_VERSION < '2'
-    spec.add_development_dependency 'term-ansicolor', '~> 1.3.0'
-    spec.add_development_dependency 'tins', '~> 1.6.0'
-    spec.add_development_dependency 'json', '~> 1.8'
-  end
-
   if RUBY_VERSION < '2.2.2'
     spec.add_development_dependency 'rack', '< 2'
   end
-end
+end

data/spec/middleware_spec.rb

@@ -8,6 +8,7 @@ describe Rasti::Web::Broadcaster do
     event << 'Content-Type: text/event-stream'
     event << 'Cache-Control: no-cache, no-store'
     event << 'Connection: close'
+    event << 'Access-Control-Allow-Origin: *'
     event << ''
     event << 'retry: 5000'
     event << ''
@@ -33,7 +34,11 @@ describe Rasti::Web::Broadcaster do
     end
   end
 
-  let(:app) { Rasti::Web::Broadcaster.new ->(env) { [200, {}, ['hello']] } }
+  let(:headers) { {'Access-Control-Allow-Origin' => '*'} }
+
+  let(:inner_app) { ->(env) { [200, {}, ['hello']] } }
+
+  let(:app) { Rasti::Web::Broadcaster.new inner_app, headers }
 
   it 'Handle events' do
     env = Rack::MockRequest.env_for '/channel_1', 'HTTP_ACCEPT' => 'text/event-stream',
@@ -41,12 +46,12 @@ describe Rasti::Web::Broadcaster do
 
     event_source = nil
     events = []
-    
+
     env['async.callback'] = proc do |(status, headers, body)|
       event_source = body.instance_variable_get(:@socket_object)
       body.each { |e| events << e }
     end
-    
+
     Rasti::Web::Broadcaster.publish 'channel_1', data: 'message 0'
 
     app.call env
@@ -61,7 +66,7 @@ describe Rasti::Web::Broadcaster do
 
     events.must_equal [
       event_headers,
-      event_for(data: 'message 1', event: 'event_1', id: 1), 
+      event_for(data: 'message 1', event: 'event_1', id: 1),
       event_for(data: 'message 3')
     ]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web-broadcaster
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: broadcaster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: class_config
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: minitest-colorin
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +196,7 @@ files:
 - lib/rasti-web-broadcaster.rb
 - lib/rasti/web/broadcaster.rb
 - lib/rasti/web/broadcaster/safe_event_machine.rb
+- lib/rasti/web/broadcaster/safe_rack_lint.rb
 - lib/rasti/web/broadcaster/version.rb
 - rasti-web-broadcaster.gemspec
 - spec/coverage_helper.rb
@@ -222,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Rack middleware for server sent events