discourse_subscription_client 0.1.0.pre11 → 0.1.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6182382e0517359b04736dd702fc121669e40775a138eaf6bab7493ae722591a
-  data.tar.gz: 4554111e5f4b3659cfbf5d1ac70bed551237435e32c5265acf8a8093ca7db5d4
+  metadata.gz: 0eb5ae72b353d0c2247634efd915ba4702c6ce9e7edc79a6cd1bfec8ed008d12
+  data.tar.gz: 7ad730452ccc89cf452571029f3d1f4a4c6844d6bd642d32a63d92ddf3b0250d
 SHA512:
-  metadata.gz: 2988268b14449153a71e2345489f8cc97861b1d6562d62901724ba0db2151465a58bc153bffad9d5a516e2218cfd761523a0d95d8ca90a3e0c24351c1f21365b
-  data.tar.gz: e7d340f95ce7995c7edb4444987daec675706e056898613a2b7526af5010d5a239249e764d4e7804a0e3c75ac1ae0f16386c03e9c691d72ce0ff0f96bfeb45d1
+  metadata.gz: 60f355d11aa8199f740908df977e4e7a6e6c54dc2a52f5ed3d0e656672580230bfc30019f5dd6e68b801843a9bb1192e6d9f8938d8753924f474caf02534717c
+  data.tar.gz: 3de6d7e1ec21a234e8fe1c1a45c53f9db5135327cf4ceda307c262b413a903dcade95796d0268445c34abc2eb03a854da59d0b878e109cada669c63b59db90fc

data/app/models/subscription_client_supplier.rb

@@ -19,13 +19,11 @@ class SubscriptionClientSupplier < ActiveRecord::Base
     api_key.present?
   end
 
-  def product_slugs
-    if products.present?
-      products.each_with_object({}) do |product, result|
-        result[product["product_id"]] = product["product_slug"]
-      end
-    else
-      {}
+  def product_slugs(resource)
+    return {} unless products.present? && products[resource]
+
+    products[resource].each_with_object({}) do |product, result|
+      result[product["product_id"]] = product["product_slug"]
     end
   end
 

data/db/migrate/20230223135957_add_products_to_subscription_client_suppliers.rb

@@ -2,6 +2,6 @@
 
 class AddProductsToSubscriptionClientSuppliers < ActiveRecord::Migration[7.0]
   def change
-    add_column :subscription_client_suppliers, :products, :json
+    add_column :subscription_client_suppliers, :products, :json, if_not_exists: true
   end
 end

data/lib/discourse_subscription_client/engine.rb

@@ -7,9 +7,18 @@ module DiscourseSubscriptionClient
     engine_name PLUGIN_NAME
     isolate_namespace DiscourseSubscriptionClient
 
+    def enabled_site_setting
+      @enabled_site_setting = "subscription_client_enabled"
+    end
+
+    def configurable?
+      true
+    end
+
     config.before_initialize do
       config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
       Rails.autoloaders.main.ignore(config.root) if defined?(Rails) == "constant"
+      Discourse.plugins_by_name[PLUGIN_NAME] = self
     end
 
     config.after_initialize do
@@ -88,7 +97,7 @@ module DiscourseSubscriptionClient
     end
 
     def plugin_status_server_url
-      "https://discourse.pluginmanager.org"
+      "https://coop.pavilion.tech"
     end
 
     def database_exists?
@@ -110,9 +119,15 @@ module DiscourseSubscriptionClient
       result = DiscourseSubscriptionClient::Subscriptions::Result.new
       return result unless subscriptions.exists?
 
-      result.resource = subscriptions.first.resource
-      result.supplier = subscriptions.first.resource.supplier
+      resource = subscriptions.first.resource
+      supplier = resource.supplier
+      products = supplier.product_slugs(resource_name)
+      return result unless products.present?
+
+      result.resource = resource
+      result.supplier = supplier
       result.subscriptions = subscriptions.to_a
+      result.products = products
 
       result
     end

data/lib/discourse_subscription_client/resources.rb

@@ -42,21 +42,13 @@ module DiscourseSubscriptionClient
       supplier_urls = @resources.map { |resource| resource[:supplier_url] }.uniq.compact
 
       supplier_urls.each do |url|
-        supplier = SubscriptionClientSupplier.find_by(url: url)
+        supplier = SubscriptionClientSupplier.find_or_create_by(url: url)
+        request = DiscourseSubscriptionClient::Request.new(:supplier, supplier.id)
+        data = request.perform("#{url}/subscription-server")
 
-        if supplier&.name
+        if valid_supplier_data?(data)
+          supplier.update(name: data[:supplier], products: data[:products])
           @suppliers << supplier
-        else
-          supplier ||= SubscriptionClientSupplier.create!(url: url)
-          request = DiscourseSubscriptionClient::Request.new(:supplier, supplier.id)
-          data = request.perform("#{url}/subscription-server")
-
-          if valid_supplier_data?(data)
-            supplier.update(name: data[:supplier], products: data[:products])
-            @suppliers << supplier
-          else
-            supplier.destroy!
-          end
         end
       end
     end
@@ -98,12 +90,14 @@ module DiscourseSubscriptionClient
       return false unless data.present? && data.is_a?(Hash)
       return false unless %i[supplier products].all? { |key| data.key?(key) }
       return false unless data[:supplier].is_a?(String)
-      return false unless data[:products].is_a?(Array)
-
-      data[:products].all? do |product|
-        product.is_a?(Hash) &&
-          %i[product_id product_slug].all? do |key|
-            product.key?(key) && product[key].is_a?(String)
+      return false unless data[:products].is_a?(Hash)
+
+      data[:products].all? do |_resource, products|
+        products.is_a?(Array) &&
+          products.all? do |product|
+            %i[product_id product_slug].all? do |key|
+              product.key?(key) && product[key].is_a?(String)
+            end
           end
       end
     end

data/lib/discourse_subscription_client/subscriptions/result.rb

@@ -5,10 +5,11 @@ module DiscourseSubscriptionClient
     class Result
       attr_accessor :supplier,
                     :resource,
-                    :subscriptions
+                    :subscriptions,
+                    :products
 
       def any?
-        supplier.present? && resource.present? && subscriptions.present?
+        supplier.present? && resource.present? && subscriptions.present? && products.present?
       end
     end
   end

data/lib/discourse_subscription_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_subscription_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre11
+  version: 0.1.0.pre13
 platform: ruby
 authors:
 - Angus McLeod
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Discourse plugin subscription client.