pubsubstub 0.1.3 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6549edd3271aea9f63868a73df5e2d7abbac4cc3
-  data.tar.gz: 771ff6a8653ff3f956ba5396b1bbcef79f6f6eb4
+SHA256:
+  metadata.gz: 6c8dd8515862da676e40ce08fc68bbacc2c3fc1a5d5774fe0120c45606a0f40e
+  data.tar.gz: b09ba3fcf02b39d4f119daecb8ea8e6099ae06d60466d88c04602a51f654be90
 SHA512:
-  metadata.gz: fc27ef10f261293dc52adf96789fb5c7de4ac1065cc4a2b8257f3c36d9afe63c9a4c734c90c923d43bc2960404e733bdbe6c525a91197e15b6a166361bde8a4f
-  data.tar.gz: 3ccd4fb1ef9886ba092d1d33d16c9d8e013a165f31eeb6f229354fea5fa6bc89bb3f115fd465f15f2cfac8a3817aa82589aa1f50aa53bfb9bb5f074e2da9d26c
+  metadata.gz: 76cb8590bb052cfd85426def3697bbf17a870119c6720469a42a2bb3ae5a33e960ccfb4d983855d30525134870a3b71443b19a59279d62180b45b80562938867
+  data.tar.gz: 6f8ff354315f011a332f0a838c499adfcd8cb8c5ad8fa0905376abf9fa8541dc232a56400dfe591eae3f5f82a7ca4f44347b3cdfa1b9dee517d88f83bcc5d8e9

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,10 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in pubsubstub.gemspec
 gemspec
 
-gem "rspec", "3.1.0"
-gem "pry-byebug"
-gem "puma", "~> 3.4"
-gem "thin", "~> 1.6"
+gem "rspec"
+gem "puma"
+gem "thin"
 gem "rack-test"
 gem "timecop"
-gem "rake", "~> 10.0"
+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

@@ -24,7 +24,7 @@ module Pubsubstub
       else
         send_scrollback(channels, last_event_id)
       end
-      [200, HEADERS, stream]
+      [200, HEADERS.dup, stream]
     end
 
     private
@@ -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/subscriber.rb

@@ -31,7 +31,7 @@ module Pubsubstub
       # redis.client.call allow to bypass the client mutex
       # Since we now that the only other possible caller is blocking on reading the socket this is safe
       synchronize do
-        redis.client.call(['punsubscribe', pubsub_pattern])
+        redis._client.call(['punsubscribe', pubsub_pattern])
       end
     end
 

data/lib/pubsubstub/version.rb

@@ -1,3 +1,3 @@
 module Pubsubstub
-  VERSION = "0.1.3"
+  VERSION = "0.2.2"
 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($/)
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'rack'
-  spec.add_dependency 'redis', "~> 3.0"
+  spec.add_dependency 'redis', "~> 4.0"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
 end

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
@@ -36,4 +25,9 @@ RSpec.configure do |config|
   config.order = 'random'
 
   config.before(:each) { Redis.new(url: Pubsubstub.redis_url).flushdb }
+
+  # Clean threads after finish
+  config.after(:each) do
+    Thread.list.each { |thread| thread.join(0.5) if thread != Thread.current }
+  end
 end

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/subscriber_spec.rb

@@ -10,12 +10,17 @@ RSpec.describe Pubsubstub::Subscriber do
       subject.add_event_listener('plop', -> (event) { published_events << event })
       subscribe_thread = Thread.new { subject.start }
 
-      expect { subject.subscribed? }.to happen
+      expect { subject.subscribed? }.to happen.in_under(1)
 
       events.each(&channel.method(:publish))
 
+      expect { published_events.size == events.size }.to happen.in_under(2)
+
       subject.stop
-      expect { !subject.subscribed? }.to happen
+
+      subscribe_thread.join(2)
+
+      expect { ! subject.subscribed? }.to happen.in_under(1)
 
       expect(subscribe_thread).to complete
 

data/spec/support/http_helpers.rb

@@ -4,9 +4,9 @@ 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) do |http|
+        Net::HTTP.start(uri.host, uri.port, open_timeout: 10) do |http|
           request = Net::HTTP::Get.new uri.request_uri
           headers.each do |name, value|
             request.add_field(name, value)
@@ -33,7 +33,7 @@ module HTTPHelpers
       end
     end
 
-    queue
+    return queue, thread
   end
 
   ROOT_PATH = File.join(__dir__, '../..')

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: pubsubstub
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.2
 platform: ruby
 authors:
 - Guillaume Malette
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   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: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 description: Pubsubstub can be added to a rack Application or deployed standalone.
   It uses Redis to do the Pub/Sub
 email:
@@ -62,9 +62,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".github/workflows/ci.yml"
+- ".gitignore"
+- ".rspec"
 - 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,28 +95,27 @@ 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: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Pubsubstub is a rack middleware to add Pub/Sub
 test_files:

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.2
-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,11 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rack', '< 2'
-gem 'redis', '~> 3.0'
-gem "rspec", "3.1.0"
-gem "pry-byebug"
-gem "puma", "~> 3.4"
-gem "thin", "~> 1.6"
-gem "rack-test"
-gem "timecop"
-gem "rake", "~> 10.0"

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

@@ -1,57 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (9.0.5)
-    coderay (1.1.1)
-    daemons (1.2.4)
-    diff-lcs (1.2.5)
-    eventmachine (1.2.0.1)
-    method_source (0.8.2)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    puma (3.6.0)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (10.5.0)
-    redis (3.3.1)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    slop (3.6.0)
-    thin (1.7.0)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    timecop (0.8.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  pry-byebug
-  puma (~> 3.4)
-  rack (< 2)
-  rack-test
-  rake (~> 10.0)
-  redis (~> 3.0)
-  rspec (= 3.1.0)
-  thin (~> 1.6)
-  timecop
-
-BUNDLED WITH
-   1.12.5

data/gemfiles/Gemfile.rack-2.x

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

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

@@ -1,57 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (9.0.5)
-    coderay (1.1.1)
-    daemons (1.2.4)
-    diff-lcs (1.2.5)
-    eventmachine (1.2.0.1)
-    method_source (0.8.2)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    puma (3.6.0)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (10.5.0)
-    redis (3.3.1)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    slop (3.6.0)
-    thin (1.7.0)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    timecop (0.8.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  pry-byebug
-  puma (~> 3.4)
-  rack (~> 2.0)
-  rack-test
-  rake (~> 10.0)
-  redis (~> 3.0)
-  rspec (= 3.1.0)
-  thin (~> 1.6)
-  timecop
-
-BUNDLED WITH
-   1.12.5