anycable-rails 1.0.0.rc4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36db9ad402206c4fa664b7f66a7ab9dee5438fa58a9a372ea5f1bed05787beaf
-  data.tar.gz: 6ee564a9967354216882bf3bfb562d6567193f975a1fd67ef35464acc4a2bbf8
+  metadata.gz: 49d905b11d3ffb0c71c238ece809817adbbf336f489e1a317a692e9c50db0a5f
+  data.tar.gz: e632e101cb3e710548703da397843ef4c6f7df00f4afb2ba09a2a54a680ebd5c
 SHA512:
-  metadata.gz: 51fbfcf41d1d2bc19f4ad8473bc02ea81dd2e19d600daa98e9a7c652cf95608b1c52e5aaa7934f062f92dbf20e976010a5f6ea488abcc2ee171dc474fd90699a
-  data.tar.gz: 41acea91c33bd22b53c54ef57735746ffd0791f1b61a304801d67d79f3d2d94f73fe737573070a52e091f281ed45e49b2797b445fef4549d33f0d3c018e2acb3
+  metadata.gz: 1b6763e1152e6a2ce712053f6d6bc798c40af7f6fa01fc38f52e8105c924ac451c916ac7775e30dc83445f30b6956da4ddac1d83cda5360032b3c585f68bd0a5
+  data.tar.gz: d656c094dd40d392f2f1aaf093577e887d264dc75778b5a84da1563d24ce33c272ab34fdd526ec8d5ba22b5c5d570f0f86ba26b61821edbb21e2356446dd208b

data/CHANGELOG.md

@@ -2,14 +2,14 @@
 
 ## master
 
-## 1.0.0.rc4 (2020-06-24)
+## 1.0.0 (2020-07-01)
+
+- Support `rescue_from` in connections (Rails 6.1). ([@palkan][])
 
 - 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][])
 
 Using non-strings or non-GlobalId-encoded objects was broken.
@@ -19,8 +19,6 @@ Using non-strings or non-GlobalId-encoded objects was broken.
 Update Docker snippet, do not enable persistent sessions automatically,
 fix setting `config.action_cable.url` in environment configuration.
 
-## 1.0.0.rc1 (2020-06-10)
-
 - Add `state_attr_accessor` for channels. ([@palkan][])
 
 Just like `attr_accessor` but "persists" the state between RPC calls.

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

@@ -198,3 +198,16 @@ module ActionCable
     # rubocop:enable Metrics/ClassLength
   end
 end
+
+# Support rescue_from
+# https://github.com/rails/rails/commit/d2571e560c62116f60429c933d0c41a0e249b58b
+if ActionCable::Connection::Base.respond_to?(:rescue_from)
+  ActionCable::Connection::Base.prepend(Module.new do
+    def handle_channel_command(*)
+      super
+    rescue Exception => e # rubocop:disable Lint/RescueException
+      rescue_with_handler(e) || raise
+      false
+    end
+  end)
+end

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

@@ -15,8 +15,8 @@ module ActionCable
         return super unless socket.session
 
         super.tap do |req|
-          req.env[Rack::RACK_SESSION] =
-            AnyCable::Rails::SessionProxy.new(req.env[Rack::RACK_SESSION], socket.session)
+          req.env[::Rack::RACK_SESSION] =
+            AnyCable::Rails::SessionProxy.new(req.env[::Rack::RACK_SESSION], socket.session)
         end
       end
 

data/lib/anycable/rails/version.rb

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

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

@@ -143,6 +143,10 @@ module AnyCableRailsGenerators
       !!gemfile_lock&.match?(/^\s+redis\b/)
     end
 
+    def webpacker?
+      !!gemfile_lock&.match?(/^\s+webpacker\b/)
+    end
+
     def rubocop?
       !!gemfile_lock&.match?(/^\s+rubocop\b/)
     end
@@ -224,8 +228,8 @@ module AnyCableRailsGenerators
     def template_proc_files
       file_name = "Procfile.dev"
 
-      if File.exist?(file_name)
-        append_file file_name, 'anycable: bundle exec anycable --server-command "anycable-go --port 3334"'
+      if file_exists?(file_name)
+        append_file file_name, "anycable: bundle exec anycable\nws: anycable-go#{anycable_go_options}", force: true
       else
         say_status :help, "💡 We recommend using Hivemind to manage multiple processes in development 👉 https://github.com/DarthSim/hivemind", :yellow
 
@@ -262,5 +266,15 @@ module AnyCableRailsGenerators
         args << "--version #{opts[:version]}" if opts[:version]
       end.join(" ")
     end
+
+    def anycable_go_options
+      redis? ? " --port=8080" : " --port=8080 --broadcast_adapter=http"
+    end
+
+    def file_exists?(name)
+      in_root do
+        return File.file?(name)
+      end
+    end
   end
 end

data/lib/generators/anycable/setup/templates/Procfile.dev.tt

@@ -0,0 +1,6 @@
+server: bundle exec rails s
+<%- if webpacker? -%>
+assets: bundle exec bin/webpack-dev-server
+<%- end -%>
+anycable: bundle exec anycable
+ws: anycable-go<%= anycable_go_options %>

data/lib/generators/anycable/setup/templates/config/anycable.yml.tt

@@ -30,10 +30,17 @@ default: &default
   # Use the same channel name for WebSocket server, e.g.:
   #   $ anycable-go --redis-channel="__anycable__"
   redis_channel: "__anycable__"
+  <%- if redis? -%>
+  # You can use REDIS_URL env var to configure Redis URL.
+  # Localhost is used by default.
+  # redis_url: "redis://localhost:6379/1"
+  <%- end -%>
 
 development:
   <<: *default
-  redis_url: "redis://localhost:6379/1"
+
+test:
+  <<: *default
 
 production:
   <<: *default

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anycable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +161,7 @@ files:
 - lib/generators/anycable/download/download_generator.rb
 - lib/generators/anycable/setup/USAGE
 - lib/generators/anycable/setup/setup_generator.rb
-- lib/generators/anycable/setup/templates/Procfile.dev
+- lib/generators/anycable/setup/templates/Procfile.dev.tt
 - lib/generators/anycable/setup/templates/config/anycable.yml.tt
 - lib/generators/anycable/setup/templates/config/cable.yml.tt
 - lib/generators/anycable/setup/templates/config/initializers/anycable.rb.tt
@@ -186,9 +186,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 

data/lib/generators/anycable/setup/templates/Procfile.dev

@@ -1,3 +0,0 @@
-server: bin/rails server
-assets: bin/webpack-dev-server
-anycable: bundle exec anycable --server-command "anycable-go --port 3334"