litecable 0.4.0 → 0.7.0

data/lib/lite_cable/connection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Connection # :nodoc:
     require "lite_cable/connection/authorization"

data/lib/lite_cable/connection/authorization.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Connection
     class UnauthorizedError < StandardError; end

data/lib/lite_cable/connection/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   # rubocop:disable Metrics/LineLength
   module Connection
@@ -79,6 +80,7 @@ module LiteCable
 
       def transmit(cable_message)
         return if disconnected?
+
         socket.transmit encode(cable_message)
       end
 

data/lib/lite_cable/connection/identification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "set"
 
 module LiteCable
@@ -13,6 +14,7 @@ module LiteCable
             define_method(identifier) do
               return instance_variable_get(:"@#{identifier}") if
                 instance_variable_defined?(:"@#{identifier}")
+
               fetch_identifier(identifier.to_s)
             end
           end
@@ -66,6 +68,7 @@ module LiteCable
         identifiers.each_with_object({}) do |id, acc|
           obj = instance_variable_get("@#{id}")
           next unless obj
+
           acc[id.to_s] = LiteCable.config.identifier_coder.encode(obj)
         end
       end

data/lib/lite_cable/connection/streams.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Connection
     # Manage the connection streams

data/lib/lite_cable/connection/subscriptions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Connection
     # Manage the connection channels and route messages
@@ -52,11 +53,11 @@ module LiteCable
       def execute_command(data)
         command = data.delete("command")
         case command
-        when "subscribe"   then add(data["identifier"])
+        when "subscribe" then add(data["identifier"])
         when "unsubscribe" then remove(data["identifier"])
-        when "message"     then perform_action(data["identifier"], data["data"])
+        when "message" then perform_action(data["identifier"], data["data"])
         else
-          raise UnknownCommandError
+          raise UnknownCommandError, "Command not found #{command}"
         end
       end
 
@@ -67,6 +68,7 @@ module LiteCable
       def find!(identifier)
         channel = find(identifier)
         raise ChannelNotFoundError unless channel
+
         channel
       end
 

data/lib/lite_cable/internal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   INTERNAL = {
     message_types: {

data/lib/lite_cable/logging.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'logger'
+
+require "logger"
 
 module LiteCable
   module Logging # :nodoc:
@@ -22,6 +23,7 @@ module LiteCable
 
     def log(level, message = nil)
       return unless LiteCable::Logging.logger
+
       LiteCable::Logging.logger.send(level, PREFIX) { message || yield }
     end
   end

data/lib/lite_cable/server.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   # Rack middleware to hijack sockets.
   #
@@ -14,12 +15,6 @@ module LiteCable
 
     class << self
       attr_accessor :subscribers_map
-
-      # Broadcast encoded message to the stream
-      def broadcast(stream, message, coder: nil)
-        coder ||= LiteCable.config.coder
-        subscribers_map.broadcast stream, message, coder
-      end
     end
 
     self.subscribers_map = SubscribersMap.new

data/lib/lite_cable/server/client_socket.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     module ClientSocket # :nodoc:

data/lib/lite_cable/server/client_socket/base.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     module ClientSocket
       # Wrapper over web socket
-      # rubocop:disable Metrics/ClassLength
       class Base
         include Logging
         include Subscriptions
@@ -17,10 +17,10 @@ module LiteCable
           @version = version
           @active = true
 
-          @open_handlers    = []
+          @open_handlers = []
           @message_handlers = []
-          @close_handlers   = []
-          @error_handlers   = []
+          @close_handlers = []
+          @error_handlers = []
 
           @close_on_error = true
         end
@@ -61,6 +61,7 @@ module LiteCable
           @error_handlers << block
         end
 
+        # rubocop: disable Metrics/MethodLength
         def listen
           keepalive
           Thread.new do
@@ -69,13 +70,11 @@ module LiteCable
               @open_handlers.each(&:call)
               each_frame do |data|
                 @message_handlers.each do |h|
-                  begin
-                    h.call(data)
-                  rescue => e
-                    log(:error, "Socket receive failed: #{e}")
-                    @error_handlers.each { |eh| eh.call(e, data) }
-                    close if close_on_error
-                  end
+                  h.call(data)
+                rescue => e # rubocop: disable Style/RescueStandardError
+                  log(:error, "Socket receive failed: #{e}")
+                  @error_handlers.each { |eh| eh.call(e, data) }
+                  close if close_on_error
                 end
               end
             ensure
@@ -83,6 +82,7 @@ module LiteCable
             end
           end
         end
+        # rubocop: enable Metrics/MethodLength
 
         def close
           return unless @active
@@ -113,6 +113,8 @@ module LiteCable
           frame = WebSocket::Frame::Outgoing::Server.new(version: version, type: :close, code: 1000)
           @socket.write(frame.to_s) if frame.supported?
           @socket.close
+        rescue IOError, Errno::EPIPE, Errno::ETIMEDOUT # rubocop:disable Lint/HandleExceptions
+          # already closed
         end
 
         def keepalive
@@ -129,22 +131,15 @@ module LiteCable
           end
         end
 
-        # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/PerceivedComplexity
-        # rubocop:disable Metrics/MethodLength
         def each_frame
           framebuffer = WebSocket::Frame::Incoming::Server.new(version: version)
 
           while IO.select([socket])
-            if socket.respond_to?(:recvfrom)
-              data, _addrinfo = socket.recvfrom(2000)
-            else
-              data, _addrinfo = socket.readpartial(2000), socket.peeraddr
-            end
+            data = socket.respond_to?(:recv) ? socket.recv(2000) : socket.readpartial(2000)
             break if data.empty?
+
             framebuffer << data
-            while frame = framebuffer.next
+            while frame = framebuffer.next # rubocop:disable Lint/AssignmentInCondition
               case frame.type
               when :close
                 return

data/lib/lite_cable/server/client_socket/subscriptions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     module ClientSocket
@@ -6,12 +7,12 @@ module LiteCable
       module Subscriptions
         def subscribe(channel, broadcasting)
           LiteCable::Server.subscribers_map
-                           .add_subscriber(broadcasting, self, channel)
+            .add_subscriber(broadcasting, self, channel)
         end
 
         def unsubscribe(channel, broadcasting)
           LiteCable::Server.subscribers_map
-                           .remove_subscriber(broadcasting, self, channel)
+            .remove_subscriber(broadcasting, self, channel)
         end
 
         def unsubscribe_from_all(channel)

data/lib/lite_cable/server/heart_beat.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     # Sends pings to sockets
@@ -22,6 +23,7 @@ module LiteCable
         @stopped = true
       end
 
+      # rubocop: disable Metrics/MethodLength
       def run
         Thread.new do
           Thread.current.abort_on_exception = true
@@ -39,11 +41,12 @@ module LiteCable
           end
         end
       end
+      # rubocop: enable Metrics/MethodLength
 
       private
 
       def ping_message(time)
-        { type: LiteCable::INTERNAL[:message_types][:ping], message: time }.to_json
+        {type: LiteCable::INTERNAL[:message_types][:ping], message: time}.to_json
       end
     end
   end

data/lib/lite_cable/server/middleware.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
-    require "lite_cable/server/websocket_ext/protocols"
     # Rack middleware to hijack the socket
     class Middleware
       class HijackNotAvailable < RuntimeError; end
@@ -12,15 +12,15 @@ module LiteCable
       end
 
       def call(env)
-        return [404, { 'Content-Type' => 'text/plain' }, ['Not Found']] unless
-          env["HTTP_UPGRADE"] == 'websocket'
+        return [404, {"Content-Type" => "text/plain"}, ["Not Found"]] unless
+          env["HTTP_UPGRADE"] == "websocket"
 
-        raise HijackNotAvailable unless env['rack.hijack']
+        raise HijackNotAvailable unless env["rack.hijack"]
 
-        env['rack.hijack'].call
+        env["rack.hijack"].call
         handshake = send_handshake(env)
 
-        socket = ClientSocket::Base.new env, env['rack.hijack_io'], handshake.version
+        socket = ClientSocket::Base.new env, env["rack.hijack_io"], handshake.version
         init_connection socket
         init_heartbeat socket
         socket.listen
@@ -30,11 +30,12 @@ module LiteCable
       private
 
       def send_handshake(env)
-        handshake = WebSocket::Handshake::Server.new
-        handshake.from_rack env
-        handshake.protocols LiteCable::INTERNAL[:protocols]
+        handshake = WebSocket::Handshake::Server.new(
+          protocols: LiteCable::INTERNAL[:protocols]
+        )
 
-        env['rack.hijack_io'].write handshake.to_s
+        handshake.from_rack env
+        env["rack.hijack_io"].write handshake.to_s
         handshake
       end
 

data/lib/lite_cable/server/subscribers_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     # From https://github.com/rails/rails/blob/v5.0.1/actioncable/lib/action_cable/subscription_adapter/subscriber_map.rb
@@ -31,6 +32,7 @@ module LiteCable
       def remove_socket(socket, channel)
         list = @sync.synchronize do
           return unless @sockets.key?(socket)
+
           @sockets[socket].dup
         end
 
@@ -42,6 +44,7 @@ module LiteCable
       def broadcast(stream, message, coder)
         list = @sync.synchronize do
           return unless @streams.key?(stream)
+
           @streams[stream].to_a
         end
 

data/lib/lite_cable/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
-  VERSION = "0.4.0"
+  VERSION = "0.7.0"
 end

data/lib/litecable.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 require "lite_cable"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: litecable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
@@ -72,54 +72,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -172,36 +172,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
-- circle.yml
-- examples/sinatra/Gemfile
-- examples/sinatra/Procfile
-- examples/sinatra/README.md
-- examples/sinatra/anycable
-- examples/sinatra/app.rb
-- examples/sinatra/assets/app.css
-- examples/sinatra/assets/cable.js
-- examples/sinatra/assets/reset.css
-- examples/sinatra/bin/anycable-go
-- examples/sinatra/chat.rb
-- examples/sinatra/config.ru
-- examples/sinatra/views/index.slim
-- examples/sinatra/views/layout.slim
-- examples/sinatra/views/login.slim
-- examples/sinatra/views/resetcss.slim
-- examples/sinatra/views/room.slim
 - lib/lite_cable.rb
 - lib/lite_cable/anycable.rb
+- lib/lite_cable/broadcast_adapters.rb
+- lib/lite_cable/broadcast_adapters/any_cable.rb
+- lib/lite_cable/broadcast_adapters/base.rb
+- lib/lite_cable/broadcast_adapters/memory.rb
 - lib/lite_cable/channel.rb
 - lib/lite_cable/channel/base.rb
 - lib/lite_cable/channel/registry.rb
@@ -225,14 +204,17 @@ files:
 - lib/lite_cable/server/heart_beat.rb
 - lib/lite_cable/server/middleware.rb
 - lib/lite_cable/server/subscribers_map.rb
-- lib/lite_cable/server/websocket_ext/protocols.rb
 - lib/lite_cable/version.rb
 - lib/litecable.rb
-- litecable.gemspec
-homepage: https://github.com/anycable/litecable
+homepage: https://github.com/palkan/litecable
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: http://github.com/palkan/litecable/issues
+  changelog_uri: https://github.com/palkan/litecable/blob/master/CHANGELOG.md
+  documentation_uri: http://github.com/palkan/litecable
+  homepage_uri: http://github.com/palkan/litecable
+  source_code_uri: http://github.com/palkan/litecable
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -241,15 +223,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Fat-free ActionCable implementation