canvas_sync 0.27.5 → 0.27.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f24c18ebf86f750d70099ea3e005f7036a757b37585c6b90e8cb8118320a6d
-  data.tar.gz: 1228fee5adaec59e4fbd29b464950d2a1a60e0f4d3d0fd2dfacdacb36ae800e8
+  metadata.gz: 989d9d326afba19afe5cb13a4388c8172b8e604a0ef4f6dbfc2ea8e98ee67b49
+  data.tar.gz: b110083dd70fb5d125b0935d44aa2321d5b5c5e1e2efa120d1d0c1ecba75ecae
 SHA512:
-  metadata.gz: dad20a38ebc24dfb459f6993ad9a24e02a40f5a6c68c4403df3bb90500b0676857e07fb93a582fcd5b28c0a78501d823143c3364e93fbb9a3d9f40134a9af2da
-  data.tar.gz: fefc18626e5222c0402a399ca8caf3c131e9cebe0ce16df6233ce3cba9904839f0ffc7ccebe3deee2cd7695c2db33735957662935340695a63592385449a91ca
+  metadata.gz: 6bb121b90fd24127e96fc76422a954839c88315a9cb7a33a8415c21b1d508a9a1691b2e31f6e5209e3a1146beb5a02113b434bda1c99ccab0e53b4c85eae0a1a
+  data.tar.gz: 1751fe22d8d16a80bd2c6e73ebe52ce9838494d56748cdc1142de01afa044071a46aaeab44b6c859326468e9e13777390d9b34c517be1954c16d63744a487de4

data/lib/canvas_sync/concerns/ability_helper.rb

@@ -77,7 +77,7 @@ module CanvasSync::Concerns
     end
 
     def canvas_roles
-      @canvas_roles ||= Role.for_labels(panda_pal_session.canvas_role_labels, launch_account)
+      @canvas_roles ||= ::Role.for_labels(panda_pal_session.canvas_role_labels, launch_account)
     end
 
     def canvas_root_account_roles

data/lib/canvas_sync/concerns/user_via_pseudonym.rb

@@ -6,7 +6,11 @@ module CanvasSync::Concerns
       extend ActiveSupport::Concern
 
       def where!(*args)
-        return super unless self.respond_to?(:users_via_pseudonym)
+        # Check the model class rather than the relation. ActiveRecord::Relation#respond_to?
+        # builds the relation's arel as a side effect (via respond_to_missing?), which marks
+        # the relation immutable and makes the super call below raise ImmutableRelation on
+        # Rails < 6 (e.g. during schema load).
+        return super unless klass.respond_to?(:users_via_pseudonym)
 
         super.tap do |q|
           args.select { |a| a.is_a?(Hash) }.each do |hash|

data/lib/canvas_sync/jobs/report_sync_task.rb

@@ -216,7 +216,7 @@ module CanvasSync
 
           case report_status["status"].downcase
           when "complete"
-            report_task.class::ProcessJob.perform_later(report_status["attachment"]["url"])
+            ProcessJob.perform_later(report_status["attachment"]["url"])
           when "error", "deleted"
             max_tries = options[:report_max_tries] || batch_context[:report_max_tries] || report_task.max_tries || MAX_TRIES
             report_attempt = batch_context[:report_attempt]

data/lib/canvas_sync/reports_map.rb

@@ -95,8 +95,17 @@ module CanvasSync
       req
     end
 
+    ANSI_CODES = { red: 31, green: 32, cyan: 36, italic: 3 }.freeze
+    private_constant :ANSI_CODES
+
+    def self.ansi(text, style)
+      return text unless $stdout.tty?
+
+      "\e[#{ANSI_CODES.fetch(style)}m#{text}\e[0m"
+    end
+    private_class_method :ansi
+
     def self.pretty_print_required_reports(client = nil)
-      require 'colorized_string'
       client ||= canvas_sync_client rescue nil
 
       req_reports = required_reports
@@ -107,13 +116,13 @@ module CanvasSync
       puts "[CanvasSync] Required Custom Reports:"
       req_reports.each do |report|
         color = enabled_reports.nil? ? :cyan : (enabled_reports.include?(report) ? :green : :red)
-        puts "- #{ColorizedString[report].colorize(color)}"
+        puts "- #{ansi(report, color)}"
         if (meta = REPORTS[report]) && (meta[:human_name] || meta[:module_name])
           puts "    #{meta[:human_name]} (#{meta[:module_name]})"
         end
       end
-      puts "- #{ColorizedString["NB: Double check if you know this app requires non-CanvasSync provided models."].italic}"
-      puts "    #{ColorizedString["Non-standard reports must be registered with `CanvasSync.require_report!` from an initializer to be included in this list."].italic}"
+      puts "- #{ansi("NB: Double check if you know this app requires non-CanvasSync provided models.", :italic)}"
+      puts "    #{ansi("Non-standard reports must be registered with `CanvasSync.require_report!` from an initializer to be included in this list.", :italic)}"
 
       puts ""
 
@@ -124,7 +133,7 @@ module CanvasSync
       base_url = client.config[:prefix] rescue "<CANVAS URL>/"
       plugins_url = "#{base_url}/plugins/account_reports".gsub(/\/+/, "/")
       plugins_url += "?#{bits.join("&")}" if bits.any?
-      puts "Pre-filled link: " + ColorizedString[plugins_url].cyan
+      puts "Pre-filled link: " + ansi(plugins_url, :cyan)
     end
   end
 end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.27.5".freeze
+  VERSION = "0.27.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.6
 platform: ruby
 authors:
 - Instructure CustomDev
@@ -421,26 +421,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 email:
 - pseng@instructure.com
 executables: []