bearcat 1.5.36 → 1.5.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1aa4cc552b9089c7aeba0bac9d8c6e6607f249397e0d4e3b9351346dc467b9
-  data.tar.gz: 467d992e8040ea5f79a89fda52bdce0ed944efd59fff85df165aa48c65604f44
+  metadata.gz: 93e58f81247055b990fa17d5d98f823c253a28c383e26a8bb5e908befb5d845d
+  data.tar.gz: a1179323c73208512485325e1c4263e4e49bb9e3c7d9682c5147e3a3d9fc32aa
 SHA512:
-  metadata.gz: 8394cf85848a727ebd888c20d76ad27f5d6335556eb949a1763b6ab584e746e9e3daf4195412c863333ae54d8d6abb792efe7b26ab79b3e0bf263972d3081f71
-  data.tar.gz: 04d083c01d107b8d0b71fe32e42a94e832c8c72b5ef48ff3b7958b6713c56b1b1d683626032557541dafd9995f8ce3c6278863aeb380e13422e921345881322d
+  metadata.gz: d26752bb5749819f4aedf02873ee118834b6bc69aaaec52e8ae8281dc9fe239e4947ae401a9022850ba21f2c06d7e53f1907a8cc90938b4602af42918eda89e1
+  data.tar.gz: ba0107db287c5962e3d3291b2b8dc0695887ce74d14f4217c2956e5d648c85219249564db5fba43d7b347e238d1d654001a5e1574b5cc0e15e6aa797af9235e0

data/lib/bearcat/client/graph_ql.rb

@@ -1,17 +1,67 @@
 module Bearcat
+  class GraphqlError < StandardError
+    attr_reader :response
+
+    def initialize(message, response: nil)
+      super(message)
+      @response = response
+    end
+  end
+
   class Client < Footrest::Client
-    # Request body format should be: { query: "query string" }. More info in README.md
+    # Request body format should be:
+    #  - { query: "query string" }
+    #  - "query string"
+    #  - "path/to/gql/file", may be absolute, relative to application root, or relative to `app/graphql`. `.gql` extension is optional.
     module GraphQL
-
-      def graphql_query(query)
+      def graphql_query(query, args = {})
         if query.is_a?(String)
+          if /\A\w+\Z/.match?(query) && !query.include?("{")
+            query = query.underscore
+            @@gql_cache ||= {}
+
+            query = cache_on_class("gql:#{query}") do
+              paths = []
+
+              pn = Pathname.new(query)
+              if pn.absolute?
+                paths << query
+              else
+                paths << Rails.root.join("app", "graphql", query)
+                paths << Rails.root.join(query)
+              end
+
+              paths = paths.flat_map do |path|
+                [path, "#{path}.gql"]
+              end
+
+              query = paths.find do |path|
+                File.exist?(path)
+              end
+
+              File.read(query)
+            end
+          end
+
+          args.symbolize_keys!
+
+          query = query.gsub(/\{\{(.*?)\}\}/) do |_m|
+            match = Regexp.last_match
+            key = match[1].strip.to_sym
+            args[key]
+          end
+
           query = {
             query: query
           }
         end
-        post('/api/graphql', query)
-      end
 
+        result = post('/api/graphql', query)
+        raise GraphqlError.new("Error running GraphQL query:\n#{result["errors"].to_json}", response: result) if result["errors"].present?
+
+        # TODO: It'd be nice to unwrap and return result["data"] directly, but we want to keep backwards compatibility
+        result
+      end
     end
   end
 end

data/lib/bearcat/client.rb

@@ -39,6 +39,19 @@ module Bearcat
       connection.builder.delete(Footrest::RaiseFootrestErrors)
     end
 
+    def self.cache_on_self(key, &block)
+      @cache ||= {}
+      if Rails.env.development? || Rails.env.test?
+        block.call
+      else
+        @cache[key] ||= block.call
+      end
+    end
+
+    def cache_on_class(key, &block)
+      self.class.cache_on_self(key, &block)
+    end
+
     protected
 
     def rate_limited_request

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.36' unless defined?(Bearcat::VERSION)
+  VERSION = '1.5.38' unless defined?(Bearcat::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.5.36
+  version: 1.5.38
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake