celluloid_pubsub 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84fed17bb7b7f680cc92ad2900ca83c309eedfab
-  data.tar.gz: 32d11a27090ea768554e42339585231511be8ea7
+  metadata.gz: 0f998246dbe87fcedc0e697fd863dc8cb4c0a905
+  data.tar.gz: 04834e2e23f0cb946992bcd7bf76133a448c69bf
 SHA512:
-  metadata.gz: 0cd3969ed8cf6d4818a6031176915341115cf30331fce14831f6a97ec7c54de9cac529baf4733a75b0c15cb21c7aaab8701133170ad9ff496d00f5c3499d3901
-  data.tar.gz: cd352a6d4adbd6e170d454f907b3c329e4fc695ab3093b1d647083df6698b2df96aa9938cf915a7141fee5ddc7c87521e925cd44ab5b76c6da65a88433b84d90
+  metadata.gz: 04af564aa19cba0cfb5cd6591d23825c7e44ce63e2f7e22a0f1bfddce2c6dbbc3aef28b144bd1c625c35e321e77b24c3d21b89fbc234fa8506f6f2cd46e2394f
+  data.tar.gz: 51ef6c1817146611d0bf047747d95f5acbc252217ad4886fa149f8e22d21dc58f36da2ac52f8b541a5c1e5d12bea0abe06f4ab82d9e32233c219116ccbbe2d23

data/.rubocop.yml

@@ -3,12 +3,12 @@ AllCops:
     - washout_builder.gemspec
     - bin/**/*
     - Guardfile
-    - vendor/**/*
-    - examples/**/*
+    - vendor/**/**
+    - examples/**/**
 
 ClassLength:
   Max: 500
-  
+
 Documentation:
   Enabled: true
 

data/README.md

@@ -8,6 +8,8 @@ Description
 
 CelluloidPubsub is a simple ruby implementation of publish subscribe design patterns using celluloid actors and websockets, using Celluloid::Reel server
 
+Starting with version 0.7.0, Support for Celluloid 0.17 has been added.
+
 Starting with version 0.6.0, Redis support was moved into gem [celluloid_pubsub_redis_adapter](https://github.com/bogdanRada/celluloid_pubsub_redis_adapter)
 
 Requirements

data/celluloid_pubsub.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(/^(spec)/)
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'celluloid', '~> 0.16', '~> 0.16.0' # TODO: upgrade to version 0.17 - work in progress
-  s.add_runtime_dependency 'celluloid-io', '~> 0.16', '>= 0.16.2'
+  s.add_runtime_dependency 'celluloid', '>= 0.16', '>= 0.16.0'
+  s.add_runtime_dependency 'celluloid-io', '>= 0.16', '>= 0.16.2'
   s.add_runtime_dependency 'reel', '~> 0.6', '>= 0.6.0'
   s.add_runtime_dependency 'http', '~> 1.0', '>= 1.0.2'
   s.add_runtime_dependency 'celluloid-websocket-client', '~> 0.0', '>= 0.0.1'

data/examples/simple_test.rb

@@ -8,7 +8,6 @@ log_file_path = File.join(File.expand_path(File.dirname(__FILE__)), 'log', 'cell
 # actor that subscribes to a channel
 class FirstActor
   include Celluloid
-  include Celluloid::Logger
 
   def initialize(options = {})
     @client = CelluloidPubsub::Client.new({ actor: Actor.current, channel: 'test_channel' }.merge(options))
@@ -34,7 +33,6 @@ end
 # actor that publishes a message in a channel
 class SecondActor
   include Celluloid
-  include Celluloid::Logger
 
   def initialize(options = {})
     @client = CelluloidPubsub::Client.new({ actor: Actor.current, channel: 'test_channel2' }.merge(options))
@@ -57,9 +55,12 @@ class SecondActor
 end
 
 
-CelluloidPubsub::WebServer.supervise_as(:web_server, enable_debug: debug_enabled, adapter: nil,log_file_path: log_file_path )
-FirstActor.supervise_as(:first_actor, enable_debug: debug_enabled)
-SecondActor.supervise_as(:second_actor, enable_debug: debug_enabled)
+# please don't use the BaseActor class to supervise actors. This is subject to change . This class is used only to test backward compatibility.
+# For more information on how to supervise actors please see Celluloid wiki.
+CelluloidPubsub::BaseActor.setup_actor_supervision(CelluloidPubsub::WebServer, actor_name: :web_server, args: {enable_debug: debug_enabled, adapter: nil,log_file_path: log_file_path })
+CelluloidPubsub::BaseActor.setup_actor_supervision(FirstActor, actor_name: :first_actor, args: {enable_debug: debug_enabled })
+CelluloidPubsub::BaseActor.setup_actor_supervision(SecondActor, actor_name: :second_actor, args: {enable_debug: debug_enabled })
+
 signal_received = false
 
 Signal.trap('INT') do

data/lib/celluloid_pubsub/base_actor.rb

@@ -0,0 +1,55 @@
+require_relative './helper'
+module CelluloidPubsub
+  # base actor used for compatibility between celluloid versions
+  module BaseActor
+
+    class << self
+      include Helper
+      attr_reader :config
+
+      def included(base)
+        base.include Celluloid
+        base.include Celluloid::IO
+        base.include CelluloidPubsub::Helper
+        base.include config['logger_class']
+      end
+
+      def config
+        {
+          'logger_class' => celluloid_logger_class
+        }
+      end
+
+      def celluloid_logger_class
+        if version_less_than_seventeen?
+          Celluloid::Logger
+        else
+          Celluloid::Internals::Logger
+        end
+      end
+
+      def celluloid_version
+        find_loaded_gem_property('celluloid', 'version')
+      end
+
+      def version_less_than_seventeen?
+        verify_gem_version('celluloid', '0.17', operator: '<')
+      end
+
+      def setup_actor_supervision(class_name, options)
+        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]])
+        end
+      end
+
+    end
+  end
+end
+
+if CelluloidPubsub::BaseActor.version_less_than_seventeen?
+  require 'celluloid/autostart'
+else
+  require 'celluloid/current'
+end

data/lib/celluloid_pubsub/client.rb

@@ -13,9 +13,8 @@ module CelluloidPubsub
   # @!attribute channel
   #   @return [String] The channel to which the client will subscribe to
   class Client
-    include Celluloid
-    include Celluloid::Logger
-    include CelluloidPubsub::Helper
+    include CelluloidPubsub::BaseActor
+    
 
     attr_accessor :actor, :options, :channel
     finalizer :shutdown

data/lib/celluloid_pubsub/helper.rb

@@ -12,7 +12,36 @@ module CelluloidPubsub
       message.is_a?(Hash) && message['client_action'] == 'successful_subscription'
     end
 
-  module_function
+    module_function
+
+    def find_loaded_gem(name, property = nil)
+      gem_spec = Gem.loaded_specs.values.find { |repo| repo.name == name }
+      gem_spec.present? && property.present? ? gem_spec.send(property) : gem_spec
+    end
+
+    def find_loaded_gem_property(gem_name, property = 'version')
+      find_loaded_gem(gem_name, property)
+    end
+
+    def fetch_gem_version(gem_name)
+      version = find_loaded_gem_property(gem_name)
+      version.blank? ? nil : get_parsed_version(version)
+    end
+
+    def get_parsed_version(version)
+      return 0 if version.blank?
+      version = version.to_s.split('.')
+      if version.size > 2
+        version.pop until version.size == 2
+      end
+      version.join('.').to_f
+    end
+
+    def verify_gem_version(gem_version, version, options = {})
+      options.stringify_keys!
+      version = get_parsed_version(version)
+      get_parsed_version(gem_version).send(options.fetch('operator', '<='), version)
+    end
 
     # method used to determine if a action is a subsribe action
     # @param [string] action The action that will be checked

data/lib/celluloid_pubsub/reactor.rb

@@ -12,11 +12,8 @@ module CelluloidPubsub
   #
   # @!attribute channels
   #   @return [Array] array of channels to which the current reactor has subscribed to
-  class Reactor
-    include Celluloid
-    include Celluloid::IO
-    include Celluloid::Logger
-    include CelluloidPubsub::Helper
+  class Reactor 
+    include CelluloidPubsub::BaseActor
 
     attr_accessor :websocket, :server, :channels
     finalizer :shutdown

data/lib/celluloid_pubsub/version.rb

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

data/lib/celluloid_pubsub/web_server.rb

@@ -14,8 +14,7 @@ module CelluloidPubsub
   # @!attribute subscribers
   #   @return [Hash] The hostname on which the webserver runs on
   class WebServer < Reel::Server::HTTP
-    include Celluloid::Logger
-    include CelluloidPubsub::Helper
+    include CelluloidPubsub::BaseActor
 
     # The hostname on which the webserver runs on by default
     HOST = '0.0.0.0'

data/lib/celluloid_pubsub.rb

@@ -1,8 +1,11 @@
-require 'celluloid'
+require 'rubygems'
+require 'bundler'
+require 'bundler/setup'
 require 'celluloid/io'
 require 'reel'
 require 'celluloid/websocket/client'
 require 'active_support/all'
 require 'json'
+require 'celluloid_pubsub/base_actor'
 Gem.find_files('celluloid_pubsub/initializers/**/*.rb').each { |path| require path }
 Gem.find_files('celluloid_pubsub/**/*.rb').each { |path| require path }

data/spec/spec_helper.rb

@@ -44,3 +44,11 @@ RSpec.configure do |config|
     end
   end
 end
+
+
+# class used for testing actions
+class TestActor
+  include CelluloidPubsub::BaseActor
+end
+
+CelluloidPubsub::BaseActor.setup_actor_supervision(TestActor, actor_name: :test_actor, args: { })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - bogdanRada
@@ -14,27 +14,27 @@ dependencies:
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
     - - ">="
@@ -44,7 +44,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
     - - ">="
@@ -368,6 +368,7 @@ files:
 - examples/simple_test.rb
 - init.rb
 - lib/celluloid_pubsub.rb
+- lib/celluloid_pubsub/base_actor.rb
 - lib/celluloid_pubsub/client.rb
 - lib/celluloid_pubsub/helper.rb
 - lib/celluloid_pubsub/initializers/reel_colors.rb