celluloid_pubsub 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a9695736f77a9058642129bc301b000da27ed4
-  data.tar.gz: 5d626707aec391b2e7e409a402a8da9cc2dbfb98
+  metadata.gz: 2c8492791d62fac1a25802a1f220f34f75c4f57c
+  data.tar.gz: 0c95d4091fdc3becc7ecf07707d4aed11f006c4b
 SHA512:
-  metadata.gz: b583c4c34ff483903aaf081d8a204e67514112210c76976b17ab4809dfade9f7a90dd763d04955da135361b497d4291a312ed1a4a8c6ba88f5f199bc3c49172f
-  data.tar.gz: 7424cf9bf1ebc91c08e334f3da91736ef7c2f531310823283e531d0eab7b46bf89be1f791e1df1e5ca741d3b96110d562ab37c14a9673661d8c66c51c85a6500
+  metadata.gz: 77a0d22a464b8a45713b8ea366f8f5653cc3ee44b4d4d089a9a1b23d8f58ab47d1be05a38bfcb4da0a919970b8fa06dd81b5c86f7b74a42fc06d6353f2f94737
+  data.tar.gz: 05ca183e6aa33cd0a4695a333ab015ce5485d7989e964fef0527378bffcb67b2e5ca11239584e3cf09242043626b63425bfc079929d5a9abcb93bc80b28dfe3a

data/Rakefile

@@ -1,26 +1,14 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
+require 'appraisal'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
 require 'yard'
 Coveralls::RakeTask.new
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = ['--backtrace', '--fail-fast'] if ENV['DEBUG']
-end
-
-YARD::Config.options[:load_plugins] = true
-YARD::Config.load_plugins
-
-# dirty hack for YardocTask
-::Rake.application.class.class_eval do
-  alias_method :last_comment, :last_description
-end
-
-YARD::Rake::YardocTask.new do |t|
-  t.files = ['lib/**/*.rb', 'spec/**/*_spec.rb'] # optional
-  t.options = ['--any', '--extra', '--opts', '--markup-provider=redcarpet', '--markup=markdown', '--debug'] # optional
-  t.stats_options = ['--list-undoc'] # optional
+  spec.rspec_opts = ['--backtrace '] if ENV['DEBUG']
+  spec.verbose = true
 end
 
 desc 'Default: run the unit tests.'
@@ -29,12 +17,29 @@ task default: [:all]
 desc 'Test the plugin under all supported Rails versions.'
 task :all do |_t|
   if ENV['TRAVIS']
-    exec('bundle exec rake  spec && bundle exec rake coveralls:push')
+    # require 'json'
+    # puts JSON.pretty_generate(ENV.to_hash)
+    if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
+      appraisal_name = ENV['BUNDLE_GEMFILE'].scan(/rails\_(.*)\.gemfile/).flatten.first
+      command_prefix = "appraisal rails-#{appraisal_name}"
+      exec ("#{command_prefix} bundle install && #{command_prefix} bundle exec rspec && bundle exec rake coveralls:push ")
+    else
+      exec(' bundle exec appraisal install && bundle exec rake appraisal spec && bundle exec rake coveralls:push')
+   end
   else
-    exec('bundle exec rake spec')
+    exec('bundle exec appraisal install && bundle exec rake appraisal spec')
   end
 end
 
+YARD::Config.options[:load_plugins] = true
+YARD::Config.load_plugins
+
+YARD::Rake::YardocTask.new do |t|
+  t.files = ['lib/**/*.rb', 'spec/**/*_spec.rb'] # optional
+  t.options = ['--any', '--extra', '--opts', '--markup-provider=redcarpet', '--markup=markdown', '--debug'] # optional
+  t.stats_options = ['--list-undoc'] # optional
+end
+
 task :docs do
   exec('bundle exec inch --pedantic && bundle exec yard --list-undoc')
 end

data/celluloid_pubsub.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'celluloid-pmap', '~> 0.2', '>= 0.2.2'
   s.add_runtime_dependency 'activesupport', '>= 4.0', '>= 4.0'
 
-
+  s.add_development_dependency 'appraisal', '~> 2.1', '>= 2.1'
   s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4'
   s.add_development_dependency 'simplecov', '~> 0.10', '>= 0.10'
   s.add_development_dependency 'simplecov-summary', '~> 0.0.4', '>= 0.0.4'

data/lib/celluloid_pubsub/base_actor.rb

@@ -40,7 +40,7 @@ module CelluloidPubsub
         if version_less_than_seventeen?
           class_name.supervise_as(options[:actor_name], options[:args])
         else
-          class_name.supervise(as: options[:actor_name], args: [options[:args]])
+          class_name.supervise(as: options[:actor_name], args: [options[:args]].compact)
         end
       end
 

data/lib/celluloid_pubsub/reactor.rb

@@ -222,7 +222,7 @@ module CelluloidPubsub
       return unless channel.present?
       forget_channel(channel)
       @server.mutex.synchronize do
-        (@server.subscribers[channel].dup || []).delete_if do |hash|
+        (@server.subscribers[channel] || []).delete_if do |hash|
           hash[:reactor] == Actor.current
         end
       end

data/lib/celluloid_pubsub/version.rb

@@ -17,7 +17,7 @@ module CelluloidPubsub
     # minor release version
     MINOR = 8
     # tiny release version
-    TINY = 0
+    TINY = 1
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

data/lib/celluloid_pubsub.rb

@@ -6,6 +6,7 @@ require 'reel'
 require 'celluloid/websocket/client'
 require 'active_support/all'
 require 'json'
+require 'thread'
 require 'celluloid/pmap'
 require 'celluloid_pubsub/base_actor'
 Gem.find_files('celluloid_pubsub/initializers/**/*.rb').each { |path| require path }

data/spec/lib/celluloid_pubsub/reactor_spec.rb

@@ -5,6 +5,8 @@ require 'spec_helper'
 describe CelluloidPubsub::Reactor do
   let(:websocket) { mock }
   let(:server) { mock }
+  let(:mutex) { mock }
+  let(:synchronizer) { mock }
 
   before(:each) do
     subject.stubs(:async).returns(subject)
@@ -22,6 +24,8 @@ describe CelluloidPubsub::Reactor 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
 
@@ -140,14 +144,14 @@ describe CelluloidPubsub::Reactor do
       subject.channels.stubs(:blank?).returns(false)
       subject.channels.expects(:delete).with(channel)
       act = subject.unsubscribe(channel)
-      expect(act).to eq([])
+      expect(act).to eq(nil)
     end
 
     it 'unsubscribes' do
       subject.channels.stubs(:blank?).returns(true)
       subject.websocket.expects(:close)
       act = subject.unsubscribe(channel)
-      expect(act).to eq([])
+      expect(act).to eq(nil)
     end
 
     it 'unsubscribes' do

data/spec/spec_helper.rb

@@ -49,6 +49,21 @@ end
 # class used for testing actions
 class TestActor
   include CelluloidPubsub::BaseActor
+
+  def initialize(*args)
+  end
 end
 
 CelluloidPubsub::BaseActor.setup_actor_supervision(TestActor, actor_name: :test_actor, args: { })
+
+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
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - bogdanRada
@@ -124,6 +124,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement