anycable-rails 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0de4d95da59574a14f3f56219154cf3e12513a74e677520acf0cffbbf566e49
-  data.tar.gz: c6a4e9b87c3c59aac495663f8acc9f3150a8de5f43d5ab55d19c265039ba2af1
+  metadata.gz: 3ebb4dc7b8483998770f7168cc8884d8a56a0e5376e04550b2f98b1d11046cdf
+  data.tar.gz: 29a21773378af2c3bcc6cd3265d58d028a7bef7b8fc2be13bafda3f54677d8b1
 SHA512:
-  metadata.gz: 93f85efbfa20cffe71b3b52115b98321158577a36439b9875e6bbfb18ecee32c44fd31376a05f8883b8eff7d8b06b4d2d5abf762f86f6765248e3051869f3b17
-  data.tar.gz: 2ca2cd646321b0ed567af383847e4ae5f5cab116be0a7c410ea18d91f43378c024c47e3002c0aa70ddd0970a4e2bad50fd173c0b1fdf9088f229bad3ea53a05d
+  metadata.gz: cde255681a0348c2edc41fc3130d632f8f17ea02937691b62a388f8a73a699b9e1669e9c7ea55f1dad3a74b6e0d289a3a07feda97adbcbbfcc5d1e316213a704
+  data.tar.gz: 88c80148d66a610472bf8a129a381198d044c89884a800f4209c19f67a6cf527763620bfd804b03cbddb0f6752b6e69c8065e4bfbf1c33da11e66cb7def49688

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 1.0.0.rc3 (2020-06-24)
+
+- Make AnyCable patches compatible with Action Cable testing. ([@palkan][])
+
+- Do not add localhost `redis_url` to `anycable.yml` when Docker development method is chosen in `anycable:setup`. ([@palkan][])
+
 ## 1.0.0.rc2 (2020-06-16)
 
 - Fix connection identifiers deserialization regression. ([@palkan][])

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

@@ -21,6 +21,8 @@ module ActionCable
 
       attr_reader :socket
 
+      alias anycable_socket socket
+
       delegate :env, :session, to: :request
 
       class << self

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

@@ -28,3 +28,7 @@ module ActionCable
     end
   end
 end
+
+::ActionCable::Connection::Base.prepend(
+  ::ActionCable::Connection::PersistentSession
+)

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# This file contains patches to Action Cable testing modules
+
+# Trigger autoload (if constant is defined)
+begin
+  ActionCable::Channel::TestCase # rubocop:disable Lint/Void
+  ActionCable::Connection::TestCase # rubocop:disable Lint/Void
+rescue NameError
+  return
+end
+
+ActionCable::Channel::ChannelStub.prepend(Module.new do
+  def subscribe_to_channel
+    # allocate @streams
+    streams
+    handle_subscribe
+  end
+end)
+
+ActionCable::Channel::ConnectionStub.prepend(Module.new do
+  def socket
+    @socket ||= AnyCable::Socket.new(env: {})
+  end
+
+  alias_method :anycable_socket, :socket
+end)
+
+ActionCable::Connection::TestConnection.prepend(Module.new do
+  def initialize(request)
+    @request = request
+    @cached_ids = {}
+    super
+  end
+end)

data/lib/anycable/rails/channel_state.rb

@@ -5,18 +5,16 @@ module AnyCable
     module ChannelState
       module ClassMethods
         def state_attr_accessor(*names)
-          return attr_accessor(*names) unless AnyCable::Rails.enabled?
-
           names.each do |name|
             channel_state_attributes << name
             class_eval <<~RUBY, __FILE__, __LINE__ + 1
               def #{name}
                 return @#{name} if instance_variable_defined?(:@#{name})
-                @#{name} = AnyCable::Rails.deserialize(connection.socket.istate["#{name}"], json: true)
+                @#{name} = AnyCable::Rails.deserialize(connection.socket.istate["#{name}"], json: true) if connection.anycable_socket
               end
 
               def #{name}=(val)
-                connection.socket.istate["#{name}"] = AnyCable::Rails.serialize(val, json: true)
+                connection.socket.istate["#{name}"] = AnyCable::Rails.serialize(val, json: true) if connection.anycable_socket
                 instance_variable_set(:@#{name}, val)
               end
             RUBY

data/lib/anycable/rails/railtie.rb

@@ -43,22 +43,30 @@ module AnyCable
 
       initializer "anycable.connection_factory", after: "action_cable.set_configs" do |app|
         ActiveSupport.on_load(:action_cable) do
+          # Add AnyCable patch method stub (we use it in ChannelState to distinguish between Action Cable and AnyCable)
+          # NOTE: Method could be already defined if patch was loaded manually
+          ActionCable::Connection::Base.attr_reader(:anycable_socket) unless ActionCable::Connection::Base.method_defined?(:anycable_socket)
+
+          app.config.to_prepare do
+            AnyCable.connection_factory = ActionCable.server.config.connection_class.call
+          end
+
           if AnyCable::Rails.enabled?
             require "anycable/rails/actioncable/connection"
-
             if AnyCable.config.persistent_session_enabled
               require "anycable/rails/actioncable/connection/persistent_session"
-              ::ActionCable::Connection::Base.prepend(
-                ::ActionCable::Connection::PersistentSession
-              )
-            end
-
-            app.config.to_prepare do
-              AnyCable.connection_factory = ActionCable.server.config.connection_class.call
             end
           end
         end
       end
+
+      initializer "anycable.testing" do |app|
+        next unless ::Rails.env.test?
+
+        ActiveSupport.on_load(:action_cable) do
+          require "anycable/rails/actioncable/testing"
+        end
+      end
     end
   end
 end

data/lib/anycable/rails/version.rb

@@ -2,6 +2,6 @@
 
 module AnyCable
   module Rails
-    VERSION = "1.0.0.rc2"
+    VERSION = "1.0.0.rc3"
   end
 end

data/lib/generators/anycable/download/USAGE

@@ -1,5 +1,5 @@
 Description:
-    Install AnyCable-Go web server.
+    Install AnyCable-Go web server locally (the latest version by default).
 
 Example:
     rails generate anycable:download

data/lib/generators/anycable/download/download_generator.rb

@@ -9,8 +9,7 @@ module AnyCableRailsGenerators
 
     include WithOSHelpers
 
-    # TODO: change to latest release
-    VERSION = "1.0.0.preview1"
+    VERSION = "latest"
 
     class_option :bin_path,
       type: :string,
@@ -35,20 +34,27 @@ module AnyCableRailsGenerators
     private
 
     def release_url(version)
+      return latest_release_url(version) if version == "latest"
+
       if Gem::Version.new(version).segments.first >= 1
-        new_release_url(version)
+        new_release_url("v#{version}")
       else
-        legacy_release_url(version)
+        legacy_release_url("v#{version}")
       end
     end
 
     def legacy_release_url(version)
-      "https://github.com/anycable/anycable-go/releases/download/v#{version}/" \
+      "https://github.com/anycable/anycable-go/releases/download/#{version}/" \
         "anycable-go-v#{version}-#{os_name}-#{cpu_name}"
     end
 
     def new_release_url(version)
-      "https://github.com/anycable/anycable-go/releases/download/v#{version}/" \
+      "https://github.com/anycable/anycable-go/releases/download/#{version}/" \
+        "anycable-go-#{os_name}-#{cpu_name}"
+    end
+
+    def latest_release_url(version)
+      "https://github.com/anycable/anycable-go/releases/latest/download/" \
         "anycable-go-#{os_name}-#{cpu_name}"
     end
 

data/lib/generators/anycable/setup/setup_generator.rb

@@ -159,6 +159,9 @@ module AnyCableRailsGenerators
     end
 
     def install_for_docker
+      # Remove localhost from configuraiton
+      gsub_file "config/anycable.yml", /^.*redis_url:.*localhost[^\n]+\n/, ""
+
       say_status :help, "️️⚠️  Docker development configuration could vary", :yellow
 
       say "Here is an example snippet for docker-compose.yml:"
@@ -174,8 +177,8 @@ module AnyCableRailsGenerators
             ANYCABLE_RPC_HOST: anycable:50051
             ANYCABLE_DEBUG: 1
           depends_on:
-            - anycable
-            - redis
+            redis:
+              condition: service_healthy
 
         anycable:
           <<: *backend
@@ -184,8 +187,13 @@ module AnyCableRailsGenerators
             <<: *backend_environment
             ANYCABLE_REDIS_URL: redis://redis:6379/0
             ANYCABLE_RPC_HOST: 0.0.0.0:50051
+            ANYCABLE_DEBUG: 1
           ports:
             - '50051'
+          depends_on:
+            <<: *backend_depends_on
+            ws:
+              condition: service_started
         ─────────────────────────────────────────
       YML
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anycable
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +141,7 @@ files:
 - lib/anycable/rails/actioncable/connection/persistent_session.rb
 - lib/anycable/rails/actioncable/connection/serializable_identification.rb
 - lib/anycable/rails/actioncable/remote_connections.rb
+- lib/anycable/rails/actioncable/testing.rb
 - lib/anycable/rails/channel_state.rb
 - lib/anycable/rails/compatibility.rb
 - lib/anycable/rails/compatibility/rubocop.rb