canvas_oauth_engine 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeea7a018d9223514938324eca406c1a3bfaa531
-  data.tar.gz: 5b5d1f62203b995e933f66bacbc7a0800fe134f3
+  metadata.gz: bd71940eac39f52a99da306965eb23fba309c976
+  data.tar.gz: 97c14ba4e0722765bdd5882fb21ca6b8a4718166
 SHA512:
-  metadata.gz: 83f2c5aab79984582c12852bff31389482717058c83b08f2d0e5bca32496cfed3fcb03b4553e4097074b8f36e7a91dbbf1291b2fec3e9db0610643adea27275f
-  data.tar.gz: 989c4018501d5c5663dce76f0d0af68098227b9e10859d17051075b1da7cb9ccd001e4c5934a9e06a7c275e13dd799399f70c217afaf4a2e4a125845ebbf7bd8
+  metadata.gz: d3d6fa87ad02ac0a56d1841502f61f2222e8ef322cc4f3d3533858fde597e9cd16e327960f8846f67266c495bd7e34286bd29aae6e45ca1fef63ae790213e7f2
+  data.tar.gz: 652903cb90ff4453d540079deaf9c43ede5d4491e963c4d3c1fe9f07c438cfd13222fd3ebb3ac0f65481b451b04931454300271bb57067a8aaa8d10d7265f2f9

data/lib/canvas_oauth/canvas_api.rb

@@ -46,22 +46,18 @@ module CanvasOauth
       end
     end
 
-    def paginated_get(*params)
-      params[1] ||= {}
-      params[1][:query] ||= {}
-      params[1][:query][:per_page] = PER_PAGE
+    def paginated_get(url, params = {})
+      params[:query] ||= {}
+      params[:query][:per_page] = PER_PAGE
 
       all_pages = []
 
-      while params[0] do
-        if current_page = authenticated_get(*params)
-          all_pages += current_page if valid_page?(current_page)
+      while url && current_page = authenticated_get(url, params) do
+        all_pages.concat(current_page) if valid_page?(current_page)
 
-          links = LinkHeader.parse(current_page.headers['link'])
-          params[0] = links.find_link(["rel", "next"]).try(:href)
-        else
-          params[0] = nil
-        end
+        links = LinkHeader.parse(current_page.headers['link'])
+        url = links.find_link(["rel", "next"]).try(:href)
+        params[:query] = nil if params[:query]
       end
 
       all_pages
@@ -203,6 +199,10 @@ module CanvasOauth
       authenticated_put "/api/v1/courses/#{course_id}/assignments/#{assignment_id}/submissions/#{user_id}", { body: params }
     end
 
+    def get_submission(course_id, assignment_id, user_id)
+      authenticated_get "/api/v1/courses/#{course_id}/assignments/#{assignment_id}/submissions/#{user_id}"
+    end
+
     def course_account_id(course_id)
       course = get_course(course_id)
       course['account_id'] if course

data/lib/canvas_oauth/version.rb

@@ -1,3 +1,3 @@
 module CanvasOauth
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/spec/lib/canvas_oauth/canvas_api_spec.rb

@@ -165,6 +165,13 @@ describe CanvasOauth::CanvasApi do
         canvas.grade_assignment('1', '2', '3', percentage: "80%")
       end
     end
+
+    describe 'get_submission' do
+      it 'queries /api/v1/courses/:course_id/assignments/:assignment_id/submissions/:user_id' do
+        expect(canvas).to receive(:authenticated_get).with('/api/v1/courses/1/assignments/2/submissions/3')
+        canvas.get_submission(1, 2, 3)
+      end
+    end
   end
 
   describe "pagination" do
@@ -179,6 +186,10 @@ describe CanvasOauth::CanvasApi do
     end
 
     describe "paginated_get" do
+
+      let(:first_response_link) { {'link' => "<https://foobar.com/some/address?taco=tuesday&per_page=50&page=2>; rel=\"next\", <https://foobar.com/some/address?taco=tuesday&per_page=50&page=2>; rel=\"last\""} }
+      let(:query) { { query: { taco: 'tuesday' } } }
+
       it "adds per_page parameters to the request query" do
         expect(canvas).to receive(:authenticated_get).with("/some/address", query: { per_page: 50 })
         canvas.paginated_get "/some/address"
@@ -188,11 +199,28 @@ describe CanvasOauth::CanvasApi do
         allow(canvas).to receive(:valid_page?) { true }
         first_response = []
         second_response = []
-        allow(first_response).to receive(:headers).and_return({'link' => "<https://foobar.com/some/address?page=2>; rel=\"next\", <https://foobar.com/some/address?page=2>; rel=\"last\""})
+        allow(first_response).to receive(:headers).and_return(first_response_link)
         allow(second_response).to receive(:headers).and_return({})
         expect(canvas).to receive(:authenticated_get).
           exactly(2).times.and_return(first_response,second_response)
-        canvas.paginated_get "/some/address"
+        canvas.paginated_get "/some/address", query
+      end
+
+      it "requests the next link without repeating query elements" do
+        query_expected = query.dup
+        query_expected[:query][:per_page] = 50
+
+        allow(canvas).to receive(:valid_page?) { true }
+
+        first_response = []
+        second_response = []
+        allow(first_response).to receive(:headers).and_return(first_response_link)
+        allow(second_response).to receive(:headers).and_return({})
+
+        expect(canvas).to receive(:authenticated_get).with("/some/address", query_expected).and_return(first_response)
+        expect(canvas).to receive(:authenticated_get).with('https://foobar.com/some/address?taco=tuesday&per_page=50&page=2', {query: nil}).and_return(second_response)
+
+        canvas.paginated_get "/some/address", query
       end
 
       it "sends only one request when no next link is in the response Link header" do

data/spec/spec_helper.rb

@@ -22,6 +22,13 @@ module CanvasOauth
   end
 end
 
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end
+
 RSpec.configure do |config|
   # ## Mock Framework
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_oauth_engine
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Dave Donahue
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,16 +134,16 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -162,16 +162,30 @@ dependencies:
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.6.4
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -267,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CanvasOauth is a mountable engine for handling the oauth workflow with canvas