celluloid_pubsub_redis_adapter 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c050f38bf54731c74e711dcdb33da27392d439d
-  data.tar.gz: ec3e0cbbc2646a66ebbdb5f08b173146181e0483
+  metadata.gz: 73b79525e3545c65355fd561620dfb8cd8fad210
+  data.tar.gz: 6b24ec5729c9cb006128e8835ba5eb20e49db228
 SHA512:
-  metadata.gz: 69caa7a39b0b49aaaa0aa3e8548bf7a90c0325b87b82ae5f0db8ce835517b4e514ce616825d433a76a48110748c6cf4454a773a11bf3971a3ee267368e120523
-  data.tar.gz: 8e50eed11bc2298f5f9143f99e39df7334818692c1f96743e7da8d9dc68057f315930d63ffa588adb5652ab34e7374907ab4a03be319c965d4a799d1e76cf154
+  metadata.gz: 288599af4036a11117a08f7ba90e8967db0c0fd81480efd9d7b6715d468215767b25a59d9c1f5dc2443eddbf79c09d570f5cec72ca8a57961259560b8110ede0
+  data.tar.gz: b036226e8d2e32f5a907d7bc45670c02b0faf693c2a556720d8c49e9d149012f7f8918d66f60c76d95da142a11856c417e2d2e737630e3a1fe0af363273d36a2

data/.travis.yml

@@ -1,15 +1,27 @@
+language: ruby
 sudo: false
+
 cache: bundler
-language: ruby
+
+bundler_args: --binstubs=./bin
+
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - gem install bundler
+  - gem update bundler
+
+before_script:
+  - bundle update
+
+install:
+- bundle install --path vendor/bundle
+
+script: bundle exec rake
+
 rvm:
-- 1.9.3
-- 2.0.0
-- 2.1.5
 - 2.2.2
-- 2.2.3
+- 2.2.5
+- 2.3.1
 env:
  - RAILS_ENV=test RACK_ENV=test
 notifications:

data/celluloid_pubsub_redis_adapter.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(/^(spec)/)
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'celluloid_pubsub', '~> 1.0', '>= 1.0.1'
+  s.add_runtime_dependency 'celluloid_pubsub', '~> 1.0', '>= 1.0.3'
   s.add_runtime_dependency 'em-hiredis', '~> 0.3', '>= 0.3.0'
 
   s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4'

data/lib/celluloid_pubsub_redis_adapter/redis_reactor.rb

@@ -28,7 +28,7 @@ module CelluloidPubsub
     # @return [void]
     #
     # @api public
-    def unsubscribe(channel)
+    def unsubscribe(channel, data)
       super
       async.redis_action('unsubscribe', channel)
     end
@@ -61,7 +61,7 @@ module CelluloidPubsub
     # @return [void]
     #
     # @api public
-    def unsubscribe_all
+    def unsubscribe_all(channel, data)
       info 'clearing connections'
       shutdown
     end
@@ -74,7 +74,7 @@ module CelluloidPubsub
     # @api public
     def shutdown
       @channels.dup.each do |channel|
-        redis_action('unsubscribe', channel)
+        redis_action('unsubscribe', channel) unless ENV['RACK_ENV'] == 'test'
       end if @channels.present?
       super
     end
@@ -84,7 +84,7 @@ module CelluloidPubsub
     # @return [void]
     #
     # @api public
-    def publish_event(topic, data)
+    def server_pusblish_event(topic, data)
       return if topic.blank? || data.blank?
       connect_to_redis do |connection|
         connection.publish(topic, data)

data/lib/celluloid_pubsub_redis_adapter/version.rb

@@ -15,7 +15,7 @@ module CelluloidPubsubRedisAdapter
     # major release version
     MAJOR = 0
     # minor release version
-    MINOR = 3
+    MINOR = 4
     # tiny release version
     TINY = 0
     # prelease version ( set this only if it is a prelease)

data/spec/lib/celluloid_pubsub/reactor_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 describe CelluloidPubsub::RedisReactor do
   let(:websocket) { mock }
   let(:server) { mock }
+  let(:mutex) { mock }
 
   before(:each) do
     subject.stubs(:async).returns(subject)
@@ -13,6 +14,7 @@ describe CelluloidPubsub::RedisReactor do
     server.stubs(:handle_dispatched_message)
     server.stubs(:subscribers).returns({})
     server.stubs(:redis_enabled?).returns(false)
+    server.stubs(:adapter).returns(CelluloidPubsub::RedisReactor)
     websocket.stubs(:read)
     websocket.stubs(:url)
     websocket.stubs(:close)
@@ -22,6 +24,8 @@ describe CelluloidPubsub::RedisReactor do
     subject.stubs(:run)
     subject.work(websocket, server)
     subject.stubs(:unsubscribe_from_channel).returns(true)
+    server.stubs(:mutex).returns(mutex)
+    mutex.stubs(:synchronize).yields(server)
     Celluloid::Actor.stubs(:kill).returns(true)
   end
 
@@ -76,47 +80,46 @@ describe CelluloidPubsub::RedisReactor do
 
   describe '#handle_parsed_websocket_message' do
     it 'handle_websocket_message with a hash' do
-      data = { 'client_action' => 'b' }
+      data = { 'client_action' => 'subscribe' }
       data.expects(:stringify_keys).returns(data)
       subject.expects(:delegate_action).with(data)
       subject.handle_parsed_websocket_message(data)
     end
 
     it 'handle_websocket_message with something else than a hash' do
-      data = 'some message'
-      subject.expects(:handle_unknown_action).with(data)
+      data = { 'message'=> 'some message' }
+      subject.expects(:handle_unknown_action).with(data['channel'], data)
       subject.handle_parsed_websocket_message(data)
     end
   end
 
   describe '#delegate_action' do
+    before(:each) do
+      subject.stubs(:unsubscribe_clients).returns(true)
+      subject.stubs(:shutdown).returns(true)
+    end
+
     it 'unsubscribes all' do
-      data = { 'client_action' => 'unsubscribe_all' }
-      subject.expects(:unsubscribe_all).returns('bla')
+      data = { 'client_action' => 'unsubscribe_all', 'channel' => '' }
+      subject.expects(:send).with(data['client_action'], data['channel'], data).returns('bla')
       subject.delegate_action(data)
     end
 
     it 'unsubscribes all' do
       data = { 'client_action' => 'unsubscribe', 'channel' => 'some channel' }
-      subject.expects(:unsubscribe).with(data['channel'])
+      subject.expects(:send).with(data['client_action'], data['channel'], data)
       subject.delegate_action(data)
     end
-
+    #
     it 'subscribes to channell' do
       data = { 'client_action' => 'subscribe', 'channel' => 'some channel' }
-      subject.expects(:start_subscriber).with(data['channel'], data)
+      subject.expects(:send).with(data['client_action'], data['channel'], data)
       subject.delegate_action(data)
     end
 
     it 'publish' do
       data = { 'client_action' => 'publish', 'channel' => 'some channel', 'data' => 'some data' }
-      subject.expects(:publish_event).with(data['channel'], data['data'].to_json)
-      subject.delegate_action(data)
-    end
-
-    it 'handles unknown' do
-      data = { 'client_action' => 'some action', 'channel' => 'some channel' }
-      subject.expects(:handle_unknown_action).with(data)
+      subject.expects(:send).with(data['client_action'], data['channel'], data)
       subject.delegate_action(data)
     end
   end
@@ -124,41 +127,67 @@ describe CelluloidPubsub::RedisReactor do
   describe '#handle_unknown_action' do
     it 'handles unknown' do
       data = 'some data'
+      channel = "some_channel"
       server.expects(:handle_dispatched_message)
-      subject.handle_unknown_action(data)
+      subject.handle_unknown_action(channel, data)
     end
   end
 
   describe '#unsubscribe_client' do
     let(:channel) { 'some channel' }
+      let(:data) { {'client_action' => 'unsubscribe', 'channel' => channel } }
+
+      before(:each) do
+        subject.stubs(:redis_action).returns(nil)
+      end
+
     it 'returns nil' do
-      act = subject.unsubscribe('')
+
+      act = subject.unsubscribe('', data)
       expect(act).to eq(nil)
     end
 
     it 'unsubscribes' do
-      subject.channels.stubs(:blank?).returns(false)
-      subject.channels.expects(:delete).with(channel)
-      act = subject.unsubscribe(channel)
-      expect(act).to eq([])
+      channel.stubs(:present?).returns(true)
+      subject.expects(:forget_channel).with(channel)
+      subject.expects(:delete_server_subscribers).with(channel)
+      act = subject.unsubscribe(channel, data)
+      expect(act).to eq(nil)
+    end
+   end
+
+  describe '#delete_server_subscribers' do
+    let(:channel) { 'some channel' }
+
+    before(:each) do
+      server.stubs(:subscribers).returns("#{channel}" => [{ reactor: subject }])
     end
 
+    it 'unsubscribes' do
+      act = subject.delete_server_subscribers(channel)
+      expect(server.subscribers[channel]).to eq([])
+    end
+  end
+
+  describe '#forget_channel' do
+    let(:channel) { 'some channel' }
+
     it 'unsubscribes' do
       subject.channels.stubs(:blank?).returns(true)
       subject.websocket.expects(:close)
-      act = subject.unsubscribe(channel)
-      expect(act).to eq([])
+      act = subject.forget_channel(channel)
+      expect(act).to eq(nil)
     end
 
     it 'unsubscribes' do
       subject.channels.stubs(:blank?).returns(false)
-      subject.channels.stubs(:delete)
-      server.stubs(:subscribers).returns("#{channel}" => [{ reactor: subject }])
-      subject.unsubscribe(channel)
-      expect(server.subscribers[channel]).to eq([])
+      subject.channels.expects(:delete).with(channel)
+    #  server.stubs(:subscribers).returns("#{channel}" => [{ reactor: subject }])
+      subject.forget_channel(channel)
+    #  expect(server.subscribers[channel]).to eq([])
     end
   end
-
+  #
   describe '#shutdown' do
     it 'shutdowns' do
       subject.expects(:terminate)
@@ -171,26 +200,15 @@ describe CelluloidPubsub::RedisReactor do
     let(:message) { { a: 'b' } }
 
     it 'subscribes ' do
-      act = subject.start_subscriber('', message)
+      act = subject.subscribe('', message)
       expect(act).to eq(nil)
     end
 
     it 'subscribes ' do
       subject.stubs(:add_subscriber_to_channel).with(channel, message)
-      server.stubs(:redis_enabled?).returns(false)
-      subject.websocket.expects(:<<).with(message.merge('client_action' => 'successful_subscription', 'channel' => channel).to_json)
-      subject.start_subscriber(channel, message)
+      subject.subscribe(channel, message)
     end
 
-    #    it 'raises error' do
-    #      subject.stubs(:add_subscriber_to_channel).raises(StandardError)
-    #
-    #      expect do
-    #        subject.start_subscriber(channel, message)
-    #      end.to raise_error(StandardError) { |e|
-    #        expect(e.message).to include(channel)
-    #      }
-    #    end
   end
 
   describe '#add_subscriber_to_channel' do
@@ -198,6 +216,10 @@ describe CelluloidPubsub::RedisReactor do
     let(:message) { { a: 'b' } }
     let(:subscribers) { mock }
 
+    before(:each) do
+      subject.stubs(:redis_action).returns(nil)
+    end
+
     it 'adds subscribed' do
       CelluloidPubsub::Registry.channels.stubs(:include?).with(channel).returns(false)
       CelluloidPubsub::Registry.channels.expects(:<<).with(channel)
@@ -213,9 +235,10 @@ describe CelluloidPubsub::RedisReactor do
     let(:message) { { a: 'b' } }
 
     it 'adds subscribed' do
+      subject.stubs(:shutdown).returns(true)
       CelluloidPubsub::Registry.stubs(:channels).returns([channel])
-      subject.expects(:unsubscribe_from_channel).with(channel)
-      subject.unsubscribe_all
+    #  subject.expects(:unsubscribe_clients)
+      subject.unsubscribe_all(channel, message)
     end
   end
 end

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ formatters << Coveralls::SimpleCov::Formatter # if ENV['TRAVIS']
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
 
 Coveralls.wear!
-SimpleCov.start 'rails' do
+SimpleCov.start do
   add_filter 'spec'
 
   at_exit {}
@@ -45,3 +45,15 @@ RSpec.configure do |config|
     end
   end
 end
+
+unless defined?(silence_stream) # Rails 5
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+    old_stream.close
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid_pubsub_redis_adapter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - bogdanRada
@@ -19,7 +19,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: em-hiredis
   requirement: !ruby/object:Gem::Requirement