canvas_oauth_engine 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b10222793a636d66701b987776c13f86d568ff7db074c3444f5cb9d1b01cd180
-  data.tar.gz: 1349d736705163172c3e2fd860530bb3f2ab22cee75ae257ef0e163db2cfbf66
+  metadata.gz: b2a88f4ee3820d12421b7cc83434d3fc908744397716172d224e21af37470fd2
+  data.tar.gz: 6a42eef65c2013ef374c66e698b552dfc1cacb57493804c7cadf11ab8f879705
 SHA512:
-  metadata.gz: 3e40c881d9e0872d0e97b3eb6d73b0ed2336ed78427d276fd377e3043fdd57d8d65f8876fc70c806313390b9892db66c4b0a3a343ce73739b1a895134eac1cc5
-  data.tar.gz: 4fdeb5ec04e2149c839c6234b2f6244e33a45aa11122e8eaa4e00714ecb73cbe2e25c284f704402e7b134b53fbd1546d321404625e7bfa9416e928712ada0e85
+  metadata.gz: 12b6b3965bc0bde82bce922c0faebab6bbaff31b71314db70d58f246687cdbd284934f081e938ac47585f2aacc386e7749d8d6d9f05c3ad7b82353cd1012f54b
+  data.tar.gz: b232dd7bb61ed83ea6d30dac284b8fd05114823dfb735174db06d27cded7fe565a96a0b3bfa417485b4e41f99e368c9c68a7401b976e340fcda2c054f1fc943b

data/lib/canvas_oauth/canvas_api.rb

@@ -74,7 +74,7 @@ module CanvasOauth
       if report['status'] == 'complete'
         file_id = report['file_url'].match(/files\/([0-9]+)\/download/)[1]
         file = get_file(file_id)
-        return hash_csv(self.class.get(file['url'], limit: 15).parsed_response)
+        return hash_csv(self.class.get(file['url'], limit: 15, parser: DefaultUTF8Parser).parsed_response)
       else
         return report
       end
@@ -195,6 +195,10 @@ module CanvasOauth
       authenticated_post "/api/v1/courses/#{course_id}/assignments", { body: { assignment: params } }
     end
 
+    def update_assignment(course_id, assignment_id, params)
+      authenticated_put "/api/v1/courses/#{course_id}/assignments/#{assignment_id}", { body: { assignment: params } }
+    end
+
     def grade_assignment(course_id, assignment_id, user_id, params)
       authenticated_put "/api/v1/courses/#{course_id}/assignments/#{assignment_id}/submissions/#{user_id}", { body: params }
     end

data/lib/canvas_oauth/default_utf8_parser.rb

@@ -0,0 +1,13 @@
+module CanvasOauth
+  # We get into a weird case with the CDN with canvas where the Content-Type for a CSV comes back as text/csv, but there
+  # is no associated charset with it. HTTParty will default to treating it as binary (aka ASCII-8BIT) data which causes
+  # issues downstream when the data gets combined with local application data. In cases where we can reasonably know
+  # it'll be a UTF-8 compatible file (i.e any csv file from canvas) we'll force an encoding of UTF-8 if ruby thinks its
+  # ASCII-8BIT
+  class DefaultUTF8Parser < HTTParty::Parser
+    def parse
+      body.force_encoding("UTF-8") if body&.encoding == Encoding::ASCII_8BIT
+      super
+    end
+  end
+end

data/lib/canvas_oauth/version.rb

@@ -1,3 +1,3 @@
 module CanvasOauth
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

data/lib/canvas_oauth.rb

@@ -8,6 +8,7 @@ require "canvas_oauth/canvas_application"
 require 'canvas_oauth/canvas_api'
 require 'canvas_oauth/canvas_api_extensions'
 require 'canvas_oauth/canvas_config'
+require 'canvas_oauth/default_utf8_parser'
 
 module CanvasOauth
   mattr_accessor :app_root

data/spec/dummy/config/application.rb

@@ -43,8 +43,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    config.active_record.sqlite3.represent_boolean_as_integer = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 

data/spec/dummy/log/development.log

@@ -0,0 +1,49 @@
+Initializing Canvas using configuration in /Users/murilo.paiva/Desktop/www/Instructure/canvas_oauth_engine/spec/dummy/config/canvas.yml
+   (3.7ms)  SELECT sqlite_version(*)
+Initializing Canvas using configuration in /Users/murilo.paiva/Desktop/www/Instructure/canvas_oauth_engine/spec/dummy/config/canvas.yml
+   (1.2ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT sqlite_version(*)
+Initializing Canvas using configuration in /Users/murilo.paiva/Desktop/www/Instructure/canvas_oauth_engine/spec/dummy/config/canvas.yml
+   (1.6ms)  SELECT sqlite_version(*)
+Initializing Canvas using configuration in /Users/murilo.paiva/Desktop/www/Instructure/canvas_oauth_engine/spec/dummy/config/canvas.yml
+   (1.3ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT sqlite_version(*)
+   (0.0ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT sqlite_version(*)
+   (0.1ms)  DROP TABLE IF EXISTS "canvas_oauth_authorizations"
+   (1.3ms)  CREATE TABLE "canvas_oauth_authorizations" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "canvas_user_id" integer(8), "tool_consumer_instance_guid" varchar NOT NULL, "token" varchar, "last_used_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+   (1.0ms)  CREATE INDEX "index_canvas_oauth_auths_on_user_id_and_tciguid" ON "canvas_oauth_authorizations" ("canvas_user_id", "tool_consumer_instance_guid")
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES (20121121005358)
+   (1.1ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL)
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Create (0.4ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "development"], ["created_at", "2022-03-21 15:32:41.317911"], ["updated_at", "2022-03-21 15:32:41.317911"]]
+  TRANSACTION (0.7ms)  commit transaction
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "schema_sha1"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Create (0.4ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "schema_sha1"], ["value", "fc30e804ce934e09ede366066915736ad77cf98d"], ["created_at", "2022-03-21 15:32:41.321862"], ["updated_at", "2022-03-21 15:32:41.321862"]]
+  TRANSACTION (0.8ms)  commit transaction
+   (0.0ms)  SELECT sqlite_version(*)
+   (0.1ms)  DROP TABLE IF EXISTS "canvas_oauth_authorizations"
+   (1.1ms)  CREATE TABLE "canvas_oauth_authorizations" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "canvas_user_id" integer(8), "tool_consumer_instance_guid" varchar NOT NULL, "token" varchar, "last_used_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+   (1.0ms)  CREATE INDEX "index_canvas_oauth_auths_on_user_id_and_tciguid" ON "canvas_oauth_authorizations" ("canvas_user_id", "tool_consumer_instance_guid")
+   (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES (20121121005358)
+   (1.1ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL)
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Create (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "development"], ["created_at", "2022-03-21 15:32:41.332974"], ["updated_at", "2022-03-21 15:32:41.332974"]]
+  TRANSACTION (0.7ms)  commit transaction
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Update (0.4ms)  UPDATE "ar_internal_metadata" SET "value" = ?, "updated_at" = ? WHERE "ar_internal_metadata"."key" = ?  [["value", "test"], ["updated_at", "2022-03-21 15:32:41.335498"], ["key", "environment"]]
+  TRANSACTION (0.8ms)  commit transaction
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "schema_sha1"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Create (0.4ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "schema_sha1"], ["value", "fc30e804ce934e09ede366066915736ad77cf98d"], ["created_at", "2022-03-21 15:32:41.338507"], ["updated_at", "2022-03-21 15:32:41.338507"]]
+  TRANSACTION (0.6ms)  commit transaction
+   (0.1ms)  SELECT sqlite_version(*)

data/spec/dummy/log/test.log

@@ -0,0 +1,382 @@
+Initializing Canvas using configuration in /Users/murilo.paiva/Desktop/www/Instructure/canvas_oauth_engine/spec/dummy/config/canvas.yml
+   (1.6ms)  SELECT sqlite_version(*)
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid", "state"=>"zzyyxx"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 3)
+Completed 200 OK in 10ms (Views: 3.6ms | ActiveRecord: 0.0ms | Allocations: 2549)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 153)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid"}
+Completed 500 Internal Server Error in 1ms (ActiveRecord: 0.1ms | Allocations: 400)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 315)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"invalid"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 246)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid", "state"=>"mismatch"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 153)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid", "state"=>"zzyyxx"}
+Completed 500 Internal Server Error in 1ms (ActiveRecord: 0.1ms | Allocations: 282)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 185)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+API call (0.06ms): get ["/api/v1/courses/123/assignments", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.04ms): get ["/api/v1/courses/123", {:headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.04ms): get ["/api/v1/accounts/1/courses", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+API call (0.06ms): get ["/api/v1/accounts/1/users", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): get ["/api/v1/courses/123/students", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.04ms): get ["/api/v1/courses", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): get ["/api/v1/courses/123/sections", {:query=>{:include=>["students", "avatar_url", "enrollments"], :per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): put ["/api/v1/courses/123/assignments/345", {:body=>{:assignment=>{:omit_from_final_grade=>true}}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): post ["/api/v1/courses/123/assignments", {:body=>{:assignment=>{:name=>"Assignment"}}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): get ["/api/v1/users/123/profile", {:headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): put ["/api/v1/courses/1/assignments/2/submissions/3", {:body=>{}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.04ms): get ["/path", {:headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): get ["/path", {:headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): get ["/path", {:query=>"stuff", :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+Initializing Canvas using configuration in /Users/murilo.paiva/Desktop/www/Instructure/canvas_oauth_engine/spec/dummy/config/canvas.yml
+   (1.7ms)  SELECT sqlite_version(*)
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): get ["/api/v1/courses/123/assignments", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.02ms): get ["/api/v1/courses", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.02ms): get ["/api/v1/courses/123/students", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.02ms): get ["/api/v1/users/123/profile", {:headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.02ms): put ["/api/v1/courses/1/assignments/2/submissions/3", {:body=>{}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.02ms): post ["/api/v1/courses/123/assignments", {:body=>{:assignment=>{:name=>"Assignment"}}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.02ms): put ["/api/v1/courses/123/assignments/345", {:body=>{:assignment=>{:omit_from_final_grade=>true}}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.02ms): get ["/api/v1/accounts/1/courses", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.02ms): get ["/api/v1/courses/123", {:headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.03ms): get ["/api/v1/accounts/1/users", {:query=>{:per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.07ms): get ["/api/v1/courses/123/sections", {:query=>{:include=>["students", "avatar_url", "enrollments"], :per_page=>50}, :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.05ms): get ["/path", {:query=>"stuff", :headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.06ms): get ["/path", {:headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+API call (0.06ms): get ["/path", {:headers=>{}}]
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"invalid"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 3)
+Completed 200 OK in 12ms (Views: 4.5ms | ActiveRecord: 0.0ms | Allocations: 2642)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid"}
+Completed 500 Internal Server Error in 1ms (ActiveRecord: 0.1ms | Allocations: 399)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 1ms (Views: 0.3ms | ActiveRecord: 0.0ms | Allocations: 312)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 185)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid", "state"=>"mismatch"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 153)
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid", "state"=>"zzyyxx"}
+Completed 500 Internal Server Error in 1ms (ActiveRecord: 0.1ms | Allocations: 282)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid", "state"=>"zzyyxx"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 153)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+Processing by CanvasOauth::CanvasController#oauth as HTML
+  Parameters: {"code"=>"valid"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 153)
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+  TRANSACTION (0.0ms)  rollback transaction

data/spec/lib/canvas_oauth/canvas_api_spec.rb

@@ -174,6 +174,20 @@ describe CanvasOauth::CanvasApi do
       end
     end
 
+    describe "update_assignment" do
+      it "puts to /api/v1/courses/:course_id/assignments/:id" do
+        expect(CanvasOauth::CanvasApi).to receive(:put).with('/api/v1/courses/123/assignments/345', anything())
+        canvas.update_assignment('123', '345', omit_from_final_grade: true)
+      end
+
+      it "sets the body of the request to the assignment params" do
+        expect(canvas).to receive(:authenticated_put).
+          with(anything(), { body: { assignment: { omit_from_final_grade: true }}})
+
+        canvas.update_assignment('123', '345', omit_from_final_grade: true)
+      end
+    end
+
     describe "grade_assignment" do
       it "puts to /api/v1/courses/:course_id/assignments/:assignment_id/submissions/:id" do
         expect(CanvasOauth::CanvasApi).to receive(:put).with('/api/v1/courses/1/assignments/2/submissions/3', anything())
@@ -257,6 +271,13 @@ describe CanvasOauth::CanvasApi do
           expect(canvas).to receive(:authenticated_get).exactly(3).times.and_return(created, running, aborted)
           canvas.get_report(1, :provisioning_csv, params)
         end
+
+        it "uses the default UTF 8 parser it its get call" do
+          allow(canvas).to receive(:authenticated_get).and_return(complete)
+          expect(canvas).to receive(:authenticated_post).with("/api/v1/accounts/1/reports/provisioning_csv", { body: params })
+          expect(CanvasOauth::CanvasApi).to receive(:get).with(file['url'], hash_including(parser: CanvasOauth::DefaultUTF8Parser)).and_return(response)
+          canvas.get_report(1, :provisioning_csv, params)
+        end
       end
     end
   end

data/spec/lib/canvas_oauth/default_utf8_parser_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe CanvasOauth::DefaultUTF8Parser do
+  describe "#parse" do
+    it "forces the body passed in to UTF-8 if it is ASCII_8BIT" do
+      body = String.new("I am some text", encoding: Encoding::ASCII_8BIT)
+
+      parser = CanvasOauth::DefaultUTF8Parser.new(body, "text/plain")
+      expect(body).to receive(:force_encoding).with("UTF-8")
+      parser.parse
+    end
+
+    it "does not force the body passed in to UTF-8 if not ASCII_8BIT" do
+      body = String.new("I am some text", encoding: Encoding::US_ASCII)
+
+      parser = CanvasOauth::DefaultUTF8Parser.new(body, "text/plain")
+      expect(body).not_to receive(:force_encoding)
+      parser.parse
+    end
+  end
+end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: canvas_oauth_engine
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Dave Donahue
 - Adam Anderson
 - Simon Williams
-autorequire: 
+- Keith Garner
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,9 +20,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 6.1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,23 +30,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 6.1.4.2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: link_header
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +61,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.8
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +201,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -214,10 +243,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
-- adam.anderson@12spokes.com
 - simon@instructure.com
+- kgarner@instructure.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -237,6 +266,7 @@ files:
 - lib/canvas_oauth/canvas_application.rb
 - lib/canvas_oauth/canvas_config.rb
 - lib/canvas_oauth/config.rb
+- lib/canvas_oauth/default_utf8_parser.rb
 - lib/canvas_oauth/engine.rb
 - lib/canvas_oauth/version.rb
 - lib/tasks/canvas_oauth_tasks.rake
@@ -262,8 +292,12 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20160711200737_create_canvas_oauth_authorizations.canvas_oauth.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -272,12 +306,13 @@ files:
 - spec/dummy/script/rails
 - spec/lib/canvas_oauth/canvas_api_extensions_spec.rb
 - spec/lib/canvas_oauth/canvas_api_spec.rb
+- spec/lib/canvas_oauth/default_utf8_parser_spec.rb
 - spec/models/canvas_oauth/authorization_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -292,9 +327,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: CanvasOauth is a mountable engine for handling the oauth workflow with canvas
   and making api calls from your rails app.
@@ -327,9 +361,14 @@ test_files:
 - spec/dummy/public/404.html
 - spec/dummy/public/robots.txt
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
 - spec/dummy/db/migrate/20160711200737_create_canvas_oauth_authorizations.canvas_oauth.rb
+- spec/dummy/db/development.sqlite3
+- spec/dummy/log/test.log
+- spec/dummy/log/development.log
 - spec/dummy/README.rdoc
 - spec/models/canvas_oauth/authorization_spec.rb
 - spec/lib/canvas_oauth/canvas_api_extensions_spec.rb
+- spec/lib/canvas_oauth/default_utf8_parser_spec.rb
 - spec/lib/canvas_oauth/canvas_api_spec.rb
 - spec/controllers/canvas_oauth/canvas_controller_spec.rb