bearcat 1.5.37 → 1.5.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d158f0297de70f3ab0168d9eca3f0524ec3ab604ac8a4e756e0b07269a0e6e3
-  data.tar.gz: 07dd1d001f4bfc6248235be4f208782ad136a8af8223aed2e71ae60cc82fc9a3
+  metadata.gz: 162fc05f04d1d475f69cdd6cab1d449539d288284cb89868487be991922da485
+  data.tar.gz: 936bfa6f545ce8bd7f0fe81c15f938d1232fcbdd3685869caae7e8c47ca7aba0
 SHA512:
-  metadata.gz: 050c5d4b285c4ec8a341b5bfdcc71d02837c8b7ffe5324ac77fef1bd17c77497273c7e366c608565a9dbe264e003b41c20c235d1fa328c774c4f831149e943c4
-  data.tar.gz: 3d9b79d660565eab8fe498d80d46d3ecd0553abd3d15b5d9be95038f7a781563fa44e2ab16f2505c267de725ed02473e739ec560d5de06ede75b1e2f05c20599
+  metadata.gz: 63da23efc98f40c13824887429bd5df839054a6d0c28f14ce213745ad7811b2c453f34a9ee1e31871c42928017f9f1fee2d7a02744dc8880c621ba25a3efb6b1
+  data.tar.gz: 77094d36014b3ffded25baf37d58647877ae7689691f673bc2606407be493e1120f388437172ff43ebc2ccce0e55f20d32aeaa576b6ef49e239b4e2add0ca225

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/spec_helpers.rb

@@ -97,10 +97,13 @@ module Bearcat::SpecHelpers
       end
     when String
       raise "Cannot use method :auto when passing string endpoint" if method == :auto
-      { method: method, url: Regexp.escape(endpoint) }
+      endpoint = Regexp.escape(endpoint)
+      endpoint = endpoint.gsub("\\*\\*", ".+")
+      endpoint = endpoint.gsub("\\*", "[^/]+")
+      { method: method, url: endpoint }
     when Regexp
       raise "Cannot use method :auto when passing regex endpoint" if method == :auto
-      { method: method, url: Regexp.escape(endpoint) }
+      { method: method, url: endpoint.to_s }
     end
   end
 

data/lib/bearcat/version.rb

@@ -1,3 +1,3 @@
 module Bearcat
-  VERSION = '1.5.37' unless defined?(Bearcat::VERSION)
+  VERSION = '1.5.39' 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)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.5.37
+  version: 1.5.39
 platform: ruby
 authors:
 - Instructure CustomDev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -429,10 +428,8 @@ files:
 - spec/fixtures/user_page_views.json
 - spec/fixtures/user_profile.json
 - spec/helper.rb
-homepage:
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -447,8 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Canvas API
 test_files: