qalam_oauth_engine 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce5f3ea19a895f5964a450249d587a9a9e847064071bb260f42f078d3a5ed58
-  data.tar.gz: d2621e2449cb88ec7dfcaea89219c4e825a981e4ed82eaaf2dd9af40beb554a2
+  metadata.gz: a94aa9f960fad372ccd1ce843c502f7f1f8011f010e29dd095224a0d9a5c701f
+  data.tar.gz: a1f11ff92ae13c52c42271180623616cbf47cd42780e34e3f029a30c6143fe44
 SHA512:
-  metadata.gz: 68a55695a6a6b196a6cb7cc3402d314b987473ed58a1b78dd538b35f80903b0035beff1dd00acb714c1a2f521348f9baf978f941584098c742e182f2be003a0b
-  data.tar.gz: df1b190fb6e62609f9867ca96c6365786137681c2c5bc3f0b14fef895308912fce6d1956d40385e1a06d233c7e2437fd0bf5ebf3f2c98372d2ec0ea9cc62743c
+  metadata.gz: 8540835b1a123aae6f271195d80443a7627649dc2156c1ec2a6f0e6be6295d99f0669815b5e11250b7b0c7f70c7811d901158107ed1e2424934a0de3ba2c3d7b
+  data.tar.gz: f01b816cc088416ffa80ddfd5908ae40bded8ac8e11f8c784ead5317fd82a3d4039b424aa29cfff82aad4756c5776bbcdc291ec8116ebec48776dd2cb0a3b5a1

data/lib/canvas_oauth/canvas_api.rb

@@ -4,7 +4,7 @@ module CanvasOauth
     PER_PAGE = 50
 
     attr_accessor :token, :refresh_token, :key, :secret
-    attr_reader :canvas_url, :canvas_user_id
+    attr_reader :canvas_url, :canvas_user_id, :canvas_root_account_id
 
     def initialize(canvas_url, canvas_user_id, canvas_root_account_id, token, refresh_token, key, secret)
       unless [key, secret].all?(&:present?)
@@ -110,7 +110,10 @@ module CanvasOauth
       params[:query][:page] ||= 1
       all_pages = []
 
-      if params[:all_pages]
+      if params[:current_page]
+        current_page = authenticated_get(url, params)
+        all_pages.concat(current_page) if valid_page?(current_page)
+      else
         while url && current_page = authenticated_get(url, params) do
           all_pages.concat(current_page) if valid_page?(current_page)
 
@@ -118,9 +121,6 @@ module CanvasOauth
           url = links.find_link(["rel", "next"]).try(:href)
           params[:query] = nil if params[:query]
         end
-      else
-        current_page = authenticated_get(url, params)
-        all_pages.concat(current_page) if valid_page?(current_page)
       end
 
       all_pages
@@ -337,8 +337,11 @@ module CanvasOauth
       # update_external_tool_nav
       # get_school_details
       # get_school_grades
+      # get_school_grade
       # get_school_class_rooms
+      # get_school_class_room
       # get_school_subjects
+      # get_school_subject
       # get_students_by_grade
       # get_students_by_class_room
 
@@ -376,16 +379,31 @@ module CanvasOauth
       paginated_get "/api/v1/accounts/#{account_id}/school_grades", params
     end
 
+    def get_school_grade(grade_id, account_id=@canvas_root_account_id, params={})
+      account_id ||= @canvas_root_account_id
+      authenticated_get "/api/v1/accounts/#{account_id}/school_grades/#{grade_id}", params
+    end
+
     def get_school_subjects(account_id=@canvas_root_account_id, params={})
       account_id ||= @canvas_root_account_id
       paginated_get "/api/v1/accounts/#{account_id}/school_subjects", params
     end
 
+    def get_school_subject(subject_id, account_id=@canvas_root_account_id, params={})
+      account_id ||= @canvas_root_account_id
+      authenticated_get "/api/v1/accounts/#{account_id}/school_subjects/#{subject_id}", params
+    end
+
     def get_school_class_rooms(account_id=@canvas_root_account_id, params={})
       account_id ||= @canvas_root_account_id
       paginated_get "/api/v1/accounts/#{account_id}/school_class_rooms", params
     end
 
+    def get_school_class_room(class_room_id, account_id=@canvas_root_account_id, params={})
+      account_id ||= @canvas_root_account_id
+      authenticated_get "/api/v1/accounts/#{account_id}/school_class_rooms/#{class_room_id}", params
+    end
+
     def get_students_by_grade(grade_id, account_id=@canvas_root_account_id, params={})
       account_id ||= @canvas_root_account_id
       paginated_get "/api/v1/accounts/#{account_id}/grade_students/#{grade_id}", params

data/lib/canvas_oauth/version.rb

@@ -1,3 +1,3 @@
 module CanvasOauth
-  VERSION = "3.0.7"
+  VERSION = "3.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_oauth_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty