litecable 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4640e78d6f9a77cf9257cb0774ff249ec1b5f699
-  data.tar.gz: a2cc894fc9e355baa79d82afde6682c570ddc21c
+  metadata.gz: a4cd86a9f6cb1636c77ec87485b61050eaffade5
+  data.tar.gz: d602270a3b4e9f8e57744a226219743a6e71c510
 SHA512:
-  metadata.gz: '0588bb0b62119753f79382bfe9955f7db54a693f2625c05426bcf08f131ed8b5b10fdb1e2bd0950545e030530ecfa823383c037747e654b43e7aa650db7187cb'
-  data.tar.gz: 6365980a8eece62d0d092349ed583afb1a04e749577f994da5da004dfe4576b64c07edc8744680eecda8f9637d726e6c878a0d50cd281c322070adb67c36df37
+  metadata.gz: 5959fb92c1c91a96f94f06c94af4a6ee27f6958c9b4690a4bb28091a37c5ba464534e5d5f1480c7d80e68694fbf112db3f6803d5a514ad867b98cbccbc1ba779
+  data.tar.gz: 7d5aec25eaf3fadc7a210b10bcd1d6797e0329d58dcf80ee1dbf552d85aa8a4f2c01be8b3699b4cc3e4252c2bf77915b847936169cf13401695667192916488c

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change log
 
-## master
+## 0.4.1 (2017-02-04)
+
+- Use `websocket-ruby` with subprotocols support ([@palkan][])
+
+## 0.4.0 (2017-01-29)
 
 - Initial version. ([@palkan][])
 

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/litecable.svg)](https://rubygems.org/gems/litecable) [![Build Status](https://travis-ci.org/anycable/litecable.svg?branch=master)](https://travis-ci.org/anycable/litecable) [![Circle CI](https://circleci.com/gh/anycable/litecable/tree/master.svg?style=svg)](https://circleci.com/gh/anycable/anycable/tree/master)
+[![Gem Version](https://badge.fury.io/rb/litecable.svg)](https://rubygems.org/gems/litecable) [![Build Status](https://travis-ci.org/palkan/litecable.svg?branch=master)](https://travis-ci.org/palkan/litecable) [![Circle CI](https://circleci.com/gh/palkan/litecable/tree/master.svg?style=svg)](https://circleci.com/gh/palkan/litecable/tree/master)
 
 # Lite Cable
 

data/examples/sinatra/Gemfile

@@ -9,8 +9,8 @@ gem 'puma'
 gem 'pry-byebug'
 
 # litecable deps
-gem "anyway_config", "~>0.5.0"
-gem "websocket"
+gem "anyway_config", "~> 0.5.0"
+gem "websocket", "~> 1.2.4"
 
 # anycable
 gem "anycable", "~> 0.4.2"

data/examples/sinatra/chat.rb

@@ -7,7 +7,7 @@ module Chat
     identified_by :user, :sid
 
     def connect
-      @user = cookies["user"]
+      @user = cookies["user"] || 'John'
       @sid = request.params["sid"]
       reject_unauthorized_connection unless @user
       $stdout.puts "#{@user} connected"

data/examples/sinatra/views/room.slim

@@ -11,7 +11,7 @@ h2 ="Room: #{@room_id}"
         span Send!
 
 javascript:
-  var roomId = #{{ @room_id }};
+  var roomId = "#{{ @room_id }}";
   var user = "#{{ @user }}";
   var socketId = Date.now();
 

data/lib/lite_cable/connection/subscriptions.rb

@@ -56,7 +56,7 @@ module LiteCable
         when "unsubscribe" then remove(data["identifier"])
         when "message"     then perform_action(data["identifier"], data["data"])
         else
-          raise UnknownCommandError
+          raise UnknownCommandError, "Command not found #{command}"
         end
       end
 

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

@@ -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

data/lib/lite_cable/server/middleware.rb

@@ -1,7 +1,6 @@
 # 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
@@ -30,10 +29,11 @@ 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]
+        )
 
+        handshake.from_rack env
         env['rack.hijack_io'].write handshake.to_s
         handshake
       end

data/lib/lite_cable/version.rb

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

data/litecable.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "anyway_config", "~>0.5.0"
 
   spec.add_development_dependency "rack", "~> 2.0"
-  spec.add_development_dependency "websocket", "~> 1.2.0"
+  spec.add_development_dependency "websocket", "~> 1.2.4"
   spec.add_development_dependency "websocket-client-simple", "~> 0.3.0"
   spec.add_development_dependency "concurrent-ruby", "~> 1.0.0"
   spec.add_development_dependency "puma", "~> 3.6.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litecable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -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
@@ -225,7 +225,6 @@ 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

data/lib/lite_cable/server/websocket_ext/protocols.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-# Add missing protocols support to websocket-ruby
-module WebSocketExt
-  module Protocols # :nodoc:
-    module Handshake # :nodoc:
-      # Specify server protocols
-      def protocols(values)
-        @protocols = values
-      end
-
-      # Return matching protocol
-      def protocol
-        return @protocol if instance_variable_defined?(:@protocol)
-        protos = @headers['sec-websocket-protocol']
-
-        return @protocol = nil unless protos
-        @protocol = begin
-          protos = protos.split(/ *, */) if protos.is_a?(String)
-          protos.find { |p| @protocols.include?(p) }
-        end
-      end
-    end
-
-    module Handler # :nodoc:
-      def handshake_keys
-        return super unless @handshake.protocol
-        super + [
-          [
-            'Sec-WebSocket-Protocol',
-            @handshake.protocol
-          ]
-        ]
-      end
-    end
-  end
-end
-
-WebSocket::Handshake::Server.include WebSocketExt::Protocols::Handshake
-[
-  WebSocket::Handshake::Handler::Server04,
-  WebSocket::Handshake::Handler::Server75,
-  WebSocket::Handshake::Handler::Server76
-].each do |handler|
-  handler.prepend WebSocketExt::Protocols::Handler
-end