fix rspecs, README and change TrigerJob

README.md

@@ -350,20 +350,20 @@ You have the next configuration
     # ... other configurations
     config.delivery_method = "inline" # the default value "inline", also can be "active_job"
     config.queue = "default" # the name of ActiveJob queue
-    config.job_class = "GraphQL::Adapters::TriggerJob" # the name executor job
+    config.job_class = "GraphQL::Jobs::TriggerJob" # the name executor job
   end
 ```
 
 `delivery_method` can be either `inline` or `active_job`.
 `inline` means that delivering messaging will work sync.
-`active_job` - It will adds delivering messages operations to `ActiveJob` with queue `default` and using job `GraphQL::Adapters::TriggerJob`
+`active_job` - It will add delivering messages operations to `ActiveJob` with queue `default` and using job `GraphQL::Jobs::TriggerJob`
 
-You can change the queue or job_class, buy changing it in configuration
+You can change the queue or job_class by changing it in the configuration
 
 Or you can run code
 
 ```ruby
-GraphQL::AnyCable.delivery_method("active_job", queue: "broadcasting", job_class: "GraphQL::Adapters::TriggerJob")
+GraphQL::AnyCable.delivery_method("active_job", queue: "broadcasting", job_class: "GraphQL::Jobs::TriggerJob")
 ```
 
 ## Testing applications which use `graphql-anycable`

lib/graphql-anycable.rb

@@ -26,7 +26,7 @@ def self.stats(**options)
       Stats.new(**options).collect
     end
 
-    def self.delivery_method(kind, queue: "default", job_class: "GraphQL::Adapters::TriggerJob")
+    def self.delivery_method(kind, queue: "default", job_class: "GraphQL::Jobs::TriggerJob")
       config.delivery_method = kind
       config.queue = queue
       config.job_class = job_class

lib/graphql/adapters/delivery_adapter.rb

@@ -35,7 +35,7 @@ def trigger(event_name, args, object, **elements)
       def executor_class_job
         custom_job_class = config.job_class
 
-        return Adapters::TriggerJob unless custom_job_class
+        return Jobs::TriggerJob unless custom_job_class
 
         custom_job_class.constantize
       end

lib/graphql/anycable/config.rb

@@ -5,6 +5,8 @@
 module GraphQL
   module AnyCable
     class Config < Anyway::Config
+      ALLOWED_DELIVERY_METHODS = %w[inline active_job].freeze
+
       config_name :graphql_anycable
       env_prefix  :graphql_anycable
 
@@ -13,7 +15,25 @@ class Config < Anyway::Config
       attr_config use_client_provided_uniq_id: true
       attr_config redis_prefix: "graphql" # Here, we set clear redis_prefix without any hyphen. The hyphen is added at the end of this value on our side.
 
-      attr_config delivery_method: "inline", queue: "default", job_class: "GraphQL::Adapters::TriggerJob"
+      attr_config delivery_method: "inline", queue: "default", job_class: "GraphQL::Jobs::TriggerJob"
+
+      def job_class=(value)
+        if value.nil? || value == ""
+          raise_validation_error "job_class can not be empty"
+        end
+
+        super
+      end
+
+      def delivery_method=(value)
+        unless ALLOWED_DELIVERY_METHODS.include?(value)
+          error_text = "Unknown delivery method - #{value}. Allowed methods: #{ALLOWED_DELIVERY_METHODS.join(", ")}"
+
+          raise_validation_error error_text
+        end
+
+        super
+      end
     end
   end
 end

lib/graphql/anycable/railtie.rb

@@ -5,13 +5,10 @@
 module GraphQL
   module AnyCable
     class Railtie < ::Rails::Railtie
-      initializer 'graphql_anycable.load_trigger_job' do
-        #ActiveSupport.on_load(:active_job) do
-        require "graphql/adapters/trigger_job" if defined?(ActiveJob::Base)
-        #end
+      initializer "graphql_anycable.load_trigger_job" do
+        require "graphql/jobs/trigger_job"
       end
 
-
       rake_tasks do
         path = File.expand_path(__dir__)
         Dir.glob("#{path}/tasks/**/*.rake").each { |f| load f }

lib/graphql/adapters/trigger_job.rb → lib/graphql/jobs/trigger_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GraphQL
-  module Adapters
+  module Jobs
     class TriggerJob < ActiveJob::Base
       def perform(payload, execute_method, event_name, args = {}, object = nil, options = {})
         schema = schema_parse(payload)

lib/graphql/subscriptions/anycable_subscriptions.rb

@@ -55,9 +55,9 @@ class AnyCableSubscriptions < GraphQL::Subscriptions
       extend Forwardable
 
       def_delegators :"GraphQL::AnyCable", :redis, :config
-      alias_method :trigger_sync, :trigger
 
       attr_reader :collected_arguments
+      alias_method :trigger_sync, :trigger
 
       SUBSCRIPTION_PREFIX  = "subscription:"  # HASH: Stores subscription data: query, context, …
       FINGERPRINTS_PREFIX  = "fingerprints:"  # ZSET: To get fingerprints by topic

spec/graphql/anycable_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "active_job"
-require "graphql/adapters/trigger_job"
+require "graphql/jobs/trigger_job"
 
 RSpec.describe GraphQL::AnyCable do
   subject do
@@ -286,13 +286,13 @@
     after do
       config.delivery_method = "inline"
       config.queue = "default"
-      config.job_class = "GraphQL::Adapters::TriggerJob"
+      config.job_class = "GraphQL::Jobs::TriggerJob"
     end
 
     it "changes config" do
       expect(config.delivery_method).to eq("inline")
       expect(config.queue).to eq("default")
-      expect(config.job_class).to eq("GraphQL::Adapters::TriggerJob")
+      expect(config.job_class).to eq("GraphQL::Jobs::TriggerJob")
 
       described_class.delivery_method("active_job", queue: "test", job_class: "CustomJob")
 

spec/graphql/broadcast_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "active_job"
-require "graphql/adapters/trigger_job"
+require "graphql/jobs/trigger_job"
 
 RSpec.describe "Broadcasting" do
   include_context 'Global ID'
@@ -67,7 +67,7 @@ def subscribe(query)
 
       it "uses broadcasting to resolve query only once" do
         2.times { subscribe(query) }
-        expect_any_instance_of(GraphQL::Adapters::TriggerJob).to receive(:perform).and_call_original
+        expect_any_instance_of(GraphQL::Jobs::TriggerJob).to receive(:perform).and_call_original
 
         BroadcastSchema.subscriptions.trigger(:post_created, {}, object)
 
@@ -86,7 +86,7 @@ def subscribe(query)
       it "resolves query for every client" do
         2.times { subscribe(query) }
 
-        expect_any_instance_of(GraphQL::Adapters::TriggerJob).to receive(:perform).and_call_original
+        expect_any_instance_of(GraphQL::Jobs::TriggerJob).to receive(:perform).and_call_original
 
         BroadcastSchema.subscriptions.trigger(:post_created, {}, object)
         expect(object).to have_received(:title).twice
@@ -108,7 +108,7 @@ def subscribe(query)
         redis.keys("graphql-subscription:*").last.tap(&redis.method(:del))
         expect(redis.keys("graphql-subscription:*").size).to eq(2)
 
-        expect_any_instance_of(GraphQL::Adapters::TriggerJob).to receive(:perform).and_call_original
+        expect_any_instance_of(GraphQL::Jobs::TriggerJob).to receive(:perform).and_call_original
 
         expect { BroadcastSchema.subscriptions.trigger(:post_created, {}, object) }.not_to raise_error
         expect(object).to have_received(:title).once
@@ -141,7 +141,7 @@ def subscribe(query)
       it "uses broadcasting to resolve query only once" do
         2.times { subscribe(query) }
 
-        expect_any_instance_of(GraphQL::Adapters::TriggerJob).to_not receive(:perform)
+        expect_any_instance_of(GraphQL::Jobs::TriggerJob).to_not receive(:perform)
 
         BroadcastSchema.subscriptions.trigger(:post_created, {}, object)
         expect(object).to have_received(:title).once
@@ -159,7 +159,7 @@ def subscribe(query)
       it "resolves query for every client" do
         2.times { subscribe(query) }
 
-        expect_any_instance_of(GraphQL::Adapters::TriggerJob).to_not receive(:perform)
+        expect_any_instance_of(GraphQL::Jobs::TriggerJob).to_not receive(:perform)
 
         BroadcastSchema.subscriptions.trigger(:post_created, {}, object)
         expect(object).to have_received(:title).twice
@@ -181,7 +181,7 @@ def subscribe(query)
         redis.keys("graphql-subscription:*").last.tap(&redis.method(:del))
         expect(redis.keys("graphql-subscription:*").size).to eq(2)
 
-        expect_any_instance_of(GraphQL::Adapters::TriggerJob).to_not receive(:perform)
+        expect_any_instance_of(GraphQL::Jobs::TriggerJob).to_not receive(:perform)
 
         expect { BroadcastSchema.subscriptions.trigger(:post_created, {}, object) }.not_to raise_error
         expect(object).to have_received(:title).once

spec/adapters/trigger_job_spec.rb → spec/jobs/trigger_job_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require "active_job"
-require "graphql/adapters/trigger_job"
+require "graphql/jobs/trigger_job"
 
-RSpec.describe GraphQL::Adapters::TriggerJob do
+RSpec.describe GraphQL::Jobs::TriggerJob do
   subject(:job) { described_class.perform_later(*job_payload) }
   subject(:trigger_changes) { AnycableSchema.subscriptions.trigger(*trigger_sync_arguments) }
 
@@ -63,11 +63,8 @@
     end
 
     it "executes AnyCableSubscriptions" do
-      expect_any_instance_of(GraphQL::Subscriptions::AnyCableSubscriptions)
-        .to receive(:trigger_sync).with(*trigger_sync_arguments)
-
-      expect_any_instance_of(GraphQL::Adapters::TriggerJob).to receive(:perform).and_call_original
-      expect(GraphQL::Adapters::TriggerJob).to receive(:set).with(queue: "default").and_call_original
+      expect_any_instance_of(GraphQL::Jobs::TriggerJob).to receive(:perform).and_call_original
+      expect(GraphQL::Jobs::TriggerJob).to receive(:set).with(queue: "default").and_call_original
 
       trigger_changes
     end
@@ -83,11 +80,8 @@
       end
 
       it "executes AnyCableSubscriptions" do
-        expect_any_instance_of(GraphQL::Subscriptions::AnyCableSubscriptions)
-          .to receive(:trigger_sync).with(*trigger_sync_arguments)
-
-        expect_any_instance_of(GraphQL::Adapters::TriggerJob).to receive(:perform).and_call_original
-        expect(GraphQL::Adapters::TriggerJob).to receive(:set).with(queue: "test").and_call_original
+        expect_any_instance_of(GraphQL::Jobs::TriggerJob).to receive(:perform).and_call_original
+        expect(GraphQL::Jobs::TriggerJob).to receive(:set).with(queue: "test").and_call_original
 
         trigger_changes
       end