celluloid_pubsub 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdde06fb1422bf75d45e6f83706c695288d9c42e
-  data.tar.gz: f98a1a07331fbc7fcb67ee168191c0e4510b5181
+  metadata.gz: 2205e89d97959a97cb9a4887be58c2633478e1f4
+  data.tar.gz: 7fae7ef47ce0afd1c13caaad16b7d56f7de15246
 SHA512:
-  metadata.gz: 02f4c5e864fa97fa3cffbb2cdf30f0f5dddf7f6341c2b042b247cbc75209118feb79cb9570ebae48f7e7ac6928a3ebdf1df7247523001f84a0d4bf04873d25c9
-  data.tar.gz: b8e905df5512a160194ea0ea13e0034c62ffbaa6b05031fa63df6f7c3d2af8384b49eba3e12a2092ffefd343e28061a5823319094c754576fe086e4ccafe1ba2
+  metadata.gz: 3e09e51937f275c8eac631cbfe66403810da789bf4062e4e32812fdf54ac5ceb119f3ee2be4357040aa7e3751e56941dbdcd7e414235e6722a8dcffc3321a414
+  data.tar.gz: 9dd88606ce87f7418ab94a9108820833327762f4b4d214057311c6154dc7846237934485f26c387a304974bf785bff395ca67c0e1187d46d2010e16df7c5d223

data/.travis.yml

@@ -1,9 +1,20 @@
+language: ruby
 sudo: false
+
 cache: bundler
-language: ruby
+
+bundler_args: --without test --jobs 3 --retry 3
+
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - gem install bundler
+  - gem update bundler
+
+install:
+- bundle install --path vendor/bundle
+
+script: bundle exec rake
+
 rvm:
 - 2.0.0
 - 2.1.5

data/Gemfile

@@ -2,8 +2,7 @@ source 'http://rubygems.org'
 
 gemspec
 
-if RUBY_VERSION >= "2.2.0"
-  gem 'activesupport', '>= 4.0', '>= 4.0'
-else
+if RUBY_VERSION < "2.2.0"
   gem 'activesupport', '>= 4.0', '< 5.0'
+  gem 'bundler' '< 1.13'
 end

data/gemfiles/celluloid_0.16.0.gemfile

@@ -2,7 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "activesupport", ">= 4.0", ">= 4.0"
 gem "celluloid", "0.16.0"
 
 gemspec :path => "../"

data/gemfiles/celluloid_0.17.3.gemfile

@@ -2,7 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "activesupport", ">= 4.0", ">= 4.0"
 gem "celluloid", "0.17.3"
 
 gemspec :path => "../"

data/lib/celluloid_pubsub/reactor.rb

@@ -147,12 +147,12 @@ module CelluloidPubsub
     #
     # @api public
     def handle_parsed_websocket_message(json_data)
-      if json_data.is_a?(Hash)
-        json_data = json_data.stringify_keys
+      data =  json_data.is_a?(Hash) ? json_data.stringify_keys : {}
+      if CelluloidPubsub::Reactor::AVAILABLE_ACTIONS.include?(data['client_action'].to_s)
         log_debug "#{self.class} finds actions for  #{json_data}"
-        delegate_action(json_data) if json_data['client_action'].present?
+        delegate_action(data) if data['client_action'].present?
       else
-        handle_unknown_action(json_data)
+        handle_unknown_action(data['channel'], json_data)
       end
     end
 
@@ -179,9 +179,7 @@ module CelluloidPubsub
     #
     # @api public
     def delegate_action(json_data)
-      channel, client_action = json_data.slice('channel', 'client_action').values
-      return unless CelluloidPubsub::Reactor::AVAILABLE_ACTIONS.include?(client_action)
-      async.send(client_action, channel, json_data)
+      async.send(json_data['client_action'], json_data['channel'], json_data)
     end
 
     # the method will delegate the message to the server in an asyncronous way by sending the current actor and the message
@@ -357,10 +355,10 @@ module CelluloidPubsub
     # @return [void]
     #
     # @api public
-    def unsubscribe_all(_channel, _json_data)
+    def unsubscribe_all(_channel, json_data)
       log_debug "#{self.class} runs 'unsubscribe_all' method"
       CelluloidPubsub::Registry.channels.dup.pmap do |channel|
-        unsubscribe_clients(channel)
+        unsubscribe_clients(channel, json_data)
       end
       log_debug 'clearing connections'
       shutdown

data/lib/celluloid_pubsub/version.rb

@@ -19,10 +19,10 @@ module CelluloidPubsub
     # minor release version
     MINOR = 0
     # tiny release version
-    TINY = 0
+    TINY = 1
     # prelease version ( set this only if it is a prelease)
     PRE = nil
-    
+
     # generates the version string
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/spec/lib/celluloid_pubsub/reactor_spec.rb

@@ -80,86 +80,108 @@ describe CelluloidPubsub::Reactor 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
-
+  #
   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 } }
     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)
+      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)
+      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
 
@@ -175,7 +197,7 @@ describe CelluloidPubsub::Reactor do
     let(:message) { { a: 'b' } }
 
     it 'subscribes ' do
-      act = subject.start_subscriber('', message)
+      act = subject.subscribe('', message)
       expect(act).to eq(nil)
     end
 
@@ -183,7 +205,7 @@ describe CelluloidPubsub::Reactor 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
@@ -218,8 +240,8 @@ describe CelluloidPubsub::Reactor do
 
     it 'adds subscribed' do
       CelluloidPubsub::Registry.stubs(:channels).returns([channel])
-      subject.expects(:unsubscribe_from_channel).with(channel)
-      subject.unsubscribe_all
+      subject.expects(:unsubscribe_from_channel).with(channel).returns(true)
+      subject.unsubscribe_all(channel, message)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid_pubsub
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid