bearcat 1.5.34.2 → 1.5.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11b43399e6990820563db689764742ac25433494183cdf43cb736f8b2c941585
-  data.tar.gz: 980ab9dcc33545d3ac06ed7dd7458c4c2a89b43d991865ef556758671be8cbcf
+  metadata.gz: b8fcfccbc8eea1fcb41fb3ade8623d386056025521d254fa8ec717cf7b6f3f2d
+  data.tar.gz: c85af5d2f4b9f8c5471d3d8f4d737b2ea02a8f3cb000ec4bb901b626e7860e88
 SHA512:
-  metadata.gz: ab74953098572d472952137b87d00f4f67a2e34e3ceeba160853b9273b2e899255533caa093a034830d653c575787da34a01dd4f37be6243c42e1c37487473f8
-  data.tar.gz: 46eacd9e8ef320596315092f493008819cc0effffd548ea6901efae04b681c4438fcaeecff3b73c220c5bc2ab8a30da619f202cd2a2bc3212fa116c0a7098e9d
+  metadata.gz: 07576ba51c616e275eb8c39cb619e8e517b2834ae02e1f3d2887fd0d3b7eb3705a534d01025d6c4be41a1d3e24d35793dcdb1e2581535288297bc502bf2a4f37
+  data.tar.gz: 8fb0f20d56e83efa61a0f9e66ad6c1ad49a75c8560e305eac89d4cba23d4102fe6d6b13bdf097f4ad84b8be6aeeff0bc27e123c82a5500f0755980838ba2c6e4

data/lib/bearcat/api_array.rb

@@ -198,7 +198,7 @@ module Bearcat
         path = response.env[:url].path
         if path.match(/.*\/(courses||groups)\/\d+\/conferences/)
           key = 'conferences'
-        elsif path.match(/.*\/accounts\/(?:(?:\d+~)?\d+|self)\/terms/)
+        elsif path.match(/.*\/accounts\/[^\/]+\/terms/)
           key = 'enrollment_terms'
         end
       end

data/lib/bearcat/client/reports.rb

@@ -5,21 +5,14 @@ module Bearcat
     module Reports
       extend ClientModule
 
-      PREFIX = "/api/v1/accounts"
-
-      prefix "#{PREFIX}/:account/reports/" do
+      prefix "/api/v1/accounts/:account/reports/" do
         get :report_list
+        post :start_report, ":report_name"
         get :report_history, ":report_name"
         get :report_status, ":report_name/:report_id"
         delete :delete_report, ":report_name/:report_id"
       end
 
-      def start_report(canvas_account_id, report_name, payload)
-        post("#{PREFIX}/#{canvas_account_id}/reports/#{report_name}", payload)
-      rescue Bearcat::MiscExceptions::Conflict => e
-        JSON.parse(e.response.response_body)
-      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

data/lib/bearcat/version.rb

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

data/lib/bearcat.rb

@@ -1,18 +1,21 @@
 require 'bearcat/version'
 require 'bearcat/client'
-require 'bearcat/misc_exceptions/conflict'
+require 'bearcat/redis_connection'
 
 module Bearcat
   class << self
     require 'logger'
     attr_accessor :master_rate_limit
-    attr_writer :rate_limit_min, :rate_limits, :max_sleep_seconds, :min_sleep_seconds, :logger
+    attr_writer :rate_limit_min, :rate_limits, :max_sleep_seconds,
+                :min_sleep_seconds, :logger, :rate_limiter
 
     def configure
       yield self if block_given?
     end
 
-    attr_accessor :rate_limiter
+    def rate_limiter
+      @rate_limiter
+    end
 
     def rate_limit_min
       @rate_limit_min ||= 175
@@ -28,7 +31,6 @@ module Bearcat
 
     def logger
       return @logger if defined? @logger
-
       @logger = Logger.new(STDOUT)
       @logger.level = Logger::DEBUG
       @logger
@@ -36,13 +38,14 @@ module Bearcat
 
     def redis_pool
       require 'bearcat/redis_connection'
-      @redis_pool ||= Bearcat::RedisConnection.create(env_prefix: 'BEARCAT')
+      @redis_pool ||= Bearcat::RedisConnection.create(env_prefix: "BEARCAT")
     end
 
-    def redis(&block)
-      raise ArgumentError, 'requires a block' unless block_given?
-
-      redis_pool.with(&block)
+    def redis
+      raise ArgumentError, "requires a block" unless block_given?
+      redis_pool.with do |conn|
+        yield conn
+      end
     end
   end
 end