anycable-rails 0.5.5 → 0.6.0.rc1

data/lib/anycable/rails/config.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-# Extend Anycable configuration with
+# Extend AnyCable configuration with
 # `access_logs_disabled` options (defaults to true)
-Anycable::Config.attr_config access_logs_disabled: true
+AnyCable::Config.attr_config access_logs_disabled: true
+AnyCable::Config.ignore_options :access_logs_disabled

data/lib/anycable/rails/middlewares/executor.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module AnyCable
+  module Rails
+    module Middlewares
+      # Executor runs Rails executor for each call
+      # See https://guides.rubyonrails.org/v5.2.0/threading_and_code_execution.html#framework-behavior
+      class Executor < AnyCable::Middleware
+        attr_reader :executor
+
+        def initialize(executor)
+          @executor = executor
+        end
+
+        def call(*)
+          executor.wrap { yield }
+        end
+      end
+    end
+  end
+end

data/lib/anycable/rails/middlewares/log_tagging.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module AnyCable
+  module Rails
+    module Middlewares
+      # Middleware to add `sid` (session ID) tag to logs.
+      #
+      # Session ID could be provided through gRPC metadata `sid` key.
+      #
+      # See https://github.com/grpc/grpc-go/blob/master/Documentation/grpc-metadata.md
+      class LogTagging < AnyCable::Middleware
+        def call(_request, call, _method)
+          sid = call.metadata["sid"]
+          return yield unless sid
+
+          AnyCable.logger.tagged("AnyCable sid=#{sid}") { yield }
+        end
+      end
+    end
+  end
+end

data/lib/anycable/rails/railtie.rb

@@ -1,31 +1,17 @@
 # frozen_string_literal: true
 
-module Anycable
+module AnyCable
   module Rails
-    # Use this proxy to quack like a TaggedLoggerProxy
-    class LoggerProxy
-      def initialize(logger)
-        @logger = logger
-      end
-
-      def add_tags(*_tags)
-        @logger.warn "Tagged logger is not supported by AnyCable. Skip"
-      end
-
-      %i[debug info warn error fatal unknown].each do |severity|
-        define_method(severity) do |message|
-          @logger.send severity, message
-        end
-      end
-    end
-
     class Railtie < ::Rails::Railtie # :nodoc:
-      initializer "anycable.disable_action_cable_mount", before: "action_cable.routes" do |app|
+      initializer "anycable.disable_action_cable_mount", after: "action_cable.set_configs" do |app|
+        # Disable Action Cable when AnyCable adapter is used
+        next unless ::ActionCable.server.config.cable&.fetch("adapter", nil) == "any_cable"
+
         app.config.action_cable.mount_path = nil
       end
 
-      initializer "anycable.logger", after: :initialize_logger do |_app|
-        Anycable.logger = LoggerProxy.new(::Rails.logger)
+      initializer "anycable.logger", after: "action_cable.logger" do |_app|
+        AnyCable.logger = ActiveSupport::TaggedLogging.new(::ActionCable.server.config.logger)
 
         # Broadcast logs to STDOUT in development
         if ::Rails.env.development? &&
@@ -36,18 +22,25 @@ module Anycable
           console.level = ::Rails.logger.level
           ::Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
         end
-      end
 
-      initializer "anycable.release_connections" do |_app|
-        ActiveSupport.on_load(:active_record) do
-          require "anycable/rails/activerecord/release_connection"
-          Anycable::RPCHandler.prepend Anycable::Rails::ActiveRecord::ReleaseConnection
+        # Add tagging middleware
+        if AnyCable.logger.respond_to?(:tagged)
+          require "anycable/rails/middlewares/log_tagging"
+
+          AnyCable.middleware.use(AnyCable::Rails::Middlewares::LogTagging)
         end
       end
 
+      initializer "anycable.executor" do |app|
+        require "anycable/rails/middlewares/executor"
+        # see https://github.com/rails/rails/pull/33469/files
+        executor = app.config.reload_classes_only_on_change ? app.reloader : app.executor
+        AnyCable.middleware.use(AnyCable::Rails::Middlewares::Executor.new(executor))
+      end
+
       initializer "anycable.connection_factory", after: "action_cable.set_configs" do |_app|
         ActiveSupport.on_load(:action_cable) do
-          Anycable.connection_factory = connection_class.call
+          AnyCable.connection_factory = connection_class.call
         end
       end
     end

data/lib/anycable/rails/refinements/subscriptions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Anycable
+module AnyCable
   module Refinements
     module Subscriptions # :nodoc:
       refine ActionCable::Connection::Subscriptions do

data/lib/anycable/rails/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module Anycable
+module AnyCable
   module Rails
-    VERSION = "0.5.5"
+    VERSION = "0.6.0.rc1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0.rc1
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: anycable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0.rc1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: ammeter
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -158,20 +160,24 @@ files:
 - circle.yml
 - gemfiles/rails5.gemfile
 - gemfiles/railsmaster.gemfile
+- lib/action_cable/subscription_adapter/any_cable.rb
 - lib/anycable-rails.rb
 - lib/anycable/rails.rb
 - lib/anycable/rails/actioncable/channel.rb
 - lib/anycable/rails/actioncable/connection.rb
-- lib/anycable/rails/actioncable/server.rb
-- lib/anycable/rails/activerecord/release_connection.rb
+- lib/anycable/rails/compatibility.rb
+- lib/anycable/rails/compatibility/rubocop.rb
+- lib/anycable/rails/compatibility/rubocop/config/default.yml
+- lib/anycable/rails/compatibility/rubocop/cops/anycable/instance_vars.rb
+- lib/anycable/rails/compatibility/rubocop/cops/anycable/periodical_timers.rb
+- lib/anycable/rails/compatibility/rubocop/cops/anycable/remote_disconnect.rb
+- lib/anycable/rails/compatibility/rubocop/cops/anycable/stream_from.rb
 - lib/anycable/rails/config.rb
+- lib/anycable/rails/middlewares/executor.rb
+- lib/anycable/rails/middlewares/log_tagging.rb
 - lib/anycable/rails/railtie.rb
 - lib/anycable/rails/refinements/subscriptions.rb
 - lib/anycable/rails/version.rb
-- lib/generators/anycable/USAGE
-- lib/generators/anycable/anycable_generator.rb
-- lib/generators/anycable/templates/anycable.yml
-- lib/generators/anycable/templates/script
 homepage: http://github.com/anycable/anycable-rails
 licenses:
 - MIT
@@ -187,9 +193,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7

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

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "action_cable/server/base"
-
-module ActionCable
-  module Server
-    # Override pubsub for ActionCable
-    class Base
-      def pubsub
-        Anycable.pubsub
-      end
-    end
-  end
-end

data/lib/anycable/rails/activerecord/release_connection.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Anycable
-  module Rails
-    module ActiveRecord
-      # Release ActiveRecord connection after every call (if any)
-      module ReleaseConnection
-        def connect(*)
-          wrap_release_connection { super }
-        end
-
-        def disconnect(*)
-          wrap_release_connection { super }
-        end
-
-        def command(*)
-          wrap_release_connection { super }
-        end
-
-        def wrap_release_connection
-          res = yield
-          ::ActiveRecord::Base.connection_pool.release_connection if
-            ::ActiveRecord::Base.connection_pool.active_connection?
-          res
-        end
-      end
-    end
-  end
-end

data/lib/generators/anycable/USAGE

@@ -1,7 +0,0 @@
-Description:
-  Generates Anycable executable
-  
-Examples:
-  rails generate anycable
-
-    This will generate Anycable executable

data/lib/generators/anycable/anycable_generator.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/base"
-
-class AnycableGenerator < Rails::Generators::Base # :nodoc:
-  source_root File.expand_path('templates', __dir__)
-
-  def create_executable_file
-    template "script", "bin/anycable"
-    chmod "bin/anycable", 0o755
-  end
-
-  def add_anycable_config
-    template 'anycable.yml', 'config/anycable.yml'
-  end
-end

data/lib/generators/anycable/templates/anycable.yml

@@ -1,41 +0,0 @@
-#  grpс server settings, anycable grpc server will listen
-#  websocket server at given host:port, usually Anycable server runs locally to ws server
-#  MUST BE in sync with ws-server setting -rpc=0.0.0.0:50051
-#  rpc_host: "localhost:50051"
-
-# redis url
-# MUST BE in sync with ws-server setting -redis=redis://localhost:6379/5
-# REM: Redis PubSub system doesn't use the database part of URI
-# redis_url: "redis://localhost:6379/5"
-
-#  redis_sentinels:
-#    - { host: 'localhost', port: 26379 }
-#    - { host: 'redis-1-2', port: 26379 }
-#    - { host: 'redis-1-3', port: 26379 }
-
-# anycable use single pubsub queue, this is queue name
-# MUST BE in sync with ws-server setting  -redis_channel=__anycable__
-# redis_channel: "__anycable__",
-
-#---------- ENVIRONMENT VARIABLES ----------
-# since Anycable config based on anyway_config (https://github.com/palkan/anyway_config), all Anycable settings,
-# can be set or overridden through corresponding Environment variable.
-# Ex: rpc_host is overridden by ANYCABLE_RPC_HOST, redis_url by ANYCABLE_REDIS_URL e.t.c Look in anyway_config for more details
-
-default: &default
-  rpc_host: "localhost:50051"
-  log_grpc: false
-  log_file: nil
-  debug: false # Shortcut to enable GRPC logging and debug level
-  log_level: info
-  redis_channel: "__anycable__" 
-  redis_sentinels: []
-
-
-production:
-  <<: *default
-  redis_url: "redis://localhost:6379/1"
-
-development:
-  <<: *default
-  redis_url: "redis://localhost:6379/2"

data/lib/generators/anycable/templates/script

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require ::File.expand_path('../../config/environment', __FILE__)
-
-Anycable::Server.start