anycable 1.0.0.rc1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deebe94f2e541a9d14ccf4a56df910cdb5a2fb17ae6815ffaaa2f761fdcd07ad
-  data.tar.gz: e96c5b0d28dd7617c2cfa1249fde5bd357465be7596915720c27718f486c4f16
+  metadata.gz: c4ad5eeba2fa05d2271aa9b84195fe9bf8e34365c3e76a993d9e695b2aec4772
+  data.tar.gz: 4df199ef6e5f96c3c0dba5615d30c2da944780288c2d2cf8dbc7863814a1a73f
 SHA512:
-  metadata.gz: b585f2797184d7bc78cc761707b741dcfa8a6b796df91cccd7ac1e44c9210a84852daba838adaaa6b2f1548d2d0f82cf57713b32a4a86d0ffa671f64321b9df1
-  data.tar.gz: dccd27127eaafc5b7821ba18404546269e9aaf3163faccffaba864e166cb1c19cdc914ccf9de87da963cac447541058e0d7ba906674298f9dda8573ca4e917c8
+  metadata.gz: bab0f69742979b57e8ed9f635c2e9e1f1350569a36d28ebe44f4102849b2a28f82445c78785d84bd4af1def082f67958d7fda337b2a487b6533a7d1115defdfa
+  data.tar.gz: 0de66f9c23a4235c9460ac4e73c512a2e955ba48081e455298701a1f5106e5e4667d28cdb2c4decb8c3b0dc2b0be55681a12acb10a6b50bda03536dc9401d715

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 # Change log
 
-## 1.0.0.rc1 (2020-06-10)
+## master
+
+## 1.0.3 (2021-03-05)
+
+- Ruby 3.0 compatibility. ([@palkan][])
+
+## 1.0.2 (2021-01-05)
+
+- Handle TLS Redis connections by using VERIFY_NONE mode. ([@palkan][])
+
+## 1.0.1 (2020-07-07)
+
+- Support providing passwords for Redis Sentinels. ([@palkan][])
+
+Use the following format: `ANYCABLE_REDIS_SENTINELS=:password1@my.redis.sentinel.first:26380,:password2@my.redis.sentinel.second:26380`.
+
+## 1.0.0 (2020-07-01)
+
+- Add `embedded` option to CLI runner. ([@palkan][])
 
 - Add `Env#istate` and `EnvResponse#istate` to store channel state. ([@palkan][])
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017-2020 Vladimir Dementyev
+Copyright 2017-2021 Vladimir Dementyev
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,4 +1,3 @@
-[![GitPitch](https://gitpitch.com/assets/badge.svg)](https://gitpitch.com/anycable/anycable/master?grs=github)
 [![Gem Version](https://badge.fury.io/rb/anycable.svg)](https://rubygems.org/gems/anycable)
 [![Build](https://github.com/anycable/anycable/workflows/Build/badge.svg)](https://github.com/anycable/anycable/actions)
 [![Gitter](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/anycable/Lobby)
@@ -29,6 +28,8 @@ Check out our 📑 [Documentation](https://docs.anycable.io/v1).
 
 ## Links
 
+- [AnyCable 1.0: Four years of real-time web with Ruby and Go](https://evilmartians.com/chronicles/anycable-1-0-four-years-of-real-time-web-with-ruby-and-go)
+
 - [AnyCable: Action Cable on steroids!](https://evilmartians.com/chronicles/anycable-actioncable-on-steroids)
 
 - [Connecting LiteCable to Hanami](http://gabrielmalakias.com.br/ruby/hanami/iot/2017/05/26/websockets-connecting-litecable-to-hanami.html) by [@GabrielMalakias](https://github.com/GabrielMalakias)

data/lib/anycable.rb

@@ -31,7 +31,7 @@ module AnyCable
     def logger
       return @logger if instance_variable_defined?(:@logger)
 
-      log_output = AnyCable.config.log_file || STDOUT
+      log_output = AnyCable.config.log_file || $stdout
       @logger = Logger.new(log_output).tap do |logger|
         logger.level = AnyCable.config.log_level
       end

data/lib/anycable/broadcast_adapters/http.rb

@@ -41,7 +41,7 @@ module AnyCable
       DELAY = 2
 
       attr_reader :url, :headers, :authorized
-      alias authorized? authorized
+      alias_method :authorized?, :authorized
 
       def initialize(url: AnyCable.config.http_broadcast_url, secret: AnyCable.config.http_broadcast_secret)
         @url = url

data/lib/anycable/cli.rb

@@ -20,17 +20,22 @@ module AnyCable
     # Wait for external process termination (s)
     WAIT_PROCESS = 2
 
-    attr_reader :server, :health_server
+    attr_reader :server, :health_server, :embedded
+    alias_method :embedded?, :embedded
+
+    def initialize(embedded: false)
+      @embedded = embedded
+    end
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def run(args = {})
+    def run(args = [])
       @at_stop = []
 
       extra_options = parse_cli_options!(args)
 
       # Boot app first, 'cause it might change
       # configuration, loggin settings, etc.
-      boot_app!
+      boot_app! unless embedded?
 
       parse_gem_options!(extra_options)
 
@@ -40,7 +45,7 @@ module AnyCable
 
       print_versions!
 
-      logger.info "Serving #{defined?(::Rails) ? "Rails " : ""}application from #{boot_file}"
+      logger.info "Serving #{defined?(::Rails) ? "Rails " : ""}application from #{boot_file}" unless embedded?
 
       verify_connection_factory!
 
@@ -66,6 +71,8 @@ module AnyCable
 
       run_custom_server_command! unless server_command.nil?
 
+      return if embedded?
+
       begin
         wait_till_terminated
       rescue Interrupt => e
@@ -81,7 +88,7 @@ module AnyCable
 
     def shutdown
       at_stop.each(&:call)
-      server.stop
+      server&.stop
     end
 
     private
@@ -96,9 +103,9 @@ module AnyCable
       AnyCable.logger
     end
 
-    def at_stop
-      if block_given?
-        @at_stop << Proc.new
+    def at_stop(&block)
+      if block
+        @at_stop << block
       else
         @at_stop
       end

data/lib/anycable/config.rb

@@ -3,6 +3,8 @@
 require "anyway_config"
 require "grpc"
 
+require "uri"
+
 module AnyCable
   # AnyCable configuration.
   class Config < Anyway::Config
@@ -45,7 +47,7 @@ module AnyCable
       version_check_enabled: true
     )
 
-    alias version_check_enabled? version_check_enabled
+    alias_method :version_check_enabled?, :version_check_enabled
 
     ignore_options :rpc_server_args
     flag_options :log_grpc, :debug
@@ -75,7 +77,7 @@ module AnyCable
         @debug != false
       end
 
-      alias debug? debug
+      alias_method :debug?, :debug
     end
 
     def http_health_port_provided?
@@ -96,13 +98,17 @@ module AnyCable
     # Build Redis parameters
     def to_redis_params
       {url: redis_url}.tap do |params|
-        next if redis_sentinels.nil?
+        next if redis_sentinels.nil? || redis_sentinels.empty?
 
         sentinels = Array(redis_sentinels)
 
         next if sentinels.empty?
 
         params[:sentinels] = sentinels.map(&method(:parse_sentinel))
+      end.tap do |params|
+        next unless redis_url.match?(/rediss:\/\//)
+
+        params[:ssl_params] = {verify_mode: OpenSSL::SSL::VERIFY_NONE}
       end
     end
 
@@ -116,16 +122,14 @@ module AnyCable
 
     private
 
-    SENTINEL_RXP = /^([\w\-_]*)\:(\d+)$/.freeze
-
     def parse_sentinel(sentinel)
       return sentinel.transform_keys!(&:to_sym) if sentinel.is_a?(Hash)
 
-      matches = sentinel.match(SENTINEL_RXP)
+      uri = URI.parse("redis://#{sentinel}")
 
-      raise ArgumentError, "Invalid Sentinel value: #{sentinel}" if matches.nil?
-
-      {host: matches[1], port: matches[2].to_i}
+      {host: uri.host, port: uri.port}.tap do |opts|
+        opts[:password] = uri.password if uri.password
+      end
     end
   end
 end

data/lib/anycable/exceptions_handling.rb

@@ -7,7 +7,7 @@ module AnyCable
         handlers << procify(block)
       end
 
-      alias << add_handler
+      alias_method :<<, :add_handler
 
       def notify(exp, method_name, message)
         handlers.each do |handler|

data/lib/anycable/health_server.rb

@@ -53,7 +53,11 @@ module AnyCable
     end
 
     def build_server
-      require "webrick"
+      begin
+        require "webrick"
+      rescue LoadError
+        raise "Please, install webrick gem to use health server"
+      end
 
       WEBrick::HTTPServer.new(
         Port: port,

data/lib/anycable/rpc_handler.rb

@@ -137,7 +137,7 @@ module AnyCable
         "SERVER_PORT" => "80",
         "rack.url_scheme" => "http",
         "rack.input" => StringIO.new("", "r").tap { |io| io.set_encoding(Encoding::ASCII_8BIT) },
-        "rack.version" => Rack::VERSION,
+        "rack.version" => ::Rack::VERSION,
         "rack.errors" => StringIO.new("").tap { |io| io.set_encoding(Encoding::ASCII_8BIT) },
         "rack.multithread" => true,
         "rack.multiprocess" => false,

data/lib/anycable/rspec/with_grpc_server.rb

@@ -9,6 +9,7 @@ RSpec.shared_context "anycable:rpc:server" do
     )
 
     @server.start
+    sleep 0.1
   end
 
   after(:all) { @server.stop }

data/lib/anycable/socket.rb

@@ -17,7 +17,7 @@ module AnyCable
         source&.[](key)
       end
 
-      alias [] read
+      alias_method :[], :read
 
       def write(key, val)
         return if source&.[](key) == val
@@ -28,7 +28,7 @@ module AnyCable
         source[key] = val
       end
 
-      alias []= write
+      alias_method :[]=, :write
 
       def changed_fields
         return unless source && dirty_keys

data/lib/anycable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AnyCable
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.3
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  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'
 description: AnyCable is a polyglot replacement for ActionCable-compatible servers
 email:
 - dementiev.vm@gmail.com
@@ -181,9 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 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: