bearcat 1.5.35 → 1.5.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8fcfccbc8eea1fcb41fb3ade8623d386056025521d254fa8ec717cf7b6f3f2d
-  data.tar.gz: c85af5d2f4b9f8c5471d3d8f4d737b2ea02a8f3cb000ec4bb901b626e7860e88
+  metadata.gz: 7d158f0297de70f3ab0168d9eca3f0524ec3ab604ac8a4e756e0b07269a0e6e3
+  data.tar.gz: 07dd1d001f4bfc6248235be4f208782ad136a8af8223aed2e71ae60cc82fc9a3
 SHA512:
-  metadata.gz: 07576ba51c616e275eb8c39cb619e8e517b2834ae02e1f3d2887fd0d3b7eb3705a534d01025d6c4be41a1d3e24d35793dcdb1e2581535288297bc502bf2a4f37
-  data.tar.gz: 8fb0f20d56e83efa61a0f9e66ad6c1ad49a75c8560e305eac89d4cba23d4102fe6d6b13bdf097f4ad84b8be6aeeff0bc27e123c82a5500f0755980838ba2c6e4
+  metadata.gz: 050c5d4b285c4ec8a341b5bfdcc71d02837c8b7ffe5324ac77fef1bd17c77497273c7e366c608565a9dbe264e003b41c20c235d1fa328c774c4f831149e943c4
+  data.tar.gz: 3d9b79d660565eab8fe498d80d46d3ecd0553abd3d15b5d9be95038f7a781563fa44e2ab16f2505c267de725ed02473e739ec560d5de06ede75b1e2f05c20599

data/lib/badgrcat/client/methods.rb

@@ -71,6 +71,18 @@ module Badgrcat
           delete :delete_assertion
         end
       end
+
+      prefix "v2/backpack" do
+        prefix "/assertions" do
+          get :backpack_assertions
+        end
+      end
+
+      prefix "v2/users" do
+        prefix "/self" do
+          get :get_user_profile
+        end
+      end
     end
   end
 end

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/rate_limiting/functions.lua

@@ -0,0 +1,11 @@
+#!lua name=bearcat_rate_limiting
+
+local function checkin_time(keys, args)
+    local return_time = args[1]
+    local true_remaining = args[2]
+
+    local hash = keys[1]
+    return redis.call('HGET', hash, '_last_modified_')
+end
+
+redis.register_function('my_hset', my_hset)

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: false)
-        determine_redis_provider(prefix: prefix, explicit: true)
+      def configured?(prefix, explicit: true)
+        determine_redis_provider(prefix: prefix, explicit: explicit).present?
       end
 
       def create(options = {})

data/lib/bearcat/version.rb

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