lms-api 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5efdbf1795911d69e5efb110e65f23fdc4f580f
-  data.tar.gz: 1c2198e6e1d0a15427683cfcec58791ac85e1d43
+  metadata.gz: 4537b1779fc89ca3db4a4e29367b58643ff0a8da
+  data.tar.gz: ac3abcb34b218882b427add8e15fc25ee821e404
 SHA512:
-  metadata.gz: '0469a565d2d449198a711b46c5e0883aa0d8128d20c09a033b96f3fc7fdd66d3a6a35b6ff5929a58ae81d332730c5d744760ebdbaad147d6a4aab98bfc51b894'
-  data.tar.gz: 89fb4f0ba9b0097326bae45ab8d9ba92edf87ddbcf35659a24f0e0cc195539d318d46e32346679ea8266762f7534e2471a845abfda9a0e84e88c1915c87c24a3
+  metadata.gz: 1ae7e8f29bf07b6055926fec2d61eafcb3e6a42e474e876c58b98167336ce0f1ee42bfe0a9b30bbefad8c3c1c1a160f99592ce3d55c91ee92561c3fe4bab21c4
+  data.tar.gz: 742ff6135ad77aeb2dcc391ee095bbbffa23afdf80ffec8d79fe09b966b781725810fdb78ebc8b7f910af8fc0350dd62658bbb1286ad44bf4813f02f15b7f824

data/lib/canvas_api/builder.rb

@@ -28,6 +28,10 @@ module CanvasApi
       rb_forward_declarations = []
 
       nicknames = []
+
+      # Elixir has a default action that raises
+      lms_urls_ex << CanvasApi::Render.new("./templates/ex_default_action.erb", nil, nil, nil, nil, nil, nil, nil).render
+
       directory["apis"].each do |api|
         puts "Generating #{api['description']}"
         resource = HTTParty.get("#{endpoint}#{api['path']}")
@@ -48,6 +52,7 @@ module CanvasApi
             lms_urls_rb << CanvasApi::Render.new("./templates/rb_url.erb", api, resource, resource_api, operation, parameters, nil, nil).render
             lms_urls_js << CanvasApi::Render.new("./templates/js_url.erb", api, resource, resource_api, operation, parameters, nil, nil).render
             lms_urls_ex << CanvasApi::Render.new("./templates/ex_url.erb", api, resource, resource_api, operation, parameters, nil, nil).render
+            lms_urls_ex << CanvasApi::Render.new("./templates/ex_action.erb", api, resource, resource_api, operation, parameters, nil, nil).render
 
             if parameters.detect{ |param| param["name"] == "course_id" && param["paramType"] == "path" }
               course_ids_required_rb << CanvasApi::Render.new("./templates/course_id_required.erb", api, resource, resource_api, operation, parameters, nil, nil).render
@@ -94,7 +99,10 @@ module CanvasApi
 
       CanvasApi::Render.new("./templates/rb_urls.erb", nil, nil, nil, nil, nil, lms_urls_rb, nil).save("#{project_root}/lib/lms/canvas_urls.rb")
       CanvasApi::Render.new("./templates/js_urls.erb", nil, nil, nil, nil, nil, lms_urls_js, nil).save("#{server_app_path}/lib/canvas/urls.js")
-      CanvasApi::Render.new("./templates/ex_urls.erb", nil, nil, nil, nil, nil, lms_urls_ex, nil).save("#{elixir_app_path}/lib/canvas/actions.ex")
+
+      # The elixir urls are sorted, to prevent linter errors
+      CanvasApi::Render.new("./templates/ex_urls.erb", nil, nil, nil, nil, nil, lms_urls_ex.sort, nil).save("#{elixir_app_path}/lib/canvas/actions.ex")
+
       CanvasApi::Render.new("./templates/course_ids_required.erb", nil, nil, nil, nil, nil, course_ids_required_rb, nil).save("#{project_root}/lib/lms/course_ids_required.rb")
 
       # GraphQL Javascript - still not complete

data/lib/canvas_api/templates/ex_action.erb

@@ -0,0 +1 @@
+def <%=@nickname.downcase%>, do: "<%=@nickname.upcase%>"

data/lib/canvas_api/templates/ex_default_action.erb

@@ -0,0 +1 @@
+def action(type), do: raise InvalidCanvasActionException, message: "Invalid Canvas API Action: #{type}}"

data/lib/canvas_api/templates/ex_urls.erb

@@ -1,4 +1,3 @@
 defmodule Canvas.Actions do
   <%=@content.join("\n  ")%>
-  def action(type), do: raise InvalidCanvasActionException, message: "Invalid Canvas API Action: #{type}}"
 end

data/lib/lms/canvas.rb

@@ -176,7 +176,11 @@ module LMS
       url = full_url("login/oauth2/token", false)
       result = HTTParty.post(url, headers: headers, body: payload)
       code = result.response.code.to_i
-      unless [200, 201].include?(code)
+      if code >= 500
+        raise LMS::Canvas::RefreshToken500Exception.new(api_error(result), code, result, @authentication)
+      end
+
+      if code > 201
         raise LMS::Canvas::RefreshTokenFailedException.new(api_error(result), code, result, @authentication)
       end
       result["access_token"]
@@ -402,6 +406,9 @@ module LMS
     class RefreshTokenFailedException < TokenException
     end
 
+    class RefreshToken500Exception < RefreshTokenFailedException
+    end
+
     class InvalidRefreshOptionsException < CanvasException
     end
 

data/lib/lms/canvas_urls.rb

@@ -178,6 +178,7 @@ module LMS
     "GET_CURRENT_SETTINGS_FOR_ACCOUNT_OR_COURSE_ACCOUNTS" => { uri: ->(account_id:) { "accounts/#{account_id}/csp_settings" }, method: "GET", parameters: [{"paramType"=>"path", "name"=>"account_id", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false}] },
     "ENABLE_DISABLE_OR_CLEAR_EXPLICIT_CSP_SETTING_COURSES" => { uri: ->(course_id:) { "courses/#{course_id}/csp_settings" }, method: "PUT", parameters: [{"paramType"=>"path", "name"=>"course_id", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false}, {"paramType"=>"form", "name"=>"status", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false, "enum"=>["enabled", "disabled", "inherited"]}] },
     "ENABLE_DISABLE_OR_CLEAR_EXPLICIT_CSP_SETTING_ACCOUNTS" => { uri: ->(account_id:) { "accounts/#{account_id}/csp_settings" }, method: "PUT", parameters: [{"paramType"=>"path", "name"=>"account_id", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false}, {"paramType"=>"form", "name"=>"status", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false, "enum"=>["enabled", "disabled", "inherited"]}] },
+    "LOCK_OR_UNLOCK_CURRENT_CSP_SETTINGS_FOR_SUB_ACCOUNTS_AND_COURSES" => { uri: ->(account_id:) { "accounts/#{account_id}/csp_settings/lock" }, method: "PUT", parameters: [{"paramType"=>"path", "name"=>"account_id", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false}, {"paramType"=>"form", "name"=>"settings_locked", "type"=>"boolean", "format"=>nil, "required"=>true, "deprecated"=>false}] },
     "ADD_DOMAIN_TO_ACCOUNT_WHITELIST" => { uri: ->(account_id:) { "accounts/#{account_id}/csp_settings/domains" }, method: "POST", parameters: [{"paramType"=>"path", "name"=>"account_id", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false}, {"paramType"=>"form", "name"=>"domain", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false}] },
     "ADD_MULTIPLE_DOMAINS_TO_ACCOUNT_WHITELIST" => { uri: ->(account_id:) { "accounts/#{account_id}/csp_settings/domains/batch_create" }, method: "POST", parameters: [{"paramType"=>"path", "name"=>"account_id", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false}, {"paramType"=>"form", "name"=>"domains", "type"=>"Array", "format"=>nil, "required"=>true, "deprecated"=>false}] },
     "REMOVE_DOMAIN_FROM_ACCOUNT_WHITELIST" => { uri: ->(account_id:) { "accounts/#{account_id}/csp_settings/domains" }, method: "DELETE", parameters: [{"paramType"=>"path", "name"=>"account_id", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false}, {"paramType"=>"query", "name"=>"domain", "type"=>"string", "format"=>nil, "required"=>true, "deprecated"=>false}] },

data/lib/lms/version.rb

@@ -1,3 +1,3 @@
 module LMS
-  VERSION = "1.12.0".freeze
+  VERSION = "1.12.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lms-api
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Atomic Jolt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -118,6 +118,8 @@ files:
 - lib/canvas_api/templates/constants.erb
 - lib/canvas_api/templates/course_id_required.erb
 - lib/canvas_api/templates/course_ids_required.erb
+- lib/canvas_api/templates/ex_action.erb
+- lib/canvas_api/templates/ex_default_action.erb
 - lib/canvas_api/templates/ex_url.erb
 - lib/canvas_api/templates/ex_urls.erb
 - lib/canvas_api/templates/js_graphql_model.erb
@@ -167,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Wrapper for the Instructure Canvas API