anycable-rails 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e7d4840bcd92e76e1f94add4f95ab50f959b290
-  data.tar.gz: 929662e352013dc156f026f13c2230d6d42213a1
+  metadata.gz: e95bafdd5f71f9fd0de1c480ab2e8f36d2ee1add
+  data.tar.gz: 786dd59f4fe28b5b967449f73c4b146dbacdc27a
 SHA512:
-  metadata.gz: 9554b7e7a955d1818e81d40a5760628e1688ea038af72f2cb7e5ddde4e21cb2de8a1dcca939fd487f21851acfe9233d74d5454fccfb9571e9f9191955a21de90
-  data.tar.gz: 04e99ce7c1b15f4a8eb68503536f34a41b8a84ea46f4fb849de0b3f76be87cfa7bbd9cb83bfd0755ff812869656f0d525a20b07a085b861c3244ce75970ed539
+  metadata.gz: c601664ce532ee077c6d603b15f657678db51779f93492faa75c95cd76128728e756b953f4ce8615c0858a96febf7b75f0068952b54b41c87852610ca73c0490
+  data.tar.gz: e5d9cae48701c693fd1cede2eb635f3da40551969a23aad1d0dcba9d96ed0a310468d093d8273b3bffafc0937a10d67dcafaadb07ea10862fe98c9514d49ac77

data/.rubocop.yml

@@ -46,6 +46,10 @@ Metrics/LineLength:
   Exclude:
     - 'spec/**/*.rb'
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+
 Rails/Date:
   Enabled: false
 

data/anycable-rails.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", "~> 5"
-  spec.add_dependency "anycable", "~>0.4.0"
+  spec.add_dependency "anycable", "~>0.4.1"
 
   spec.add_development_dependency "bundler", "~> 1"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/anycable/rails/actioncable/channel.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "action_cable"
+require "action_cable/channel"
 
 module ActionCable
   module Channel
@@ -12,31 +12,13 @@ module ActionCable
         # noop
       end
 
-      def handle_unsubscribe
-        connection.subscriptions.remove_subscription(self)
-      end
-
-      def handle_action(data)
-        perform_action ActiveSupport::JSON.decode(data)
-      end
-
-      attr_reader :stop_streams
-
       def stream_from(broadcasting, callback = nil, coder: nil)
         raise ArgumentError('Unsupported') if callback.present? || coder.present? || block_given?
-        streams << broadcasting
+        connection.socket.stream broadcasting
       end
 
       def stop_all_streams
-        @stop_streams = true
-      end
-
-      def streams
-        @streams ||= []
-      end
-
-      def stop_streams?
-        stop_streams == true
+        connection.socket.stop_all_streams
       end
 
       def delegate_connection_identifiers

data/lib/anycable/rails/actioncable/connection.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "action_cable"
+require "action_cable/connection"
 require "anycable/rails/refinements/subscriptions"
 require "anycable/rails/actioncable/channel"
 
@@ -8,11 +8,11 @@ module ActionCable
     class Base # :nodoc:
       using Anycable::Refinements::Subscriptions
 
-      attr_reader :transmissions
+      attr_reader :socket
 
       class << self
-        def create(**options)
-          new(**options)
+        def create(socket, **options)
+          new(socket, **options)
         end
 
         def identified_by(*identifiers)
@@ -25,25 +25,19 @@ module ActionCable
         end
       end
 
-      def initialize(env: {}, identifiers: '{}', subscriptions: [])
+      def initialize(socket, identifiers: '{}', subscriptions: [])
         @ids = ActiveSupport::JSON.decode(identifiers)
 
         @cached_ids = {}
-        @env = env
+        @env = socket.env
         @coder = ActiveSupport::JSON
-        @closed = false
-        @transmissions = []
+        @socket = socket
         @subscriptions = ActionCable::Connection::Subscriptions.new(self)
 
         # Initialize channels if any
         subscriptions.each { |id| @subscriptions.fetch(id) }
       end
 
-      # Create a channel instance from identifier for the connection
-      def channel_for(identifier)
-        subscriptions.fetch(identifier)
-      end
-
       def handle_open
         connect if respond_to?(:connect)
         send_welcome_message
@@ -56,21 +50,33 @@ module ActionCable
         disconnect if respond_to?(:disconnect)
       end
 
-      def close
-        @closed = true
+      # rubocop:disable Metrics/MethodLength
+      def handle_channel_command(identifier, command, data)
+        channel = subscriptions.fetch(identifier)
+        case command
+        when "subscribe"
+          channel.handle_subscribe
+          !channel.subscription_rejected?
+        when "unsubscribe"
+          subscriptions.remove_subscription(channel)
+          true
+        when "message"
+          channel.perform_action ActiveSupport::JSON.decode(data)
+          true
+        else
+          false
+        end
+      rescue Exception # rubocop:disable Lint/RescueException
+        false
       end
+      # rubocop:enable Metrics/MethodLength
 
-      def closed?
-        @closed
+      def close
+        socket.close
       end
 
       def transmit(cable_message)
-        transmissions << encode(cable_message)
-      end
-
-      def dispose
-        @closed = false
-        transmissions.clear
+        socket.transmit encode(cable_message)
       end
 
       # Generate identifiers info.

data/lib/anycable/rails/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Anycable
   module Rails
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement