panda_pal 5.3.12 → 5.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 776a9f59c8500e45d110c3e672e8ec97a891e186687473f33d4561ea74f31902
-  data.tar.gz: b308adfeea7b3b5c15b2a023edd9a0e5eec8a0a768e1fc58c0ecc2c40891cbd0
+  metadata.gz: c8eb58ee2c4df4d91c08b20c3ea717a1227ebbc212500b6f5a0abad01855fd8c
+  data.tar.gz: ba0b60f6ee46634a554ac779b6cadf671edb922bc33201ac762de4fa9263ec45
 SHA512:
-  metadata.gz: 81b794f8cb355eb4c1f2b3497062cf513e240349212a5b607edfcbe7e47074010cb3ef2fdb9da3025e492ed9c8f75b306270adefb59cc73919469f08a21ad664
-  data.tar.gz: a840a2ad126d6b06f54ec8786b964de3e1095f6f9243d0dcf8b3a18d694f1fa05994127969756678639aacf16849ed7c8528744fd01c7bcf89660c05c891aada
+  metadata.gz: 1337a89241f5a12bc0f5d202197f17f6ea4478be3e44786e68cd2b2161fc8df0cc2338418c4cdacbaa99cb1ec9e07a06446bac3a9a9a965285f35b4cbdce91cb
+  data.tar.gz: 83c6c892aad41adc5fd7ec2709dd8f5b5a70c238764b9caad989f5a2021ee92d81c64ac05e6ce7a3e72d321d2abfa8b1aba3b1298b2225fff4d476b57d4bd3c6

data/app/models/panda_pal/organization_concerns/settings_validation.rb

@@ -8,8 +8,16 @@ module PandaPal
       end
 
       class_methods do
+        def define_setting(*args, &blk)
+          @_injected_settings_definitions ||= []
+          @_injected_settings_definitions << {
+            args: args,
+            block: blk,
+          }
+        end
+
         def settings_structure
-          if PandaPal.lti_options&.[](:settings_structure).present?
+          struc = if PandaPal.lti_options&.[](:settings_structure).present?
             normalize_settings_structure(PandaPal.lti_options[:settings_structure])
           else
             {
@@ -18,6 +26,32 @@ module PandaPal
               properties: {},
             }
           end
+
+          (@_injected_settings_definitions || []).each do |sub|
+            args = [*sub[:args]]
+            path = args.shift || []
+            path = path.split('.') if path.is_a?(String)
+            path = Array(path)
+
+            if path.present?
+              key = path.pop
+
+              root = struc
+              path.each do |p|
+                root = root[:properties][p.to_sym]
+              end
+
+              if sub[:block]
+                root[:properties][key.to_sym] = sub[:block].call
+              else
+                root[:properties][key.to_sym] = args.shift
+              end
+            else
+              sub[:block].call(struc)
+            end
+          end
+
+          struc
         end
 
         def normalize_settings_structure(struc)
@@ -69,7 +103,7 @@ module PandaPal
           any_match = norm_types.any? do |t|
             if t == 'Boolean'
               settings == true || settings == false
-            else
+            elsif t.is_a?(Class)
               settings.is_a?(t)
             end
           end

data/app/models/panda_pal/organization_concerns/task_scheduling.rb

@@ -11,6 +11,31 @@ module PandaPal
       included do
         after_commit :sync_schedule, on: [:create, :update]
         after_commit :unschedule_tasks, on: :destroy
+
+        define_setting do |struc|
+          next unless _schedule_descriptors.present?
+
+          struc[:properties][:timezone] ||= {
+            type: 'String',
+            required: false,
+            validate: ->(timezone, *args) {
+              ActiveSupport::TimeZone[timezone].present? ? nil : "<path> Invalid Timezone '#{timezone}'"
+            },
+          }
+
+          struc[:properties][:task_schedules] = {
+            type: 'Hash',
+            required: false,
+            properties: _schedule_descriptors.keys.reduce({}) do |hash, k|
+              desc = _schedule_descriptors[k]
+
+              hash.tap do |hash|
+                kl = ' ' * (k.to_s.length - 4)
+                hash[k.to_sym] = hash[k.to_s] = PandaPal::OrganizationConcerns::TaskScheduling.build_settings_entry(desc)
+              end
+            end,
+          }
+        end
       end
 
       class_methods do
@@ -18,35 +43,6 @@ module PandaPal
           @_schedule_descriptors ||= {}
         end
 
-        def settings_structure
-          return super unless _schedule_descriptors.present?
-
-          super.tap do |struc|
-            struc[:properties] ||= {}
-
-            struc[:properties][:timezone] ||= {
-              type: 'String',
-              required: false,
-              validate: ->(timezone, *args) {
-                ActiveSupport::TimeZone[timezone].present? ? nil : "<path> Invalid Timezone '#{timezone}'"
-              },
-            }
-
-            struc[:properties][:task_schedules] = {
-              type: 'Hash',
-              required: false,
-              properties: _schedule_descriptors.keys.reduce({}) do |hash, k|
-                desc = _schedule_descriptors[k]
-
-                hash.tap do |hash|
-                  kl = ' ' * (k.to_s.length - 4)
-                  hash[k.to_sym] = hash[k.to_s] = PandaPal::OrganizationConcerns::TaskScheduling.build_settings_entry(desc)
-                end
-              end,
-            }
-          end
-        end
-
         def scheduled_task(cron_time, name_or_method = nil, worker: nil, queue: nil, &block)
           task_key = (name_or_method.presence || "scheduled_task_#{caller_locations[0].lineno}").to_s
           raise "Task key '#{task_key}' already taken!" if _schedule_descriptors.key?(task_key)

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.3.12"
+  VERSION = "5.3.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.3.12
+  version: 5.3.13
 platform: ruby
 authors:
 - Instructure ProServe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails