discourse_subscription_client 0.1.0.pre3 → 0.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 602522458c5663a4de8f0de8d9eeaeb9176ce2f2b029ee81147a6b1080095c86
-  data.tar.gz: da636f360623adf0b0a9b9a132769f069d78962d9ae4ecc0a8e53afcaaf25d77
+  metadata.gz: 307c93dedfd3a85110f7ad12a1d7e6e91bb1aecaaffc7e6025fec54905aa0df7
+  data.tar.gz: 11dd2c79ba1d825028cc32d2fabc31b0d889be2cb4d2f3c1ad1664c23025dad0
 SHA512:
-  metadata.gz: 2b4ec0d69e8d8d7c0042767047937f3755a456e05063c4325afda1a3ce90985c1bc9bb70583bc043be6803b87a01ece2fd862d917758275c4f31af6b666f7a3a
-  data.tar.gz: ce5b3d324033770f3fd66f5564fa9387689af99406cfe05d6cab9b97fdbce28d7ffc16ce7fb68dd3fbb09787ac181d8d153bc19b9326a35a1a386f77e4bf7713
+  metadata.gz: f22185915974d1abbc65ae2b0ed1b14022eb14ebdf7a9f8d12e03b3a00968d93ec69d39c25ad286149d95cec29e8e5035b4c52f38fbd362720664970f0044472
+  data.tar.gz: 6f47325b66b776ac2485989006b7d63f3d6e389f5cf0c53b5c4eb8914d8cb16481dcc05d46eeecada45a9ecd620ca70bd64ea2f502af0d3fcfe09a1760c5cc4e

data/app/jobs/regular/{discourse_subscription_client/find_resources.rb → discourse_subscription_client_find_resources.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Jobs
-  class SubscriptionClientFindResources < ::Jobs::Base
+  class DiscourseSubscriptionClientFindResources < ::Jobs::Base
     def execute(_args = {})
       ::DiscourseSubscriptionClient::Resources.find_all unless Rails.env.test?
     end

data/app/jobs/scheduled/{discourse_subscription_client/update_notices.rb → discourse_subscription_client_update_notices.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Jobs
-  class SubscriptionClientUpdateNotices < ::Jobs::Scheduled
+  class DiscourseSubscriptionClientUpdateNotices < ::Jobs::Scheduled
     every 5.minutes
 
     def execute(_args = {})

data/app/jobs/scheduled/{discourse_subscription_client/update_subscriptions.rb → discourse_subscription_client_update_subscriptions.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Jobs
-  class SubscriptionClientUpdateSubscriptions < ::Jobs::Scheduled
+  class DiscourseSubscriptionClientUpdateSubscriptions < ::Jobs::Scheduled
     every 1.day
 
     def execute(_args = {})

data/app/models/subscription_client_notice.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 class SubscriptionClientNotice < ActiveRecord::Base
-  belongs_to :notice_subject, polymorphic: true
-  delegate :name, to: :subject
+  belongs_to :notice_subject, polymorphic: true, optional: true
 
   scope :warnings, -> { where(notice_type: SubscriptionClientNotice.types[:warning]) }
   scope :hidden, -> { where("hidden_at IS NOT NULL AND dismissed_at IS NULL AND expired_at IS NULL") }

data/app/models/subscription_client_supplier.rb

@@ -5,7 +5,7 @@ class SubscriptionClientSupplier < ActiveRecord::Base
   has_many :subscriptions, through: :resources
   has_many :notices, class_name: "SubscriptionClientNotice", as: :notice_subject, dependent: :destroy
 
-  belongs_to :user
+  belongs_to :user, optional: true
 
   scope :authorized, -> { where("api_key IS NOT NULL") }
 

data/db/migrate/{20220318160955_create_subscription_client_suppliers.rb → 20230221100514_create_subscription_client_suppliers.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateSubscriptionClientSuppliers < ActiveRecord::Migration[6.1]
+class CreateSubscriptionClientSuppliers < ActiveRecord::Migration[7.0]
   def change
     create_table :subscription_client_suppliers do |t|
       t.string :name
@@ -12,6 +12,6 @@ class CreateSubscriptionClientSuppliers < ActiveRecord::Migration[6.1]
       t.timestamps
     end
 
-    add_index :subscription_client_suppliers, [:url], unique: true
+    add_index :subscription_client_suppliers, [:url], unique: true, if_not_exists: true
   end
 end

data/db/migrate/{20220318181029_create_subscription_client_resources.rb → 20230221100524_create_subscription_client_resources.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateSubscriptionClientResources < ActiveRecord::Migration[6.1]
+class CreateSubscriptionClientResources < ActiveRecord::Migration[7.0]
   def change
     create_table :subscription_client_resources do |t|
       t.references :supplier, foreign_key: { to_table: :subscription_client_suppliers }
@@ -9,6 +9,6 @@ class CreateSubscriptionClientResources < ActiveRecord::Migration[6.1]
       t.timestamps
     end
 
-    add_index :subscription_client_resources, %i[supplier_id name], unique: true
+    add_index :subscription_client_resources, %i[supplier_id name], unique: true, if_not_exists: true
   end
 end

data/db/migrate/{20220318181054_create_subscription_client_notices.rb → 20230221100529_create_subscription_client_notices.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateSubscriptionClientNotices < ActiveRecord::Migration[6.1]
+class CreateSubscriptionClientNotices < ActiveRecord::Migration[7.0]
   def change
     create_table :subscription_client_notices do |t|
       t.string :title, null: false
@@ -17,6 +17,6 @@ class CreateSubscriptionClientNotices < ActiveRecord::Migration[6.1]
     end
 
     add_index :subscription_client_notices, %i[notice_type notice_subject_type notice_subject_id changed_at],
-              unique: true, name: "sc_unique_notices"
+              unique: true, name: "sc_unique_notices", if_not_exists: true
   end
 end

data/db/migrate/{20220318181140_create_subscription_client_subscriptions.rb → 20230221100535_create_subscription_client_subscriptions.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateSubscriptionClientSubscriptions < ActiveRecord::Migration[6.1]
+class CreateSubscriptionClientSubscriptions < ActiveRecord::Migration[7.0]
   def change
     create_table :subscription_client_subscriptions do |t|
       t.references :resource, foreign_key: { to_table: :subscription_client_resources }
@@ -14,6 +14,7 @@ class CreateSubscriptionClientSubscriptions < ActiveRecord::Migration[6.1]
     end
 
     add_index :subscription_client_subscriptions, %i[resource_id product_id price_id], unique: true,
-                                                                                       name: "sc_unique_subscriptions"
+                                                                                       name: "sc_unique_subscriptions",
+                                                                                       if_not_exists: true
   end
 end

data/lib/discourse_subscription_client/engine.rb

@@ -14,7 +14,7 @@ module DiscourseSubscriptionClient
     config.after_initialize do
       gem_root = File.expand_path("../..", __dir__)
 
-      ActiveRecord::Tasks::DatabaseTasks.migrations_paths << "#{gem_root}/db/migrate"
+      ActiveRecord::Tasks::DatabaseTasks.migrations_paths << "#{gem_root}/db/migrate" unless Rails.env.test?
 
       %w[
         ./request
@@ -35,16 +35,16 @@ module DiscourseSubscriptionClient
         ../../app/serializers/discourse_subscription_client/resource_serializer
         ../../app/serializers/discourse_subscription_client/notice_serializer
         ../../app/serializers/discourse_subscription_client/subscription_serializer
-        ../../app/jobs/regular/discourse_subscription_client/find_resources
-        ../../app/jobs/scheduled/discourse_subscription_client/update_subscriptions
-        ../../app/jobs/scheduled/discourse_subscription_client/update_notices
+        ../../app/jobs/regular/discourse_subscription_client_find_resources
+        ../../app/jobs/scheduled/discourse_subscription_client_update_subscriptions
+        ../../app/jobs/scheduled/discourse_subscription_client_update_notices
         ../../extensions/discourse_subscription_client/current_user
         ../../extensions/discourse_subscription_client/guardian
       ].each do |path|
         require_relative path
       end
 
-      Jobs.enqueue(:subscription_client_find_resources) if DiscourseSubscriptionClient.database_exists? && !Rails.env.test?
+      Jobs.enqueue(:discourse_subscription_client_find_resources) if DiscourseSubscriptionClient.database_exists? && !Rails.env.test?
 
       Rails.application.routes.append do
         mount DiscourseSubscriptionClient::Engine, at: "/admin/plugins/subscription-client"

data/lib/discourse_subscription_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DiscourseSubscriptionClient
-  VERSION = "0.1.0.pre3"
+  VERSION = "0.1.0.pre4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_subscription_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre3
+  version: 0.1.0.pre4
 platform: ruby
 authors:
 - Angus McLeod
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  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'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -202,16 +216,15 @@ files:
 - COPYRIGHT.txt
 - LICENSE.txt
 - README.md
-- Rakefile
 - app/assets/config/discourse_subscription_client_manifest.js
 - app/assets/stylesheets/discourse_subscription_client/application.css
 - app/controllers/discourse_subscription_client/admin_controller.rb
 - app/controllers/discourse_subscription_client/notices_controller.rb
 - app/controllers/discourse_subscription_client/subscriptions_controller.rb
 - app/controllers/discourse_subscription_client/suppliers_controller.rb
-- app/jobs/regular/discourse_subscription_client/find_resources.rb
-- app/jobs/scheduled/discourse_subscription_client/update_notices.rb
-- app/jobs/scheduled/discourse_subscription_client/update_subscriptions.rb
+- app/jobs/regular/discourse_subscription_client_find_resources.rb
+- app/jobs/scheduled/discourse_subscription_client_update_notices.rb
+- app/jobs/scheduled/discourse_subscription_client_update_subscriptions.rb
 - app/models/subscription_client_notice.rb
 - app/models/subscription_client_request.rb
 - app/models/subscription_client_resource.rb
@@ -224,11 +237,11 @@ files:
 - config/locales/server.en.yml
 - config/routes.rb
 - config/settings.yml
-- db/migrate/20220318160955_create_subscription_client_suppliers.rb
-- db/migrate/20220318181029_create_subscription_client_resources.rb
-- db/migrate/20220318181054_create_subscription_client_notices.rb
-- db/migrate/20220318181140_create_subscription_client_subscriptions.rb
-- db/migrate/20230220130259_create_subscription_client_requests.rb
+- db/migrate/20230221100514_create_subscription_client_suppliers.rb
+- db/migrate/20230221100524_create_subscription_client_resources.rb
+- db/migrate/20230221100529_create_subscription_client_notices.rb
+- db/migrate/20230221100535_create_subscription_client_subscriptions.rb
+- db/migrate/20230221100540_create_subscription_client_requests.rb
 - extensions/discourse_subscription_client/current_user.rb
 - extensions/discourse_subscription_client/guardian.rb
 - lib/discourse_subscription_client.rb

data/Rakefile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-
-APP_RAKEFILE = File.expand_path("spec/support/discourse/Rakefile", __dir__)
-load "rails/tasks/engine.rake"
-
-load "rails/tasks/statistics.rake"
-
-require "bundler/gem_tasks"