canvas_sync 0.18.7 → 0.18.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e4e28a8d15d54b652a8786fa58cecaab948019debb338f87e0e1ccf9fca6b5
-  data.tar.gz: cf4fda0c40456887e0dc3e1e820dd9b4753b37f493a26b879b32367821ef8fa0
+  metadata.gz: 490c7e8d4a1b61e5bd17dd938a0387f68718789bb05ad8c071d1a7dca83374ac
+  data.tar.gz: 06e933489bb8fd39f8af4a2c8498032faf7edf064a1df5cf882659823fa0f597
 SHA512:
-  metadata.gz: 760b72ec220d8b9125ee844e86703f7e83afc11ca3234bcade7f06ed97c3932acd0dd5f123741cd8e04f1116b2656d55c56cdffb4005a1c7b8b3b7beb9205aa0
-  data.tar.gz: fddfc19290404c999faaf8d0629d9feeae42cf6dc52b965eff6e28565f1a62442c10b335400e01ac9f244ace878c146445f3744b954ac622dfb3c7bdf5a2eb4e
+  metadata.gz: 43fb1c9a539c970093c742ef2dd8cb1737a46f3b47ed1958b25fb3e3703ca3195677024d62d438d101ac913a53dbd86291fdaa3bd290c78e0b318064f6c27ddf
+  data.tar.gz: a08e7076c32de83470a32d2238ed0ac77055d3afa65411c0663330803e58b7edf2c9fa6a3b121c2835ec2347a23c40499248d35199c83de3f99347c71d7e77c9

data/lib/canvas_sync/concerns/ability_helper.rb

@@ -43,73 +43,6 @@ module CanvasSync::Concerns
       lti_roles.system_roles.include?("sys_admin")
     end
 
-    # Middle Domain
-
-    def launch_context
-      @launch_context ||= begin
-        if lti_launch_placement == "global_navigation"
-          :global
-        elsif get_lti_cust_param('custom_canvas_course_id').present?
-          ::Course.find_by(canvas_id: get_lti_cust_param('custom_canvas_course_id'))
-        else
-          ::Account.find_by(canvas_id: get_lti_cust_param('custom_canvas_account_id'))
-        end
-      end
-    end
-
-    def launch_account
-      @launch_account ||= launch_context.respond_to?(:account) ? launch_context.account : ::Account.find_by(canvas_id: get_lti_cust_param('custom_canvas_account_id'))
-    end
-
-    # CanvasSync Domain
-
-    def canvas_permissions
-      panda_pal_session[:canvas_permissions] ||= ::Role.role_permissions(canvas_roles)
-    end
-
-    def canvas_roles
-      @canvas_roles ||= Role.for_labels(canvas_role_labels, launch_account)
-    end
-
-    def canvas_root_account_roles
-      role_labels = if "::Admin".safe_constantize && ::Admin < ::ActiveRecord::Base
-        adm_query = ::Admin.where(canvas_account_id: current_organization.canvas_account_id, workflow_state: "active")
-        adm_query.pluck(:role_name)
-      else
-        Rails.cache.fetch([self.class.name, "RootAccountAdminLinks", canvas_user_id], expires_in: 1.hour) do
-          admin_entries = canvas_sync_client.account_admins('self', user_id: [canvas_user_id])
-          admin_entries = admin_entries.select{|ent| ent[:workflow_state] == 'active' }
-          admin_entries.map{|ent| ent[:role] }
-        end
-      end
-      ::Role.for_labels(role_labels, ::Account.find_by(canvas_parent_account_id: nil))
-    end
-
-    def canvas_account_roles
-      canvas_roles.where(base_role_type: 'AccountMembership')
-    end
-
-    def canvas_course_roles
-      canvas_roles.where.not(base_role_type: 'AccountMembership')
-    end
-
-    def canvas_super_user?
-      cache_on_session(:canvas_super_user?) do
-        canvas_site_admin? || canvas_root_account_roles.map(&:label).include?("Account Admin")
-      end
-    end
-
-    def canvas_user_id
-      user&.canvas_id
-    end
-
-    private
-
-    def cache_on_session(key, &blk)
-      panda_pal_session[:ability_cache] ||= {}
-      panda_pal_session[:ability_cache][key] ||= blk.call
-    end
-
     class RoleStore
       ContextTypeURN = 'urn:lti:context-type:ims/lis/'.freeze
 
@@ -181,5 +114,69 @@ module CanvasSync::Concerns
       end
     end
 
+    # Middle Domain
+
+    def launch_context
+      @launch_context ||= begin
+        if lti_launch_placement == "global_navigation"
+          :global
+        elsif get_lti_cust_param('custom_canvas_course_id').present?
+          ::Course.find_by(canvas_id: get_lti_cust_param('custom_canvas_course_id'))
+        else
+          ::Account.find_by(canvas_id: get_lti_cust_param('custom_canvas_account_id'))
+        end
+      end
+    end
+
+    def launch_account
+      @launch_account ||= launch_context.respond_to?(:account) ? launch_context.account : ::Account.find_by(canvas_id: get_lti_cust_param('custom_canvas_account_id'))
+    end
+
+    def cache_on_session(key, &blk)
+      panda_pal_session[:ability_cache] ||= {}
+      panda_pal_session[:ability_cache][key] ||= blk.call
+    end
+
+    # CanvasSync Domain
+
+    def canvas_permissions
+      panda_pal_session[:canvas_permissions] ||= ::Role.role_permissions(canvas_roles)
+    end
+
+    def canvas_roles
+      @canvas_roles ||= Role.for_labels(canvas_role_labels, launch_account)
+    end
+
+    def canvas_root_account_roles
+      role_labels = if "::Admin".safe_constantize && ::Admin < ::ActiveRecord::Base
+        adm_query = ::Admin.where(canvas_account_id: current_organization.canvas_account_id, workflow_state: "active")
+        adm_query.pluck(:role_name)
+      else
+        Rails.cache.fetch([self.class.name, "RootAccountAdminLinks", canvas_user_id], expires_in: 1.hour) do
+          admin_entries = canvas_sync_client.account_admins('self', user_id: [canvas_user_id])
+          admin_entries = admin_entries.select{|ent| ent[:workflow_state] == 'active' }
+          admin_entries.map{|ent| ent[:role] }
+        end
+      end
+      ::Role.for_labels(role_labels, ::Account.find_by(canvas_parent_account_id: nil))
+    end
+
+    def canvas_account_roles
+      canvas_roles.where(base_role_type: 'AccountMembership')
+    end
+
+    def canvas_course_roles
+      canvas_roles.where.not(base_role_type: 'AccountMembership')
+    end
+
+    def canvas_super_user?
+      cache_on_session(:canvas_super_user?) do
+        canvas_site_admin? || canvas_root_account_roles.map(&:label).include?("Account Admin")
+      end
+    end
+
+    def canvas_user_id
+      user&.canvas_id
+    end
   end
 end

data/lib/canvas_sync/concerns/sync_mapping.rb

@@ -2,6 +2,10 @@ module CanvasSync::Concerns
   module SyncMapping
     extend ActiveSupport::Concern
 
+    def self.mapping_for(model, key = nil)
+      model.try(:get_sync_mapping, key) || Mapping.default_mappings[key || Mapping.normalize_model_name(model)]
+    end
+
     class_methods do
       def sync_mapping(key = nil, reset: false, &blk)
         key ||= Mapping.normalize_model_name(self)

data/lib/canvas_sync/engine.rb

@@ -8,10 +8,14 @@ module CanvasSync
     initializer "canvas_sync.safe_yaml_classes" do |app|
       app.config.active_record.yaml_column_permitted_classes ||= []
       app.config.active_record.yaml_column_permitted_classes |= [Symbol, ActiveSupport::HashWithIndifferentAccess]
-      if ActiveRecord::Base.respond_to?(:yaml_column_permitted_classes)
-        ActiveRecord::Base.yaml_column_permitted_classes |= app.config.active_record.yaml_column_permitted_classes
-      elsif
-        ActiveRecord.yaml_column_permitted_classes |= app.config.active_record.yaml_column_permitted_classes
+
+      Rails.application.config.after_initialize do
+        if ActiveRecord::Base.respond_to?(:yaml_column_permitted_classes)
+          ActiveRecord::Base.yaml_column_permitted_classes |= app.config.active_record.yaml_column_permitted_classes
+        end
+        if ActiveRecord.respond_to?(:yaml_column_permitted_classes)
+          ActiveRecord.yaml_column_permitted_classes |= app.config.active_record.yaml_column_permitted_classes
+        end
       end
     rescue
     end
@@ -52,7 +56,6 @@ module CanvasSync
           Bearcat::Client.new(
             prefix: org.canvas_url,
             token: org.canvas_api_token,
-            master_rate_limit: (Rails.env.production? && !!defined?(Redis) && ENV['REDIS_URL'].present?),
           )
         end
       end

data/lib/canvas_sync/job_batches/batch.rb

@@ -45,7 +45,7 @@ module CanvasSync
       redis_attr :created_at
       redis_attr :callback_queue, read_only: false
       redis_attr :callback_params, :json
-      redis_attr :allow_context_changes
+      redis_attr :allow_context_changes, :bool
 
       def context
         return @context if defined?(@context)
@@ -402,20 +402,18 @@ module CanvasSync
 
           if Thread.current[:job_batches_redis]
             yield Thread.current[:job_batches_redis]
-          elsif defined?(::Sidekiq)
-            ::Sidekiq.redis do |r|
+          else
+            ::Bearcat.redis do |r|
               Thread.current[:job_batches_redis] = r
               yield r
             ensure
               Thread.current[:job_batches_redis] = nil
             end
-          else
-            # TODO
           end
         end
 
         def logger
-          defined?(::Sidekiq) ? ::Sidekiq.logger : Rails.logger
+          ::CanvasSync.logger
         end
 
         def push_callbacks(args, queue)

data/lib/canvas_sync/job_batches/jobs/managed_batch_job.rb

@@ -20,7 +20,7 @@ module CanvasSync
           Batch.redis do |r|
             r.multi do |r|
               r.hset("MNGBID-#{man_batch_id}", "root_bid", root_batch.bid)
-              r.hset("MNGBID-#{man_batch_id}", "ordered", ordered)
+              r.hset("MNGBID-#{man_batch_id}", "ordered", ordered ? 1 : 0)
               r.hset("MNGBID-#{man_batch_id}", "concurrency", concurrency)
               r.expire("MNGBID-#{man_batch_id}", Batch::BID_EXPIRE_TTL)
 
@@ -93,6 +93,8 @@ module CanvasSync
           end
         end
 
+        ordered = CanvasSync::MiscHelper.to_boolean(ordered)
+
         next_job_json = Batch.redis do |r|
           if ordered
             r.lpop("MNGBID-#{man_batch_id}-jobs")

data/lib/canvas_sync/job_batches/redis_model.rb

@@ -41,13 +41,13 @@ module CanvasSync
         if @initialized || @existing
           redis do |r|
             r.multi do |r|
-              r.hset(redis_key, attribute, value)
+              r.hset(redis_key, attribute, value.to_s)
               r.expire(redis_key, Batch::BID_EXPIRE_TTL)
             end
           end
         else
           @pending_attrs ||= {}
-          @pending_attrs[attribute] = value
+          @pending_attrs[attribute] = value.to_s
         end
       end
 

data/lib/canvas_sync/jobs/sync_provisioning_report_job.rb

@@ -18,7 +18,7 @@ module CanvasSync
 
         # Make sure the report also checks last_activity_at when checking updated_at
         if options[:models].include?("enrollments")
-          if (%w[last_activity_at total_activity_time] & Enrollment.get_sync_mapping[:columns].keys).present? && merged_params.dig(:parameters, :include_last_activity) == nil
+          if (%w[last_activity_at total_activity_time] & CanvasSync::Concerns::SyncMapping.mapping_for(Enrollment)[:columns].keys).present? && merged_params.dig(:parameters, :include_last_activity) == nil
             merged_params[:parameters][:include_last_activity] = true
           end
         end

data/lib/canvas_sync/processors/report_processor.rb

@@ -9,7 +9,7 @@ module CanvasSync
       end
 
       def mapping_for(model, key = nil)
-        model.try(:get_sync_mapping, key) || mapping[key || CanvasSync::Concerns::SyncMapping::Mapping.normalize_model_name(model)]
+        CanvasSync::Concerns::SyncMapping.mapping_for(model, key)
       end
 
       def do_bulk_import(report_file_path, model, options: {}, mapping_key: nil, &blk)

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.18.7".freeze
+  VERSION = "0.18.9".freeze
 end

data/lib/canvas_sync.rb

@@ -324,6 +324,13 @@ module CanvasSync
       raise "Invalid live event(s) specified: #{invalid.join(', ')}. Only #{SUPPORTED_LIVE_EVENTS.join(', ')} are supported."
     end
 
+    def logger
+      return @logger if defined? @logger
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::DEBUG
+      @logger
+    end
+
     def redis(*args, &blk)
       JobBatches::Batch.redis(*args, &blk)
     end

data/spec/canvas_sync/processors/provisioning_report_processor_spec.rb

@@ -15,11 +15,13 @@ RSpec.describe CanvasSync::Processors::ProvisioningReportProcessor do
         self.use_transactional_tests = false
         ActiveRecord::Migration.add_column :users, :sis_id, :string
         User.reset_column_information
+        User.instance_variable_set(:@schema_columns_hash, nil)
       end
 
       after do
         ActiveRecord::Migration.remove_column :users, :sis_id
         User.reset_column_information
+        User.instance_variable_set(:@schema_columns_hash, nil)
         self.use_transactional_tests = true
       end