nulogy_message_bus_producer 3.4.0 → 3.4.1

data/spec/integration/lib/nulogy_message_bus_producer/subscription_spec.rb

@@ -1,79 +1,7 @@
 require "integration_spec_helper"
 
-RSpec.describe NulogyMessageBusProducer::Subscription do
-  context "when validating" do
-    it "is invalid without an id" do
-      model = build_subscription(id: "")
-
-      model.validate
-
-      expect(model.errors[:id]).to contain_exactly("can't be blank")
-    end
-
-    it "is invalid without a subscription_group_id" do
-      model = build_subscription(subscription_group_id: "")
-
-      model.validate
-
-      expect(model.errors[:subscription_group_id]).to contain_exactly("can't be blank")
-    end
-
-    it "is invalid with a blank query" do
-      model = build_subscription(query: "")
-
-      model.validate
-
-      expect(model.errors[:query]).to contain_exactly("can't be blank")
-    end
-
-    it "is invalid with blank schema_key" do
-      model = build_subscription(schema_key: "")
-
-      model.validate
-
-      expect(model.errors[:schema_key]).to contain_exactly("can't be blank")
-    end
-
-    it "is invalid with an invalid schema_key" do
-      model = build_subscription(schema_key: "invalid")
-
-      model.validate
-
-      expect(model.errors[:query]).to contain_exactly(/Could not find a schema for schema_key 'invalid'/)
-    end
-
-    it "is invalid with an invalid query" do
-      model = build_subscription(
-        query: subscription_query(query: "foo { a_field_that_does_not_exist }")
-      )
-
-      model.validate
-
-      expect(model).not_to be_valid
-      expect(model.errors[:query]).to contain_exactly(
-        match(/Field 'a_field_that_does_not_exist' doesn't exist on type 'testObject'/)
-      )
-    end
-
-    it "valid with a valid query" do
-      model = build_subscription(
-        query: subscription_query(query: "foo { id }")
-      )
-
-      model.validate
-
-      expect(model.errors).not_to include(:query)
-    end
-  end
-
-  def build_subscription(overrides = {})
-    attrs = {
-      id: SecureRandom.uuid,
-      subscription_group_id: SecureRandom.uuid,
-      schema_key: "test",
-      query: subscription_query,
-    }.merge(overrides)
-
-    NulogyMessageBusProducer::Subscription.new(attrs)
+module NulogyMessageBusProducer
+  RSpec.describe SelfServeSubscription do
+    include_examples "subscription validations"
   end
 end

data/spec/integration_spec_helper.rb

@@ -1,6 +1,3 @@
-# Make all rspec configuration changes to this file.
-# Leave automatically generated configuration files untouched to facilitate gem upgrades.
-
 ENV["RAILS_ENV"] ||= "test"
 
 require File.expand_path("dummy/config/environment.rb", __dir__)
@@ -10,8 +7,6 @@ require "rspec/json_expectations"
 require "active_record"
 require "spec_helper"
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
-
 RSpec.configure do |config|
   # Uncomment this line to see full backtraces for spec failures
   # config.backtrace_exclusion_patterns = []
@@ -37,5 +32,4 @@ RSpec.configure do |config|
 
   config.include(SpecUtils)
   config.include(SqlHelpers)
-  config.include(SubscriptionHelpers)
 end

data/spec/nulogy_message_bus_producer/subscriptions/subscription_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+module NulogyMessageBusProducer
+  module Subscriptions
+    RSpec.describe ConfiguredSubscription do
+      include_examples "subscription validations"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require "rails/all"
 require "nulogy_message_bus_producer"
 
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
+
 RSpec.configure do |config|
   config.expect_with(:rspec) do |expectations|
     # This is generally recommended, and will default to `true` in RSpec 4.
@@ -52,4 +54,6 @@ RSpec.configure do |config|
       example.run
     end
   end
+
+  config.include(SubscriptionHelpers)
 end

data/spec/support/shared_examples/subscription_validations.rb

@@ -0,0 +1,77 @@
+RSpec.shared_examples "subscription validations" do
+  context "when validating" do
+    it "is invalid without an id" do
+      model = build_subscription(id: "")
+
+      model.validate
+
+      expect(model.errors[:id]).to contain_exactly("can't be blank")
+    end
+
+    it "is invalid without a subscription_group_id" do
+      model = build_subscription(subscription_group_id: "")
+
+      model.validate
+
+      expect(model.errors[:subscription_group_id]).to contain_exactly("can't be blank")
+    end
+
+    it "is invalid with a blank query" do
+      model = build_subscription(query: "")
+
+      model.validate
+
+      expect(model.errors[:query]).to contain_exactly("can't be blank")
+    end
+
+    it "is invalid with blank schema_key" do
+      model = build_subscription(schema_key: "")
+
+      model.validate
+
+      expect(model.errors[:schema_key]).to contain_exactly("can't be blank")
+    end
+
+    it "is invalid with an invalid schema_key" do
+      model = build_subscription(schema_key: "invalid")
+
+      model.validate
+
+      expect(model.errors[:query]).to contain_exactly(/Could not find a schema for schema_key 'invalid'/)
+    end
+
+    it "is invalid with an invalid query" do
+      model = build_subscription(
+        query: subscription_query(query: "foo { a_field_that_does_not_exist }")
+      )
+
+      model.validate
+
+      expect(model).not_to be_valid
+      expect(model.errors[:query]).to contain_exactly(
+        match(/Field 'a_field_that_does_not_exist' doesn't exist on type 'testObject'/)
+      )
+    end
+
+    it "valid with a valid query" do
+      model = build_subscription(
+        query: subscription_query(query: "foo { id }")
+      )
+
+      model.validate
+
+      expect(model.errors).not_to include(:query)
+    end
+  end
+
+  def build_subscription(overrides = {})
+    attrs = {
+      id: SecureRandom.uuid,
+      subscription_group_id: SecureRandom.uuid,
+      schema_key: "test",
+      query: subscription_query
+    }.merge(overrides)
+
+    described_class.new(attrs)
+  end
+end

data/spec/support/sql_helpers.rb

@@ -14,7 +14,7 @@ module SqlHelpers
 
     # Just incase these models weren't loaded, do them explicitly
     ActiveRecord::Base.connection.execute("TRUNCATE #{NulogyMessageBusProducer::SubscriptionEvent.table_name}")
-    ActiveRecord::Base.connection.execute("TRUNCATE #{NulogyMessageBusProducer::Subscription.table_name}")
+    ActiveRecord::Base.connection.execute("TRUNCATE #{NulogyMessageBusProducer::SelfServeSubscription.table_name}")
   end
 
   def replication_slots

data/spec/support/subscription_helpers.rb

@@ -9,9 +9,9 @@ module SubscriptionHelpers
     expect {
       gql_response = execute_graphql(gql, schema)
       expect(gql_response).to eq(data: {})
-    }.to change(NulogyMessageBusProducer::Subscription, :count).by(1)
+    }.to change(NulogyMessageBusProducer::SelfServeSubscription, :count).by(1)
 
-    NulogyMessageBusProducer::Subscription.find(subscription_id)
+    NulogyMessageBusProducer::SelfServeSubscription.find(subscription_id)
   end
 
   def configured_subscription(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nulogy_message_bus_producer
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Nulogy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -224,13 +224,15 @@ files:
 - lib/nulogy_message_bus_producer/configuration/query_parser.rb
 - lib/nulogy_message_bus_producer/engine.rb
 - lib/nulogy_message_bus_producer/repopulate_replication_slots.rb
-- lib/nulogy_message_bus_producer/subscription.rb
+- lib/nulogy_message_bus_producer/self_serve_subscription.rb
 - lib/nulogy_message_bus_producer/subscription_event.rb
+- lib/nulogy_message_bus_producer/subscriptions/configured_subscription.rb
 - lib/nulogy_message_bus_producer/subscriptions/finder.rb
 - lib/nulogy_message_bus_producer/subscriptions/no_variables.rb
 - lib/nulogy_message_bus_producer/subscriptions/postgres_transport.rb
 - lib/nulogy_message_bus_producer/subscriptions/query_validator.rb
 - lib/nulogy_message_bus_producer/subscriptions/risky_subscription_blocker.rb
+- lib/nulogy_message_bus_producer/subscriptions/valid_for_schema_validator.rb
 - lib/nulogy_message_bus_producer/version.rb
 - lib/tasks/engine/message_bus_producer.rake
 - spec/dummy/Rakefile
@@ -298,9 +300,11 @@ files:
 - spec/integration/lib/nulogy_message_bus_producer/subscriptions/risky_subscription_blocker_spec.rb
 - spec/integration_spec_helper.rb
 - spec/nulogy_message_bus_producer/configuration/query_parser_spec.rb
+- spec/nulogy_message_bus_producer/subscriptions/subscription_spec.rb
 - spec/spec_helper.rb
 - spec/support/kafka.rb
 - spec/support/kafka_connect.rb
+- spec/support/shared_examples/subscription_validations.rb
 - spec/support/spec_utils.rb
 - spec/support/sql_helpers.rb
 - spec/support/subscription_helpers.rb
@@ -398,5 +402,7 @@ test_files:
 - spec/support/kafka.rb
 - spec/support/spec_utils.rb
 - spec/support/sql_helpers.rb
+- spec/support/shared_examples/subscription_validations.rb
 - spec/support/test_graphql_schema.rb
 - spec/nulogy_message_bus_producer/configuration/query_parser_spec.rb
+- spec/nulogy_message_bus_producer/subscriptions/subscription_spec.rb

data/lib/nulogy_message_bus_producer/subscription.rb

@@ -1,30 +0,0 @@
-module NulogyMessageBusProducer
-  # This model saves all subscriptions to external systems.
-  # An external system can subscribe to events and specify the shape of data it would like to receive for the event.
-  class Subscription < ApplicationRecord
-    self.table_name = :message_bus_subscriptions
-
-    # Run our validator with familar syntax in this model
-    class ValidForSchemaValidator < ActiveModel::EachValidator
-      def validate_each(record, attribute, _value)
-        return if record.schema_key.blank? || record.query.blank?
-
-        validator = NulogyMessageBusProducer::Subscriptions::QueryValidator.new
-
-        validator.validate(record)
-        validator.errors.each { |e| record.errors.add(attribute, e) }
-      end
-    end
-
-    validates :id, presence: true
-    validates :subscription_group_id, presence: true
-    validates :schema_key, :event_type, presence: true
-    validates :query, presence: true, valid_for_schema: true
-
-    def self.create_or_update(attrs)
-      find_or_initialize_by(id: attrs[:id]).tap do |model|
-        model.update!(attrs)
-      end
-    end
-  end
-end