anycable-rails 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e22c0242186344df43946087c788317e068f63f5405692ca1c1ea20c5446d505
-  data.tar.gz: 56eecb2616a52072c5184183e69f36c5e4a9342b7ab91fee660c9b58a8aa949d
+  metadata.gz: 12096ddf13bcb4893853e537017bc5478c8c65c7f8aea4a21af221d5e4cf1ce3
+  data.tar.gz: 252d1fc76c09a902229b192afd61c020503a78bf773d53a8dc2e409e1a984310
 SHA512:
-  metadata.gz: 68139e784f62c206badffb130eff677d7267dd11066c054e2faccc73b3bdb69dda3490800e04d355c4038fdb803c47d220972a35fcf6bd8130753f658546b578
-  data.tar.gz: f22a7128655c6ef8f73fd98baa5de443b224138d5737a77bc68aa6e82e9bd606d28eb19d73c3b9f3fbeb704b60eae6d5c8382a573a2e75b83927e047899b7a47
+  metadata.gz: 951b2d8c75b50dd632c7e7e49b36bf8c233d5c9d7335e0213aa5c291d4cf17bb7c9999f9bdf54bcdd2a29753d471b5b6ed3397e3403b07f7e7dba7f2d3e32a37
+  data.tar.gz: e1df94db573c5557784937b2a44152e2e1cb59f0fd00d8532bd539e5fe8cf80a1abbf2dd605cb3025e622fddd23f59bdeb652256859d6f41b7b4462967e190c7

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## master
 
+## 0.6.3 (2019-03-26)
+
+- Fix connection factory reloading for development sake. ([@sponomarev][])
+
+- Add `:anycable` subscription adapter alias. ([@sponomarev][])
+
+- Don't set AnyCable connection factory for incompatible adapter ([@sponomarev][])
+
+  `anycable` server won't start with unpatched vanilla `ApplicationCable::Connection`.
+
+  Motivation in [#74](https://github.com/anycable/anycable-rails/issues/74).
+
+- Fix instance detection inside complex cases in compatibility cops ([@sponomarev][])
+
 ## 0.6.2 (2019-01-10)
 
 - Fixed `anycable` 0.6.1 compatibility. ([@palkan][])
@@ -107,3 +121,4 @@ Ignore tagged logger features ('cause we do not have _persistent_ logger).
 [@palkan]: https://github.com/palkan
 [@alekseyl]: https://github.com/alekseyl
 [@DmitryTsepelev]: https://github.com/DmitryTsepelev
+[@sponomarev]: https://github.com/sponomarev

data/README.md

@@ -20,7 +20,7 @@ You can even use Action Cable in development and not be afraid of [compatibility
 
 ## Requirements
 
-- Ruby ~> 2.4;
+- Ruby ~> 2.4; **NOTE:** for Ruby 2.6 use RC version of `google-protobuf` gem. In your Gemfile: `gem "google-protobuf", '>=3.7.0.rc.2'`
 - Rails ~> 5.0;
 - Redis (see [other options]() for broadcasting)
 
@@ -47,7 +47,7 @@ Next, specify AnyCable subscription adapter for Action Cable:
 ```yml
 # config/cable.yml
 production:
-  adapter: any_cable
+  adapter: any_cable # or anycable
 ```
 
 and specify AnyCable WebSocket server URL:

data/lib/action_cable/subscription_adapter/anycable.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative "any_cable"
+
+module ActionCable
+  module SubscriptionAdapter
+    # Aliasing adapter
+    Anycable = AnyCable
+  end
+end

data/lib/anycable/rails.rb

@@ -8,6 +8,12 @@ module AnyCable
   # Rails handler for AnyCable
   module Rails
     require "anycable/rails/railtie"
+
+    ADAPTER_ALIASES = %w[any_cable anycable].freeze
+
+    def self.compatible_adapter?(adapter)
+      ADAPTER_ALIASES.include?(adapter)
+    end
   end
 end
 

data/lib/anycable/rails/compatibility/rubocop/cops/anycable/instance_vars.rb

@@ -37,10 +37,10 @@ module RuboCop
 
         def find_nested_ivars(node, &block)
           node.each_child_node do |child|
-            if child.begin_type? || child.block_type? || child.def_type?
-              find_nested_ivars(child, &block)
-            elsif child.ivasgn_type? || child.ivar_type?
+            if child.ivasgn_type? || child.ivar_type?
               yield(child)
+            elsif child.children.any?
+              find_nested_ivars(child, &block)
             end
           end
         end

data/lib/anycable/rails/railtie.rb

@@ -4,8 +4,9 @@ module AnyCable
   module Rails
     class Railtie < ::Rails::Railtie # :nodoc:
       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"
+        # Disable Action Cable default route when AnyCable adapter is used
+        adapter = ::ActionCable.server.config.cable&.fetch("adapter", nil)
+        next unless AnyCable::Rails.compatible_adapter?(adapter)
 
         app.config.action_cable.mount_path = nil
       end
@@ -39,13 +40,16 @@ module AnyCable
         AnyCable.middleware.use(AnyCable::Rails::Middlewares::Executor.new(executor))
       end
 
-      initializer "anycable.connection_factory", after: "action_cable.set_configs" do |_app|
+      initializer "anycable.connection_factory", after: "action_cable.set_configs" do |app|
         ActiveSupport.on_load(:action_cable) do
-          if ::ActionCable.server.config.cable&.fetch("adapter", nil) == "any_cable"
+          adapter = ::ActionCable.server.config.cable&.fetch("adapter", nil)
+          if AnyCable::Rails.compatible_adapter?(adapter)
             require "anycable/rails/actioncable/connection"
-          end
 
-          AnyCable.connection_factory = connection_class.call
+            app.config.to_prepare do
+              AnyCable.connection_factory = ActionCable.server.config.connection_class.call
+            end
+          end
         end
       end
     end

data/lib/anycable/rails/version.rb

@@ -2,6 +2,6 @@
 
 module AnyCable
   module Rails
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: anycable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -25,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: anycable
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
+        version: '1.10'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -109,33 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.8
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 description: Rails adapter for AnyCable
 email:
 - dementiev.vm@gmail.com
@@ -143,24 +143,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".gitignore"
-- ".hound.yml"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - MIT-LICENSE
 - README.md
-- Rakefile
-- anycable-rails.gemspec
-- bin/console
-- bin/setup
-- circle.yml
-- gemfiles/rails5.gemfile
-- gemfiles/railsmaster.gemfile
 - lib/action_cable/subscription_adapter/any_cable.rb
+- lib/action_cable/subscription_adapter/anycable.rb
 - lib/anycable-rails.rb
 - lib/anycable/rails.rb
 - lib/anycable/rails/actioncable/channel.rb
@@ -197,8 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Rails adapter for AnyCable

data/.github/ISSUE_TEMPLATE.md

@@ -1,29 +0,0 @@
-<!--
-  First of all, thanks for your report/suggestion/whatever!
-
-  This template is for bug reports. If you are reporting a bug, please continue on. If you are here for another reason, 
-  feel free to skip the rest of this template.
--->
-
-### Tell us about your environment
-
-**Ruby version:**
-
-**Rails version:**
-
-**`anycable` gem version:**
-
-**`anycable-rails` gem version:**
-
-**`grpc` gem version:**
-
-### What did you do?
-
-### What did you expect to happen?
-
-### What actually happened?
-
-<!--
-  Please, provide reproduction script (using this template (https://github.com/anycable/anycable/blob/master/etc/bug_report_template.rb)
-  when submitting bugs if possible.
--->

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,31 +0,0 @@
-<!--
-  First of all, thanks for contributing!
-
-  If it's a typo fix or minor documentation update feel free to skip the rest of this template!
--->
-
-<!--
-  If it's a bug fix, then link it to the issue, for example:
-
-  Fixes #xxx
--->
-
-
-<!--
-  Otherwise, describe the changes: 
-
-### What is the purpose of this pull request?
-
-### What changes did you make? (overview)
-
-### Is there anything you'd like reviewers to focus on?
-
--->
-
-<!--
-    Please ensure your PR is ready:
-
-    - Include tests for this change
-    - Add Changelog entry
-    - Update documentation for this change (if appropriate)
--->

data/.gitignore

@@ -1,40 +0,0 @@
-# Numerous always-ignore extensions
-*.diff
-*.err
-*.orig
-*.log
-*.rej
-*.swo
-*.swp
-*.vi
-*~
-*.sass-cache
-*.iml
-.idea/
-
-# Sublime
-*.sublime-project
-*.sublime-workspace
-
-# OS or Editor folders
-.DS_Store
-.cache
-.project
-.settings
-.tmproj
-Thumbs.db
-
-.bundle/
-log/*.log
-*.gz
-pkg/
-spec/dummy/db/*.sqlite3
-spec/dummy/db/*.sqlite3-journal
-spec/dummy/tmp/
-
-Gemfile.lock
-Gemfile.local
-.rspec
-*.gem
-tmp/
-coverage/

data/.hound.yml

@@ -1,3 +0,0 @@
-ruby:
-  enabled: true
-  config_file: .rubocop.yml

data/.rubocop.yml

@@ -1,73 +0,0 @@
-AllCops:
-  # Include gemspec and Rakefile
-  Include:
-    - 'lib/**/*.rb'
-    - 'lib/**/*.rake'
-    - 'spec/**/*.rb'
-  Exclude:
-    - 'bin/**/*'
-    - 'tmp/**/*'
-    - 'lib/anycable/rpc/**/*'
-    - 'vendor/**/*'
-    - 'gemfiles/**/*'
-    - 'Gemfile'
-    - 'Rakefile'
-    - '*.gemspec'
-  DisplayCopNames: true
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.4
-
-Rails:
-  Enabled: false
-
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*.rb'
-
-Naming/FileName:
-  Exclude:
-    - 'lib/anycable-rails.rb'
-
-Style/StringLiterals: 
-  EnforcedStyle: double_quotes
-
-Style/RegexpLiteral:
-  Enabled: false
-
-Style/FormatStringToken:
-  Enabled: false
-
-Layout/SpaceInsideStringInterpolation:
-  EnforcedStyle: no_space
-
-Style/BlockDelimiters:
-  Exclude:
-    - 'spec/**/*.rb'
-
-Metrics/MethodLength:
-  Exclude:
-    - 'spec/**/*.rb'
-
-Metrics/LineLength:
-  Max: 100
-  Exclude:
-    - 'spec/**/*.rb'
-
-Metrics/AbcSize:
-  Exclude:
-    - 'spec/**/*.rb'
-
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*.rb'
-
-Metrics/CyclomaticComplexity:
-  Exclude:
-    - 'spec/**/*.rb'
-
-Metrics/PerceivedComplexity:
-  Exclude:
-    - 'spec/**/*.rb'
-
-Lint/HandleExceptions:
-  Enabled: false

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-cache: bundler
-
-notifications:
-  email: false
-
-before_install: gem install bundler -v '~> 1'
-
-matrix:
-  include:
-    - rvm: 2.4.5
-      gemfile: Gemfile
-    - rvm: 2.5.3
-      gemfile: Gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/rails5.gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/railsmaster.gemfile
-  allow_failures:
-    - rvm: 2.5.3
-      gemfile: gemfiles/railsmaster.gemfile

data/Gemfile

@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-local_gemfile = "#{File.dirname(__FILE__)}/Gemfile.local"
-
-if File.exist?(local_gemfile)
-  eval(File.read(local_gemfile)) # rubocop:disable Lint/Eval
-end

data/Rakefile

@@ -1,13 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
-desc "Run compatibility specs"
-RSpec::Core::RakeTask.new("spec:compatibility") do |task|
-  task.pattern = "spec/**/*_compatibility.rb"
-  task.verbose = false
-end
-
-task default: %w[rubocop spec:compatibility spec]

data/anycable-rails.gemspec

@@ -1,31 +0,0 @@
-# coding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'anycable/rails/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "anycable-rails"
-  spec.version       = AnyCable::Rails::VERSION
-  spec.authors       = ["palkan"]
-  spec.email         = ["dementiev.vm@gmail.com"]
-
-  spec.summary       = "Rails adapter for AnyCable"
-  spec.description   = "Rails adapter for AnyCable"
-  spec.homepage      = "http://github.com/anycable/anycable-rails"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "rails", ">= 5"
-  spec.add_dependency "anycable", "~> 0.6.0"
-
-  spec.add_development_dependency "bundler", "~> 1"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", ">= 3.4"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "simplecov", ">= 0.3.8"
-  spec.add_development_dependency "rubocop", "~> 0.60.0"
-  spec.add_development_dependency "pry-byebug"
-end

data/bin/console

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "rails"
-require "anycable/rails"
-
-require "pry"
-Pry.start

data/bin/setup

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-
-gem install bundler --conservative
-bundle check || bundle install

data/circle.yml

@@ -1,8 +0,0 @@
-machine:
-  ruby:
-    version: 2.3.0
-
-dependencies:
-  pre:
-    - gem install bundler -v 1.11.2
-  

data/gemfiles/rails5.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 5.0'
-gem 'rspec-rails', '~> 3.5'
-
-gemspec path: '..'

data/gemfiles/railsmaster.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', github: 'rails/rails'
-gem 'rspec-rails', '~> 3.5.0'
-
-gemspec path: '..'