panda_pal 4.1.0.beta2 → 4.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6ac3694136d009439988eff1703cd4df593166
-  data.tar.gz: 0d41152d271eb99d7d248062a4f3500c8c146af1
+  metadata.gz: ef5b128c1f14031f45d4955e56094db8cab358ba
+  data.tar.gz: 0e55cffec0dc1dd61ce847d018f1140a047549ab
 SHA512:
-  metadata.gz: b253820d23c08f25c61de72d420da969647e6c2cda98d3957bfd076c7e26b1752d383ea7c3d38018945eadb4b36fb880ccd2f0e5fdf5d0e38ce808aa8e3cf23f
-  data.tar.gz: b9bae0c7b68314c457beeefc7f78d7f97fc6810be4aa94eb826779e9856c62b8ec9f80eb5fae43edb3870256773e2e5a30c3e56e7e29cab981ac0246cd28544a
+  metadata.gz: db77dbe724b48bad8a1439e6296c48f1063cb90b22c9bf22a96f7e351cd5c6cbe186b1abe847983e35f3417bba4f1d4d9ce849f0628e158873a4db46d515b20f
+  data.tar.gz: a9257806e5ad3c1d24b5faf0b0ca030ed7819b2ddd4aa3f8c20f80da103a1f95fb08a0bda9fe714b4cda4da2b678c46ff2ed4a176e730e7627fc4ad2f4e2dc13

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

@@ -40,10 +40,8 @@ module PandaPal
       end
 
       def validate_settings
-        switch_tenant do
-          validate_settings_level(settings || {}, settings_structure).each do |err|
-            errors[:settings] << err
-          end
+        validate_settings_level(settings || {}, settings_structure).each do |err|
+          errors[:settings] << err
         end
       end
 
@@ -76,9 +74,7 @@ module PandaPal
             resolved_module = split_val[0].constantize
             proc_result = resolved_module.send(split_val[1].to_sym, settings, spec, path: path, errors: val_errors)
           elsif spec[:validate].is_a?(Proc)
-            proc_result = instance_eval do
-              spec[:validate].call(settings, spec, path: path, errors: val_errors)
-            end
+            proc_result = instance_exec(settings, spec, path: path, errors: val_errors, &spec[:validate])
           end
           val_errors << proc_result unless val_errors.present? || proc_result == val_errors
           val_errors = val_errors.flatten.uniq.compact.map do |ve|

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

@@ -24,6 +24,14 @@ module PandaPal
           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,
@@ -116,7 +124,7 @@ module PandaPal
 
         return nil unless cron_time.present?
 
-        cron_time = instance_eval(&cron_time) if cron_time.is_a?(Proc)
+        cron_time = instance_exec(&cron_time) if cron_time.is_a?(Proc)
         if !Rufus::Scheduler.parse(cron_time).zone.present? && settings && settings[:timezone]
           cron_time += " #{settings[:timezone]}"
         end
@@ -134,7 +142,7 @@ module PandaPal
 
           Apartment::Tenant.switch(org.name) do
             if worker.is_a?(Proc)
-              org.instance_eval(&worker)
+              org.instance_exec(&worker)
             elsif worker.is_a?(Symbol)
               org.send(worker)
             elsif worker.is_a?(String)

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "4.1.0.beta2"
+  VERSION = "4.1.0.beta3"
 end

data/spec/models/panda_pal/organization/task_scheduling_spec.rb

@@ -101,6 +101,16 @@ module PandaPal
         organization.settings = {}
       end
 
+      it 'passes a valid timezone' do
+        organization.settings[:timezone] = 'America/Denver'
+        expect(organization).to be_valid
+      end
+
+      it 'fails an invalid timezone' do
+        organization.settings[:timezone] = 'Timezone/Blorg'
+        expect(organization).not_to be_valid
+      end
+
       it 'allows [:task_schedules] entry to be missing' do
         expect(organization).to be_valid
       end

data/spec/spec_helper.rb

@@ -44,10 +44,6 @@ RSpec.configure do |config|
       title: 'Test App',
       settings_structure: {}
     }
-
-    allow_any_instance_of(PandaPal::Organization).to receive(:switch_tenant) do |inst, &block|
-      block.call if block.present?
-    end
   end
 
 # The settings below are suggested to provide a good initial experience

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 4.1.0.beta2
+  version: 4.1.0.beta3
 platform: ruby
 authors:
 - Instructure ProServe