pubsubstub 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115205de6d2987f1c983becef16c87452d844b33001a335105eb96f9a945ba74
-  data.tar.gz: d32a258717cb23cecc7d81e954938c499ffa6d8a9fdd68340a9e62cecbcffb17
+  metadata.gz: c0119eecc1e20e95bad0ebae583d2df813c76e3c99234d57ebea86ab4809fb3c
+  data.tar.gz: 5ea2a726c9e52f4fbd347bfaca1683d6ab5ae57d401c10699fe992f686b4e938
 SHA512:
-  metadata.gz: f92c6a3acf01542564683a9adf952ac0660bbc82612f294d34ba15864aac95d22b0ac9d778a7474101612528c6948e528a3291286c65e410a42394cbc5d9d2a3
-  data.tar.gz: 3caa10c0cebbe247632faf75d1259e4cba5fdfa8504b594f10826d8e6840ca560bb3d037c11d0e51acc65186ae73e1597199180a2d0880aea11d587fabc8feeb
+  metadata.gz: 210a377f7a47fa5a2a1d8b59a60b2a0aa83980fc25f5ec8e3895b731085180a4e90c0a9a20f90d67926d1bbb1126f05239a2614d28f32e1b0e0dafc985ccfd0f
+  data.tar.gz: 4eb1be772be42fbcfe66034ca1ed410eb75f858f64e764d0247be6ad324940b1eb9e68ba6199ffd67c5ae1439152327690f482fd9edc0a0015d513eeceab3b5e

data/.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Tests with Ruby ${{ matrix.ruby_version }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby_version:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+        options: --entrypoint redis-server
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby ${{ matrix.ruby_version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+        bundler-cache: true
+    - name: Run tests
+      env:
+        RAILS_ENV: test
+      run: |
+        bundle exec rake

data/Gemfile

@@ -3,11 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in pubsubstub.gemspec
 gemspec
 
-gem 'rspec', '~> 3.8'
-gem "pry-byebug"
-gem "byebug", '~> 10.0'
-gem "puma", "~> 3.4"
-gem "thin", "~> 1.6"
+gem "rspec"
+gem "puma"
+gem "thin"
 gem "rack-test"
 gem "timecop"
 gem "rake"

data/lib/pubsubstub/channel.rb

@@ -13,11 +13,11 @@ module Pubsubstub
     end
 
     def publish(event)
-      redis.pipelined do
-        redis.zadd(scrollback_key, event.id, event.to_json)
-        redis.zremrangebyrank(scrollback_key, 0, -Pubsubstub.channels_scrollback_size)
-        redis.expire(scrollback_key, Pubsubstub.channels_scrollback_ttl)
-        redis.publish(pubsub_key, event.to_json)
+      redis.pipelined do |pipeline|
+        pipeline.zadd(scrollback_key, event.id, event.to_json)
+        pipeline.zremrangebyrank(scrollback_key, 0, -Pubsubstub.channels_scrollback_size)
+        pipeline.expire(scrollback_key, Pubsubstub.channels_scrollback_ttl)
+        pipeline.publish(pubsub_key, event.to_json)
       end
     end
 

data/lib/pubsubstub/stream_action.rb

@@ -41,11 +41,7 @@ module Pubsubstub
     end
 
     def use_persistent_connections?
-      Pubsubstub.use_persistent_connections && !event_machine?
-    end
-
-    def event_machine?
-      defined?(EventMachine) && EventMachine.reactor_running?
+      Pubsubstub.use_persistent_connections
     end
 
     def subscribe_connection(channels, last_event_id)
@@ -74,12 +70,8 @@ module Pubsubstub
       @mutex.synchronize do
         return if defined? @helper_threads_initialized
         @helper_threads_initialized = true
-        if event_machine?
-          error { "EventMachine is loaded, running in degraded mode :/"}
-        else
-          start_subscriber
-          start_heartbeat
-        end
+        start_subscriber
+        start_heartbeat
       end
     end
 

data/lib/pubsubstub/version.rb

@@ -1,3 +1,3 @@
 module Pubsubstub
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/pubsubstub.rb

@@ -38,6 +38,10 @@ module Pubsubstub
       @redis || synchronize { @redis ||= new_redis }
     end
 
+    def redis=(client)
+      synchronize { @redis = client }
+    end
+
     def new_redis
       Redis.new(url: redis_url)
     end

data/pubsubstub.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["gmalette@gmail.com"]
   spec.summary       = %q{Pubsubstub is a rack middleware to add Pub/Sub}
   spec.description   = %q{Pubsubstub can be added to a rack Application or deployed standalone. It uses Redis to do the Pub/Sub}
-  spec.homepage      = "https://github.com/gmalette/pubsubstub"
+  spec.homepage      = "https://github.com/byroot/pubsubstub"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
 require 'open3'
 require 'rack/test'
-require 'pry'
-require 'pry-byebug'
 require 'timecop'
 require 'thread'
 
@@ -16,15 +14,6 @@ require_relative '../lib/pubsubstub'
 Pubsubstub.logger = Logger.new(nil)
 Pubsubstub.logger.level = Logger::DEBUG
 
-# Fake EM
-module EventMachine
-  extend self
-
-  def reactor_running?
-    false
-  end
-end
-
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.include HTTPHelpers

data/spec/stream_action_spec.rb

@@ -21,14 +21,6 @@ end
 describe Pubsubstub::StreamAction do
   let(:app) { Pubsubstub::StreamAction.new }
 
-  context "with EventMachine" do
-    before do
-      allow(EventMachine).to receive(:reactor_running?).and_return(true)
-    end
-
-    it_behaves_like "short lived connections"
-  end
-
   context "with persistent connections disabled" do
     around :example do |example|
       previous = Pubsubstub.use_persistent_connections
@@ -44,7 +36,7 @@ describe Pubsubstub::StreamAction do
     with_background_server do
       expect(9292).to listen.in_under(5)
 
-      chunks = async_get('http://localhost:9292/?channels[]=foo', 'Last-Event-Id' => '0')
+      chunks, thread = async_get('http://localhost:9292/?channels[]=foo', { 'Last-Event-Id' => '0' })
       expect(chunks.pop).to include("event: heartbeat\n")
 
       Pubsubstub.publish('foo', 'bar', id: 1)
@@ -52,6 +44,8 @@ describe Pubsubstub::StreamAction do
 
       Pubsubstub.publish('foo', 'baz', id: 2)
       expect(chunks.pop).to include("id: 2\n")
+    ensure
+      thread.kill
     end
   end
 
@@ -61,11 +55,13 @@ describe Pubsubstub::StreamAction do
     with_background_server do
       expect(9292).to listen.in_under(5)
 
-      chunks = async_get('http://localhost:9292/?channels[]=foo', 'Last-Event-Id' => '0')
+      chunks, thread = async_get('http://localhost:9292/?channels[]=foo', { 'Last-Event-Id' => '0' })
       expect(chunks.pop).to include("id: 1\n")
 
       Pubsubstub.publish('foo', 'baz', id: 2)
       expect(chunks.pop).to include("id: 2\n")
+    ensure
+      thread.kill
     end
   end
 end

data/spec/support/http_helpers.rb

@@ -4,7 +4,7 @@ module HTTPHelpers
   def async_get(uri, headers = {}, retries: 10, &block)
     uri = URI(uri.to_s)
     queue = Queue.new
-    Thread.start do
+    thread = Thread.start do
       begin
         Net::HTTP.start(uri.host, uri.port, open_timeout: 10) do |http|
           request = Net::HTTP::Get.new uri.request_uri
@@ -33,7 +33,7 @@ module HTTPHelpers
       end
     end
 
-    queue
+    return queue, thread
   end
 
   ROOT_PATH = File.join(__dir__, '../..')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubsubstub
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-27 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -62,9 +62,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -74,10 +74,6 @@ files:
 - example/Gemfile
 - example/config.ru
 - example/puma_config.rb
-- gemfiles/Gemfile.rack-1.x
-- gemfiles/Gemfile.rack-1.x.lock
-- gemfiles/Gemfile.rack-2.x
-- gemfiles/Gemfile.rack-2.x.lock
 - lib/pubsubstub.rb
 - lib/pubsubstub/application.rb
 - lib/pubsubstub/channel.rb
@@ -99,7 +95,7 @@ files:
 - spec/subscription_spec.rb
 - spec/support/http_helpers.rb
 - spec/support/threading_matchers.rb
-homepage: https://github.com/gmalette/pubsubstub
+homepage: https://github.com/byroot/pubsubstub
 licenses:
 - MIT
 metadata: {}
@@ -118,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Pubsubstub is a rack middleware to add Pub/Sub

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6.3
-gemfile:
-  - gemfiles/Gemfile.rack-1.x
-  - gemfiles/Gemfile.rack-2.x
-services:
-  - redis-server
-
-after_failure:
-  - cat tmp/puma.log

data/gemfiles/Gemfile.rack-1.x

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rack', '< 2'
-gem 'redis', '~> 4.0'
-gem 'rspec', '~> 3.8'
-gem "pry-byebug"
-gem "byebug", '~> 10.0'
-gem "puma", "~> 3.4"
-gem "thin", "~> 1.6"
-gem "rack-test"
-gem "timecop"
-gem "rake"

data/gemfiles/Gemfile.rack-1.x.lock

@@ -1,57 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (10.0.2)
-    coderay (1.1.2)
-    daemons (1.3.1)
-    diff-lcs (1.3)
-    eventmachine (1.2.7)
-    method_source (0.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    puma (3.12.1)
-    rack (1.6.11)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rake (12.3.3)
-    redis (4.1.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    thin (1.7.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    timecop (0.9.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  byebug (~> 10.0)
-  pry-byebug
-  puma (~> 3.4)
-  rack (< 2)
-  rack-test
-  rake
-  redis (~> 4.0)
-  rspec (~> 3.8)
-  thin (~> 1.6)
-  timecop
-
-BUNDLED WITH
-   1.17.3

data/gemfiles/Gemfile.rack-2.x

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rack', '~> 2.0'
-gem 'redis', '~> 4.0'
-gem 'rspec', '~> 3.8'
-gem "pry-byebug"
-gem "byebug", '~> 10.0'
-gem "puma", "~> 3.4"
-gem "thin", "~> 1.6"
-gem "rack-test"
-gem "timecop"
-gem "rake"

data/gemfiles/Gemfile.rack-2.x.lock

@@ -1,57 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (10.0.2)
-    coderay (1.1.2)
-    daemons (1.3.1)
-    diff-lcs (1.3)
-    eventmachine (1.2.7)
-    method_source (0.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    puma (3.12.1)
-    rack (2.0.7)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rake (12.3.3)
-    redis (4.1.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    thin (1.7.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    timecop (0.9.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  byebug (~> 10.0)
-  pry-byebug
-  puma (~> 3.4)
-  rack (~> 2.0)
-  rack-test
-  rake
-  redis (~> 4.0)
-  rspec (~> 3.8)
-  thin (~> 1.6)
-  timecop
-
-BUNDLED WITH
-   1.17.3