anyt 0.8.0 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d56c7de8b5d8ad2df54f756ad961cfe05d6d12e961b3c9bcca2d68084fd5413
-  data.tar.gz: 9a39e7cdd7d5f72d6cdb427765a3320c76e1201dba20bc75c958a764b78f4c21
+  metadata.gz: b45eb7502a2f6155788228c055c05232ad0ab7baf47509e70cb783479047eb07
+  data.tar.gz: 62266da53d1c2f5a58376fd64b340b7e6b94dac05af6ca16c1580f84723bf177
 SHA512:
-  metadata.gz: 6b0ce87b22d20082ce0d9848e7ba01d64bc35375f5970a3efe04fd28ea79c72bda22887bb5d69b7588946d02cbaf7105ca65fd2ea08bc07cf791c081abddc439
-  data.tar.gz: 5b6f1d8f4057601fc3fc394b18ae60db944c59f4f10dc305a038759be2da8cdab76fe88dab71a3698d6804e077f481f8ab16ed808610e314f475ca542411b0c1
+  metadata.gz: 764bf51ba64a579c4906633cf19d46d156e143b66a642c96a285e6fb862cc34357da75f8c3ec2627afc4cedc3d72ca38d95a69990b53d42fbbfc9d8280b0521b
+  data.tar.gz: 57611bdee9877c384c651c8e45c928ecc85af77c888cb985c794fe9903735aed4660d3619afc5dd8ff0d191cf8509327baeeda65bfff9a8d73c33357607103c7

data/Makefile

@@ -2,4 +2,4 @@ lint:
 	bundle exec rubocop
 
 test:
-	bin/anyt --self-check
+	bin/anyt --self-check --require=etc/tests/*.rb

data/anyt.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.executables << "anyt"
 
   spec.add_dependency "rack", "~> 2"
-  spec.add_dependency "minitest", "~> 5.10.1"
+  spec.add_dependency "minitest", "~> 5.10"
   spec.add_dependency "minitest-reporters", "~> 1.1.0"
-  spec.add_dependency "rails", "~> 5.0"
+  spec.add_dependency "rails", ">= 5.0"
   spec.add_dependency "anycable-rails", "~> 0.6.0"
-  spec.add_dependency "redis", "~> 3.0"
+  spec.add_dependency "redis", "~> 4.0"
   spec.add_dependency "websocket", "~> 1.2.4"
   spec.add_dependency "websocket-client-simple", "~> 0.3.0"
   spec.add_dependency "concurrent-ruby", "~> 1.0.0"

data/etc/tests/channel_broadcast_test.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+feature "Broadcast data from channel" do
+  channel do
+    def subscribed
+      stream_from "a"
+    end
+
+    def speak(msg)
+      ActionCable.server.broadcast "a", text: msg["msg"]
+    end
+  end
+
+  let(:client2) { build_client(ignore: %w[ping welcome]) }
+
+  before do
+    subscribe_request = { command: "subscribe", identifier: { channel: channel }.to_json }
+
+    client.send(subscribe_request)
+    client2.send(subscribe_request)
+
+    ack = {
+      "identifier" => { channel: channel }.to_json, "type" => "confirm_subscription"
+    }
+
+    assert_equal ack, client.receive
+    assert_equal ack, client2.receive
+  end
+
+  scenario %{
+    Multiple clients receive messages from stream
+  } do
+    perform_request = {
+      command: "message",
+      identifier: { channel: channel }.to_json,
+      "data" => { "action" => "speak", "msg" => "hey there!"}.to_json
+    }
+
+    client.send(perform_request)
+
+    msg = {
+      "identifier" => { channel: channel }.to_json,
+      "message" => {
+        "text" => "hey there!"
+      }
+    }
+
+    assert_equal msg, client.receive
+    assert_equal msg, client2.receive
+  end
+end

data/lib/anyt/cli.rb

@@ -3,6 +3,7 @@
 require "logger"
 require "optparse"
 
+require "anyt/version"
 require "anyt/rpc"
 require "anyt/command"
 require "anyt/tests"
@@ -21,6 +22,8 @@ module Anyt
 
         result = 1
 
+        $stdout.puts "Starting AnyT v#{Anyt::VERSION} (pid: #{Process.pid})\n"
+
         begin
           # Load all test scenarios
           Tests.load_tests
@@ -92,6 +95,12 @@ module Anyt
               Anyt.config.wait_command = timeout
             end
 
+            cli.on("-rPATH", "--require=PATH",
+                   "Path to additional tests (e.g. features/*.rb") do |path|
+              Anyt.config.tests_relative_path = path
+              ENV["ANYT_TESTS_RELATIVE_PATH"] = path
+            end
+
             cli.on("--debug", "Enable debug mode.") do
               AnyCable.config.debug = true
             end

data/lib/anyt/client.rb

@@ -48,6 +48,7 @@ module Anyt
         end
 
         ws.on(:message) do |event|
+          next if event.type == :ping
           if event.type == :close
             closed.set
           else

data/lib/anyt/config.rb

@@ -7,9 +7,16 @@ module Anyt
   class Config < Anyway::Config
     attr_config :command,
                 :only_tests,
-                target_url: "ws://localhost:9292/",
+                :tests_relative_path,
+                target_url: "ws://localhost:9292/cable",
                 wait_command: 2
 
+    def tests_path
+      return unless tests_relative_path
+
+      File.expand_path(tests_relative_path, Dir.pwd)
+    end
+
     def filter_tests?
       !only_tests.nil?
     end

data/lib/anyt/dummy/application.rb

@@ -1,10 +1,25 @@
 # frozen_string_literal: true
 
 require "rails"
-require "action_cable"
+require "action_controller/railtie"
+require "action_cable/engine"
+
 require "redis"
+require "anycable-rails"
+
 require "action_dispatch/middleware/cookies"
 
+class TestApp < Rails::Application
+  secrets.secret_token    = "secret_token"
+  secrets.secret_key_base = "secret_key_base"
+
+  config.logger = Logger.new(STDOUT)
+  config.log_level = :fatal
+  config.eager_load = true
+
+  config.paths["config/routes.rb"] << File.join(__dir__, "routes.rb")
+end
+
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
     delegate :params, to: :request

data/lib/anyt/dummy/config.ru

@@ -7,4 +7,6 @@ require_relative "../tests"
 # Load channels from tests
 Anyt::Tests.load_all_tests
 
-run ActionCable.server
+Rails.application.initialize!
+
+run Rails.application

data/lib/anyt/dummy/routes.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+Rails.application.routes.draw do
+end

data/lib/anyt/rpc.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-module Anyt # :nodoc:
-  require "anyt/dummy/application"
-  require "anycable"
+require "anyt/dummy/application"
+require "anycable-rails"
+require "redis"
 
+module Anyt # :nodoc:
   # Runs AnyCable RPC server in the background
   module RPC
     using AsyncHelpers
@@ -11,21 +12,31 @@ module Anyt # :nodoc:
     class << self
       attr_accessor :running
 
+      # rubocop: disable Metrics/AbcSize,Metrics/MethodLength
       def start
+        ActionCable.server.config.cable = { "adapter" => "any_cable" }
+        Rails.application.initialize!
+
         AnyCable.logger.debug "Starting RPC server ..."
 
-        @thread = Thread.new { AnyCable::Server.start }
-        @thread.abort_on_exception = true
+        AnyCable.server_callbacks.each(&:call)
 
-        wait(2) { AnyCable::Server.running? }
+        @server = AnyCable::Server.new(
+          host: AnyCable.config.rpc_host,
+          **AnyCable.config.to_grpc_params,
+          interceptors: AnyCable.middleware.to_a
+        )
+
+        AnyCable.middleware.freeze
+
+        @server.start
 
         AnyCable.logger.debug "RPC server started"
       end
+      # rubocop: enable Metrics/AbcSize,Metrics/MethodLength
 
       def stop
-        return unless AnyCable::Server.running?
-
-        AnyCable::Server.grpc_server.stop
+        @server.stop
       end
     end
 

data/lib/anyt/tests.rb

@@ -1,12 +1,17 @@
 # frozen_string_literal: true
 
+require "anyt"
+require "anyt/client"
+require_relative "ext/minitest"
+
 module Anyt
   # Loads and runs test cases
   module Tests
-    require "anyt/client"
-    require_relative "ext/minitest"
-
     class << self
+      DEFAULT_PATTERNS = [
+        File.expand_path("tests/**/*.rb", __dir__)
+      ].freeze
+
       # Run all loaded tests
       def run
         Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
@@ -24,15 +29,16 @@ module Anyt
       def load_tests
         return load_all_tests unless Anyt.config.filter_tests?
 
-        pattern = File.expand_path("tests/**/*.rb", __dir__)
         skipped = []
         filter = Anyt.config.tests_filter
 
-        Dir.glob(pattern).each do |file|
-          if file.match?(filter)
-            require file
-          else
-            skipped << file.gsub(File.join(__dir__, 'tests/'), '').gsub('_test.rb', '')
+        test_files_patterns.each do |pattern|
+          Dir.glob(pattern).each do |file|
+            if file.match?(filter)
+              require file
+            else
+              skipped << file.gsub(File.join(__dir__, 'tests/'), '').gsub('_test.rb', '')
+            end
           end
         end
 
@@ -41,9 +47,17 @@ module Anyt
 
       # Load all test files
       def load_all_tests
-        pattern = File.expand_path("tests/**/*.rb", __dir__)
+        test_files_patterns.each do |pattern|
+          Dir.glob(pattern).each { |file| require file }
+        end
+      end
+
+      private
 
-        Dir.glob(pattern).each { |file| require file }
+      def test_files_patterns
+        @test_files_patterns ||= DEFAULT_PATTERNS.dup.tap do |patterns|
+          patterns << Anyt.config.tests_path if Anyt.config.tests_path
+        end
       end
     end
   end

data/lib/anyt/tests/core/welcome_test.rb

@@ -4,7 +4,7 @@ feature "Welcome" do
   scenario %{
     Client receives "welcome" message
   } do
-    client = build_client
+    client = build_client(ignore: ["ping"])
     assert_equal client.receive, "type" => "welcome"
   end
 end

data/lib/anyt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anyt
-  VERSION = "0.8.0"
+  VERSION = "0.8.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyt
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.5
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.10.1
+        version: '5.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.10.1
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: websocket
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,7 @@ files:
 - bin/console
 - bin/setup
 - circle.yml
+- etc/tests/channel_broadcast_test.rb
 - lib/anyt.rb
 - lib/anyt/cli.rb
 - lib/anyt/client.rb
@@ -261,6 +262,7 @@ files:
 - lib/anyt/config.rb
 - lib/anyt/dummy/application.rb
 - lib/anyt/dummy/config.ru
+- lib/anyt/dummy/routes.rb
 - lib/anyt/ext/minitest.rb
 - lib/anyt/rpc.rb
 - lib/anyt/tests.rb
@@ -298,8 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Anycable conformance testing tool