bearcat 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fe8ce50483b5b09f5602a507e60004001e4640e4b47dac406c5775d469ebc28
-  data.tar.gz: 134a4bd1039116aba1b50deab1ee9e5af8d352f5e9633a1ce4c51d63c6668ea9
+  metadata.gz: 8928f17ff035763ed794fff4b22a8add153060527af6c4f9f1d7df5e975fefdb
+  data.tar.gz: 4c038af3f5df07456b6c30a3b7a5973cb6c6190dce31fca9b870244240127bfd
 SHA512:
-  metadata.gz: 5b6cec7edf9eb8678a28529e803fda45af2fe4cb0f7be1444701301a2e7014c26a07a66a0468369917460be210fb68177ad269bba1209f954723a2666a2434b1
-  data.tar.gz: 777749586a7efa350a34dfc4f4046fddefce73bb04bbf46645dd1aec34d13c7dd96ceb785b33a091d83e4bffadb2c6d3ec84c9813381d3757324df613a986805
+  metadata.gz: 6f8bbeaf624b5a37620f3747a0bab0822d77bb31ec1a7f0d11388d51f50f6bf20189fad95b09162c95b7e6fc6f3c12b7efe70e9823d725e38349972ae4bd2940
+  data.tar.gz: 9cb3524bafeb83f3b6f86d9fdc855d58a47684153ea3ec4d700b4f77072a782c48874da11f8ac7f31af8e012d78bc7109f6857a0f7332eee38f952fdfb264dc3

data/lib/badgrcat/api_array.rb

@@ -0,0 +1,25 @@
+require 'bearcat/api_array'
+
+module Badgrcat
+  class ApiArray < Bearcat::ApiArray
+    def [](key)
+      if key.is_a?(Numeric)
+        super
+      else
+        @raw_response.body[key]
+      end
+    end
+
+    def status
+      self["status"]
+    end
+
+    def self.array_key(response)
+      if response.body.is_a?(Hash) && response.body.key?("result")
+        "result"
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/badgrcat/client/methods.rb

@@ -0,0 +1,54 @@
+module Badgrcat
+  class Client < Footrest::Client
+    module Methods
+      extend Bearcat::Client::ClientModule
+
+      prefix "/v2/issuers" do
+        get :issuers
+        post :create_issuer
+
+        prefix "/:issuer" do
+          get :issuer
+          put :update_issuer
+          delete :delete_issuer
+
+          prefix "/assertions" do
+            get :issuer_assertions
+            post :create_issuer_assertion
+          end
+
+          prefix "/badgeclasses" do
+            get :issuer_badgeclasses
+            post :create_issuer_badgeclass
+          end
+        end
+      end
+
+      prefix "/v2/badgeclasses" do
+        get :badgeclasses
+        post :create_badgeclass
+
+        prefix "/:badgeclass" do
+          get :badgeclass
+          put :update_badgeclass
+          delete :delete_badgeclass
+
+          prefix "/assertions" do
+            get :badgeclass_assertions
+            post :create_badgeclass_assertion
+          end
+        end
+      end
+
+      prefix "/v2/assertions" do
+        post :revoke_assertions, "/revoke"
+
+        prefix "/v2/assertions/:assertion" do
+          get :assertion
+          put :update_assertion
+          delete :delete_assertion
+        end
+      end
+    end
+  end
+end

data/lib/badgrcat/client.rb

@@ -0,0 +1,53 @@
+require 'footrest/client'
+
+module Badgrcat
+  class Client < Footrest::Client
+    require 'badgrcat/api_array' # monkey patch
+
+    Dir[File.join(__dir__, 'client', '*.rb')].each do |mod|
+      mname = File.basename(mod, '.*').camelize
+      require mod
+      include "Badgrcat::Client::#{mname}".constantize
+    end
+
+    # Override Footrest request for ApiArray support
+    def request(method, &block)
+      begin
+        response = connection.send(method, &block)
+      rescue Footrest::HttpError::Unauthorized
+        # Reauthenticate and retry
+        authenticate!
+        response = connection.send(method, &block)
+      end
+
+      Badgrcat::ApiArray.process_response(response, self)
+    end
+
+    def authenticate!
+      connection.headers[:authorization] = nil
+
+      tok_params = {
+        scope: config[:scope],
+        client_id: config[:client_id],
+      }
+
+      if @refresh_token
+        tok_params.merge!({
+          grant_type: "refresh_token",
+          refresh_token: @refresh_token,
+        })
+      else
+        tok_params.merge!({
+          username: config[:username],
+          password: config[:password],
+        })
+      end
+
+      authresp = connection.send(:post, "o/token", tok_params)
+      authdata = authresp.body
+
+      @refresh_token = authdata["refresh_token"].presence || @refresh_token
+      connection.headers[:authorization] = "#{authdata['token_type']} #{authdata['access_token']}"
+    end
+  end
+end

data/lib/badgrcat/version.rb

@@ -0,0 +1,3 @@
+module Badgrcat
+  VERSION = 'bearcat' unless defined?(Badgrcat::VERSION)
+end

data/lib/bearcat/client.rb

@@ -32,6 +32,12 @@ module Bearcat
       ApiArray.process_response(response, self)
     end
 
+    def set_connection(config)
+      super
+      connection.builder.insert(Footrest::RaiseFootrestErrors, ExtendedRaiseFootrestErrors)
+      connection.builder.delete(Footrest::RaiseFootrestErrors)
+    end
+
     protected
 
     def rate_limited_request
@@ -101,4 +107,13 @@ module Bearcat
       Digest::SHA1.hexdigest(config[:token])
     end
   end
+
+  # Overridden response error middleware that, if an error code doesn't map to an exception, raises a more generic exception
+  class ExtendedRaiseFootrestErrors < Footrest::RaiseFootrestErrors
+    def on_complete(response)
+      super
+      key = response[:status].to_i
+      raise ERROR_MAP[key.floor(-2)], response if key >= 400
+    end
+  end
 end

data/lib/bearcat/version.rb

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

data/lib/catalogcat/client.rb

@@ -11,29 +11,16 @@ module Catalogcat
     end
 
     # Override Footrest connection to use Token authorization
-    # rubocop:disable Naming/AccessorMethodName
     def set_connection(config)
       super
-      connection.builder.insert(Footrest::RaiseFootrestErrors, ExtendedRaiseFootrestErrors)
-      connection.builder.delete(Footrest::RaiseFootrestErrors)
       connection.headers[:authorization].sub! 'Bearer', 'Token'
     end
-    # rubocop:enable Naming/AccessorMethodName
 
     # Override Footrest request for ApiArray support
     def request(method, &block)
       response = connection.send(method, &block)
-      raise Footrest::HttpError::ErrorBase, response if response.status >= 400
 
       Catalogcat::ApiArray.process_response(response, self)
     end
   end
-
-  class ExtendedRaiseFootrestErrors < Footrest::RaiseFootrestErrors
-    def on_complete(response)
-      super
-      key = response[:status].to_i
-      raise ERROR_MAP[key.floor(-2)], response if key >= 400
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Instructure CustomDev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -131,6 +131,10 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - bearcat.gemspec
+- lib/badgrcat/api_array.rb
+- lib/badgrcat/client.rb
+- lib/badgrcat/client/methods.rb
+- lib/badgrcat/version.rb
 - lib/bearcat.rb
 - lib/bearcat/api_array.rb
 - lib/bearcat/client.rb
@@ -385,10 +389,10 @@ files:
 - spec/fixtures/user_page_views.json
 - spec/fixtures/user_profile.json
 - spec/helper.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -404,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Canvas API
 test_files: