bearcat 1.5.38 → 1.5.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93e58f81247055b990fa17d5d98f823c253a28c383e26a8bb5e908befb5d845d
-  data.tar.gz: a1179323c73208512485325e1c4263e4e49bb9e3c7d9682c5147e3a3d9fc32aa
+  metadata.gz: 3236497a9855e8e10a1f6d658ff1d0a58c5ab584807af6855ff3ec7bdecec613
+  data.tar.gz: 3ac14e60f373fb3ba5fe4c805ac7865a727859df438c52dd237ad368f1fa19e5
 SHA512:
-  metadata.gz: d26752bb5749819f4aedf02873ee118834b6bc69aaaec52e8ae8281dc9fe239e4947ae401a9022850ba21f2c06d7e53f1907a8cc90938b4602af42918eda89e1
-  data.tar.gz: ba0107db287c5962e3d3291b2b8dc0695887ce74d14f4217c2956e5d648c85219249564db5fba43d7b347e238d1d654001a5e1574b5cc0e15e6aa797af9235e0
+  metadata.gz: c68b1547fe4ad1d6940ea56432edae963419f28e9e2dee93ce7f3c66d7ccb809e44cbbd0be60f223d2503e5f878a9e8d4b9b506ce05b10e8c9c3dbe1af8a7389
+  data.tar.gz: 29613910bfe3a083bdc1035f6ec104b84810ed109cd3b62a62907d5010ad55cbe3edd31aa9e020cfe64cb4a843cc348b4a8b3bbecff05f05e38f7513cd3c51ac

data/lib/bearcat/client/reports.rb

@@ -14,34 +14,20 @@ module Bearcat
       end
 
       def download_report(url, save_location=nil)
-        #This method takes the verified URL returned in a Canvas report (attachment['url']), and if
-        #a save_location is included, it will download it in chunks to the disk to save memory.  You
-        #can also download the report to memory if you do not include a save location.
-        attempts = 0
-        begin
-          uri = URI.parse(url)
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = true if url.start_with?('https')
-          response = http.head(uri.to_s)
-          url = response['Location']
-          attempts += 1
-        end while attempts <= 5 && (response.code == '301' || response.code == '302' || response.code == '307')
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true if uri.to_s.start_with?('https')
+        require 'open-uri'
+        open_uri_stream = URI.open(url, {
+          'User-Agent' => "Bearcat/#{Bearcat::VERSION} (#{RUBY_PLATFORM})",
+          'Authorization' => "Bearer #{config[:token]}"
+        })
+
         if save_location
-          File.open(save_location, 'wb') do |file|
-            http.request_get(uri.to_s) do |resp|
-              resp.read_body do |segment|
-                file.write(segment)
-              end
-            end
-          end
+          save_location = save_location.path if save_location.respond_to?(:path)
+          IO.copy_stream(open_uri_stream, save_location)
+          save_location
         else
-          response = http.request_get(uri.to_s)
-          CSV.parse(response.read_body, headers: true)
+          CSV.parse(open_uri_stream.read, headers: true)
         end
       end
-
     end
   end
 end

data/lib/bearcat/client/submissions.rb

@@ -11,6 +11,7 @@ module Bearcat
       context_types %i[course section] do |ct|
         prefix "/api/v1/#{ct}s/:#{ct}/" do
           get :"#{ct}_submissions", "students/submissions"
+          post :"#{ct}_submissions_bulk_update", "submissions/update_grades"
 
           prefix "assignments/:assignment/submissions/" do
             post :"#{ct}_submission"

data/lib/bearcat/redis_connection.rb

@@ -11,8 +11,8 @@ module Bearcat
     KNOWN_REDIS_URL_ENVS = %w[REDIS_URL REDISTOGO_URL REDISCLOUD_URL].freeze
 
     class << self
-      def configured?(prefix, explicit: true)
-        determine_redis_provider(prefix: prefix, explicit: explicit).present?
+      def configured?(prefix, explicit: false)
+        determine_redis_provider(prefix: prefix, explicit: true)
       end
 
       def create(options = {})

data/lib/bearcat/version.rb

@@ -1,3 +1,3 @@
 module Bearcat
-  VERSION = '1.5.38' unless defined?(Bearcat::VERSION)
+  VERSION = '1.5.40' unless defined?(Bearcat::VERSION)
 end

data/spec/bearcat/client/reports_spec.rb

@@ -48,7 +48,6 @@ describe Bearcat::Client::Reports do
     it 'downloads a report to disk' do
       report = IO.read(fixture('file.csv'))
       tempfile = Tempfile.new('report')
-      stub_request(:head, 'https://canvas.instructure.com/files/1/download?download_frd=1&verifier=string').to_return(status: 200, body: report)
       stub_request(:get,'https://canvas.instructure.com/files/1/download?download_frd=1&verifier=string').to_return(status: 200, body: report)
       @client.download_report('https://canvas.instructure.com/files/1/download?download_frd=1&verifier=string', tempfile)
       csv = CSV.read(tempfile, headers: true)
@@ -59,12 +58,10 @@ describe Bearcat::Client::Reports do
     it 'follows redirects' do
       report = IO.read(fixture('file.csv'))
       tempfile = Tempfile.new('report')
-      stub_request(:head, 'https://canvas.instructure.com/files/1/download?download_frd=1&verifier=string')
+      stub_request(:get, 'https://canvas.instructure.com/files/1/download?download_frd=1&verifier=string')
         .to_return(status: 302, body: 'You are being redirected',headers: {'Location' => 'https://cluster1-files.instructure.com/files/1/download?download_frd=1&sf_verifier=verifier=1478139862&user_id=1&verifier=verifier'})
-      stub_request(:head, 'https://cluster1-files.instructure.com/files/1/download?download_frd=1&sf_verifier=verifier=1478139862&user_id=1&verifier=verifier')
+      stub_request(:get, 'https://cluster1-files.instructure.com/files/1/download?download_frd=1&sf_verifier=verifier=1478139862&user_id=1&verifier=verifier')
         .to_return(status: 302, body: 'You are being redirected', headers: {'Location' => 'https://instructure-uploads.s3.amazonaws.com/account_1/attachments/1/assignment_submission.csv'})
-      stub_request(:head, 'https://instructure-uploads.s3.amazonaws.com/account_1/attachments/1/assignment_submission.csv')
-        .to_return(status: 200)
       stub_request(:get, 'https://instructure-uploads.s3.amazonaws.com/account_1/attachments/1/assignment_submission.csv')
         .to_return(status: 200, body: report)
       @client.download_report('https://canvas.instructure.com/files/1/download?download_frd=1&verifier=string', tempfile)