celluloid_pubsub 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa7d11ef4c8c4386d6c1f038acffd1c09f8640e
-  data.tar.gz: f00d2631f80b29c369db480e2a6d48241a9b756b
+  metadata.gz: c703a33e176ab7877a83eb259536afa905b9aab2
+  data.tar.gz: d60ef25c80a4ebfffd92b9b289b9d1fdd0206a96
 SHA512:
-  metadata.gz: 43df4cecdb8b824ba3de71838be4688c75483044a7d2f80b99a9f579ff61e529396ae8c9da281370da1ed94da1343bd1127cddb8598c74a54421c50c3f8bd605
-  data.tar.gz: 7df5f27c57d397b2a4e1ded42eed6ca6f3fabdaf31b078f3d8f44b21bcac2d04dae614034b22d5ec8fca92cadcdbf582507f97f42190d4a00f0fb7b025052f1c
+  metadata.gz: 32e7cf4839a394666c6cc6c508781d6e2271f4faee03e4b10dc547984ea241f9fcd4e4320ee17481216f12bdaa5c4269caceac61320c770598471e5d8a28055f
+  data.tar.gz: 086654a510e94c6a1f4ab74ff34258e95e750e54a485d3d16577643b80249833a7ee58a4db5c37e2c175a46db09025a140423b00be45fd348b307f7ca2251259

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.9.0, the webserver will automatically detect an unused port instead of trying to connect by default to 1234 port. This solves some issues when this port is already used.**
+
 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)

data/lib/celluloid_pubsub/client.rb

@@ -88,7 +88,7 @@ module CelluloidPubsub
     #
     # @api public
     def port
-      @port ||= @options.fetch('port', CelluloidPubsub::WebServer::PORT)
+      @port ||= @options.fetch('port', nil) ||  CelluloidPubsub::WebServer.find_unused_port
     end
 
     # the method will return the path of the URL on which the servers acccepts the connection

data/lib/celluloid_pubsub/reactor.rb

@@ -40,7 +40,7 @@ module CelluloidPubsub
     #
     # @api public
     def debug_enabled?
-      @server.present? && @server.alive? && @server.debug_enabled?
+      !@server.dead? && @server.debug_enabled?
     end
 
     # reads from the socket the message
@@ -54,7 +54,7 @@ module CelluloidPubsub
     # :nocov:
     def run
       loop do
-        break if !Actor.current.alive? || @websocket.closed? || !@server.alive?
+        break if Actor.current.dead? || @websocket.closed? || @server.dead?
         message = try_read_websocket
         handle_websocket_message(message) if message.present?
       end

data/lib/celluloid_pubsub/version.rb

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

data/lib/celluloid_pubsub/web_server.rb

@@ -18,8 +18,6 @@ module CelluloidPubsub
 
     # The hostname on which the webserver runs on by default
     HOST = '0.0.0.0'
-    # The port on which the webserver runs on by default
-    PORT = 1234
     # The request path that the webserver accepts by default
     PATH = '/ws'
       # The name of the default adapter
@@ -46,10 +44,44 @@ module CelluloidPubsub
       @subscribers = {}
       @mutex = Mutex.new
       setup_celluloid_logger
-      log_debug "CelluloidPubsub::WebServer example starting on #{hostname}:#{port}"
+      debug "CelluloidPubsub::WebServer example starting on #{hostname}:#{port}"
       super(hostname, port, { spy: spy, backlog: backlog }, &method(:on_connection))
     end
 
+    # the method will  return the socket conection opened on the unused port
+    #
+    #
+    # @return [TCPServer]  return the socket connection opened on a random port
+    #
+    # @api public
+    def self.open_socket_on_unused_port
+      infos = ::Socket::getaddrinfo("localhost", nil, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+      families = Hash[*infos.collect { |af, *_| af }.uniq.zip([]).flatten]
+
+      return ::TCPServer.open('0.0.0.0', 0) if families.has_key?('AF_INET')
+      return ::TCPServer.open('::', 0) if families.has_key?('AF_INET6')
+      return ::TCPServer.open(0)
+    end
+
+    # the method get from the socket connection that is already opened the port used.
+    # @see #open_socket_on_unused_port
+    #
+    # @return [Integer]  returns the port that can be used to issue new connection
+    #
+    # @api public
+    def self.find_unused_port
+      @@unused_port ||= begin
+        socket = open_socket_on_unused_port
+        port = socket.addr[1]
+        socket.close
+        port
+      end
+    end
+
+    # this method is overriden from the Reel::Server::HTTP in order to set the spy to the celluloid logger
+    # before the connection is accepted.
+    # @see #handle_connection
+    # @api public
     def run
       @spy = Celluloid.logger if spy
       loop { async.handle_connection @server.accept }
@@ -115,7 +147,7 @@ module CelluloidPubsub
     #
     # @api public
     def port
-      @port = @server_options.fetch('port', CelluloidPubsub::WebServer::PORT)
+      @port ||= @server_options.fetch('port', nil) || self.class.find_unused_port
     end
 
     # the method will return the URL path on which will acceept connections

data/spec/lib/celluloid_pubsub/reactor_spec.rb

@@ -19,7 +19,7 @@ describe CelluloidPubsub::Reactor do
     websocket.stubs(:url)
     websocket.stubs(:close)
     websocket.stubs(:closed?).returns(false)
-    server.stubs(:alive?).returns(true)
+    server.stubs(:dead?).returns(false)
     subject.stubs(:inspect).returns(subject)
     subject.stubs(:run)
     subject.work(websocket, server)

data/spec/lib/celluloid_pubsub/web_server_spec.rb

@@ -7,10 +7,6 @@ describe CelluloidPubsub::WebServer do
     expect(CelluloidPubsub::WebServer::HOST).to eq('0.0.0.0')
   end
 
-  it 'should have host constant' do
-    expect(CelluloidPubsub::WebServer::PORT).to eq(1234)
-  end
-
   it 'should have host constant' do
     expect(CelluloidPubsub::WebServer::PATH).to eq('/ws')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid