anycable-rails-core 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 047a37c59ff5b5e9e0074302b02450b8e7ab78af36382db634843eb8d1e0a802
-  data.tar.gz: 92234b820387917f2f1321b1175b3f1bdfd6305d386320fefcbfc68384476f9d
+  metadata.gz: 1727e2f2fde6c605c08b7cd706b6b3a670a44151f0bf6e3cff285ee25f929f8c
+  data.tar.gz: 655b6add9c15168382ab0a22922ad0c6272480eeb886f196ee5b46f2eabc3cda
 SHA512:
-  metadata.gz: 86938782b2903250bf2a6fdfa205ff70f8356414c035e4d195c93967051fccc731d520b74b373b54ac74cbbd0b3182678b863a06f466ddd17926c2dba3209025
-  data.tar.gz: 2112a294b4fe22efd05835a2a93b60dfecaae996e990d8690af89d28017ae495d79df147b0cc451bb1a8ae429bceed594d38ded78c1b09de8518f20fe1075b55
+  metadata.gz: f5df48d519e57df343f4b3e84fc7f33f4923212ba8a6008c722e4731cf646d82462bb37b1d77b8bdb0601986e50f6be12704f4ed33ba0ec923134dc602fa3d5a
+  data.tar.gz: e033ddf09baba032d2ba13f1075e3f416dedf867fef735128c3a1db42f89edc016db0299c691541a10a1a019da5ea3f65b52d0a64c17abe2293bee5dac607163

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 1.5.2 (2024-07-01)
+
+- Automatically add `Warden::Manager` to the AnyCable middleware stack when Devise is present. ([@lHydra][])
+
 ## 1.5.1 (2024-04-05)
 
 - Add `anycable-rails-core.rb` to avoid adding `require: ["anycable-rails"]` to Gemfiles manually. ([@palkan][])
@@ -265,3 +269,4 @@ See [Changelog](https://github.com/anycable/anycable-rails/blob/0-6-stable/CHANG
 [@DmitryTsepelev]: https://github.com/DmitryTsepelev
 [@sponomarev]: https://github.com/sponomarev
 [@bibendi]: https://github.com/bibendi
+[@lHydra]: http://github.com/lHydra

data/lib/anycable/rails/action_cable_ext/broadcast_options.rb

@@ -13,7 +13,7 @@ ActionCable::Server::Base.prepend(Module.new do
 
   def broadcaster_for(broadcasting, **options)
     broadcasting = AnyCable::Rails.stream_name_from(broadcasting)
-    super(broadcasting, **options)
+    super
   end
 end)
 

data/lib/anycable/rails/config.rb

@@ -22,6 +22,7 @@ AnyCable::Config.attr_config(
   batch_broadcasts: false,
   socket_id_header: "X-Socket-ID",
   disable_rpc_pool_size_warning: false,
-  websocket_url: nil
+  websocket_url: nil,
+  use_warden_manager: true
 )
 AnyCable::Config.ignore_options :access_logs_disabled, :persistent_session_enabled

data/lib/anycable/rails/rack.rb

@@ -15,14 +15,12 @@ module AnyCable
     # For instance, consider the Rails session middleware: it's responsible for restoring the
     # session data from cookies.
     #
-    # AnyCable adds session middelware by default to its own stack.
+    # AnyCable adds session middleware by default to its own stack.
     #
-    # You can also use any Rack/Rails middleware you want. For example, to enable Devise/Warden
+    # You can also use any Rack/Rails middleware you want. For example, to enable CustomMiddleware
     # you can add the following code to an initializer or any other configuration file:
     #
-    #   AnyCable::Rails::Rack.middleware.use Warden::Manager do |config|
-    #     Devise.warden_config = config
-    #   end
+    #   AnyCable::Rails::Rack.middleware.use CustomMiddleware
     module Rack
       def self.app_build_lock
         @app_build_lock

data/lib/anycable/rails/railtie.rb

@@ -154,6 +154,14 @@ module AnyCable
         end
       end
 
+      initializer "anycable.warden_manager" do
+        if defined?(::Devise) && AnyCable.config.use_warden_manager?
+          AnyCable::Rails::Rack.middleware.use Warden::Manager do |config|
+            ::Devise.warden_config = config
+          end
+        end
+      end
+
       # Since Rails 6.1
       if respond_to?(:server)
         server do

data/lib/anycable/rails/version.rb

@@ -2,6 +2,6 @@
 
 module AnyCable
   module Rails
-    VERSION = "1.5.1"
+    VERSION = "1.5.2"
   end
 end

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

@@ -65,16 +65,6 @@ module AnyCableRailsGenerators
       end
     end
 
-    def devise
-      return unless devise?
-
-      inside("config/initializers") do
-        template "anycable.rb"
-      end
-
-      say_status :info, "✅ config/initializers/anycable.rb with Devise configuration has been added"
-    end
-
     def configs
       inside("config") do
         template "anycable.yml"
@@ -124,10 +114,6 @@ module AnyCableRailsGenerators
       !!gemfile_lock&.match?(/^\s+rubocop\b/)
     end
 
-    def devise?
-      !!gemfile_lock&.match?(/^\s+devise\b/)
-    end
-
     def local?
       @devenv == "local"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rails-core
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anycable-core
@@ -107,7 +107,6 @@ files:
 - lib/generators/anycable/setup/templates/bin/anycable-go.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
 - lib/generators/anycable/with_os_helpers.rb
 homepage: http://github.com/anycable/anycable-rails
 licenses:

data/lib/generators/anycable/setup/templates/config/initializers/anycable.rb.tt

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-# Add Warden middleware to AnyCable stack to allow accessing
-# Devise current user via `env["warden"].user`.
-#
-# See <%= DOCS_ROOT %>/ruby/authentication
-#
-# NOTE: This is only needed in environments where you use AnyCable.
-if defined?(AnyCable::Rails)
-  AnyCable::Rails::Rack.middleware.use Warden::Manager do |config|
-    Devise.warden_config = config
-  end
-end