discourse_subscription_client 0.1.0.pre7 → 0.1.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dbf2bec6a47be892f9c6d5adea08819c4fa26b604108e1ea6b2885b94993416
-  data.tar.gz: 78bd74904236a78a94494481098f93a257dad5d9762f00866ece57b0a09258f9
+  metadata.gz: 660696bcefd9a3277aecb58ea84b3b8523fe25f67ce8622537659c3f4e9cb3de
+  data.tar.gz: b0a5bb0ef2b75129c5b0698b4ea966452db15e70233edf5e171f52ebc2d76ef7
 SHA512:
-  metadata.gz: 8623d169bc5487f16bd3ffbd9e7f6f1b1573dbe3efc7d4353b6e59b5d465ed5fc65d0786b19be06cca045dce5bd52f8536cae266d7c9ae59949400ec87c397bd
-  data.tar.gz: 6ccfa6917ddf19f82884a6c769b43670719c55a181a95ef5b690b8077f80c2ebed8225930aac0e450c788f22a7d53604f3dcb4ab2c676fcb7518537423c014ce
+  metadata.gz: 601eed6e1e0d001609fd9f3f1c9ffc4c5db1dbaea3f892c00542794f1a659739afd32b68b4e70fb603ec25c2c662f32112928617f7f1bcbd8eebba0d68059ab2
+  data.tar.gz: dfcef63df0719f54187dcdb0530c5f154b6e2750ebe2583b1ea260a8acafb6fc71d982e2512b16b0416780d961556a751e5eac783660c7527f5feac72290b12a

data/app/jobs/discourse_subscription_client/find_resources.rb

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

data/app/jobs/discourse_subscription_client/update_notices.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module DiscourseSubscriptionClient
+  class UpdateNotices < ::Jobs::Scheduled
+    every 5.minutes
+
+    def execute(_args = {})
+      Notices.update
+    end
+  end
+end

data/app/jobs/discourse_subscription_client/update_subscriptions.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module DiscourseSubscriptionClient
+  class UpdateSubscriptions < ::Jobs::Scheduled
+    every 1.day
+
+    def execute(_args = {})
+      Subscriptions.update
+    end
+  end
+end

data/lib/discourse_subscription_client/engine.rb

@@ -9,7 +9,7 @@ module DiscourseSubscriptionClient
 
     config.before_initialize do
       config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
-      Rails.autoloaders.main.ignore(config.root) if defined?(Rails) == 'constant'
+      Rails.autoloaders.main.ignore(config.root) if defined?(Rails) == "constant"
     end
 
     config.after_initialize do
@@ -37,9 +37,9 @@ 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/discourse_subscription_client_find_resources
-        ../../app/jobs/discourse_subscription_client_update_subscriptions
-        ../../app/jobs/discourse_subscription_client_update_notices
+        ../../app/jobs/discourse_subscription_client/find_resources
+        ../../app/jobs/discourse_subscription_client/update_subscriptions
+        ../../app/jobs/discourse_subscription_client/update_notices
         ../../extensions/discourse_subscription_client/current_user_serializer
         ../../extensions/discourse_subscription_client/site_serializer
         ../../extensions/discourse_subscription_client/guardian
@@ -47,7 +47,7 @@ module DiscourseSubscriptionClient
         require_relative path
       end
 
-      Jobs.enqueue(:discourse_subscription_client_find_resources) if !Rails.env.test? && DiscourseSubscriptionClient.database_exists?
+      Jobs.enqueue(DiscourseSubscriptionClient::FindResources) if !Rails.env.test? && DiscourseSubscriptionClient.database_exists?
 
       Rails.application.routes.append do
         mount DiscourseSubscriptionClient::Engine, at: "/admin/plugins/subscription-client"

data/lib/discourse_subscription_client/resources.rb

@@ -95,6 +95,7 @@ module DiscourseSubscriptionClient
     end
 
     def valid_supplier_data?(data)
+      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/lib/discourse_subscription_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discourse_subscription_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre7
+  version: 0.1.0.pre9
 platform: ruby
 authors:
 - Angus McLeod
@@ -236,9 +236,9 @@ files:
 - 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/discourse_subscription_client_find_resources.rb
-- app/jobs/discourse_subscription_client_update_notices.rb
-- app/jobs/discourse_subscription_client_update_subscriptions.rb
+- app/jobs/discourse_subscription_client/find_resources.rb
+- app/jobs/discourse_subscription_client/update_notices.rb
+- app/jobs/discourse_subscription_client/update_subscriptions.rb
 - app/models/subscription_client_notice.rb
 - app/models/subscription_client_request.rb
 - app/models/subscription_client_resource.rb

data/app/jobs/discourse_subscription_client_find_resources.rb

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

data/app/jobs/discourse_subscription_client_update_notices.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class DiscourseSubscriptionClientUpdateNotices < ::Jobs::Scheduled
-    every 5.minutes
-
-    def execute(_args = {})
-      ::DiscourseSubscriptionClient::Notices.update
-    end
-  end
-end

data/app/jobs/discourse_subscription_client_update_subscriptions.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class DiscourseSubscriptionClientUpdateSubscriptions < ::Jobs::Scheduled
-    every 1.day
-
-    def execute(_args = {})
-      ::DiscourseSubscriptionClient::Subscriptions.update
-    end
-  end
-end