ask-auth 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8535335b52d412f3c6cd8cb70de3547d5872c21e0aac5465c1bac88a5446847
-  data.tar.gz: 1072dfab33c51e9ab57b6ccd928f97f9f55a947dd27d542696dece9330fa0326
+  metadata.gz: 899769786d686dad5733fb428f4947d077af5e4913573558890ac309dc246d7e
+  data.tar.gz: 8dad782619a917d310858ec90136b86638fdffe64e71060c72ba8af42f91a41f
 SHA512:
-  metadata.gz: 349a4863d2061377b373402ea937e9fbaf15a8928662ec3af72e7754fc3e87542bf2e62e9355fbe90140e1a61c4d5e77985b1c87a706eddda8cf8abcd4599fe2
-  data.tar.gz: b01eabafd424f1bf3348b55f05678b6ff6aeb20b805e870cf975631d400915e992d05f64799c74e9cc53a0a37e16db332b1a9bac096be25fd413df0acd8bb100
+  metadata.gz: 69064653971ef660f7c2aa2f297f5a1119888a18b5521ebee9c4bbf1058f474ffb70275d9cf60dec044ee94565520d9e0fc9defc782ee4b74505e17b01d4a6c4
+  data.tar.gz: e819dd4a9a9bac4a5d9cca0064d750610b16c8d1baf3de33cd4bb792ec3292279091a271e0c34ccfa85738ff228cd798384e503ef4cd909aae96b4e66b118fca

data/lib/ask/auth/providers/rails_credentials.rb

@@ -5,21 +5,28 @@ module Ask
     module Providers
       # Resolves credentials from Rails encrypted credentials.
       #
-      # Convention: +resolve(:github_token)+ looks up multiple paths in order:
+      # Tries multiple strategies in order, from least to most nested:
       #
-      #   1. Full name as a single top-level key (flat layout):
-      #      +Rails.application.credentials.github_token+
+      #   1. Full name as a single top-level key (flat layout)
+      #      +resolve(:openai_api_key)+ → +Rails.application.credentials.openai_api_key+
       #
-      #   2. First segment as namespace, joined rest as sub-key (nested layout):
-      #      +Rails.application.credentials.github.token+
+      #   2. Progressively split into prefix + joined suffix
+      #      +resolve(:opencode_api_key)+ → tries:
+      #        a. +Rails.application.credentials.opencode.api_key+       ← most common
+      #        b. +Rails.application.credentials.opencode.api.key+        ← fully split
       #
-      #   3. Fully split path (deeply nested layout):
-      #      +Rails.application.credentials.github.api.key+
+      #   3. For compound provider slugs, +resolve(:opencode_go_api_key)+ tries:
+      #      a. +Rails.application.credentials.opencode.go_api_key+      ← slug as single key
+      #      b. +Rails.application.credentials.opencode.go.api_key+     ← slug + api_key
+      #      c. +Rails.application.credentials.opencode.go.api.key+     ← fully split
       #
-      # Strategy 2 handles compound key names like +api_key+ correctly.
-      # For +resolve(:opencode_api_key)+, it looks up:
-      #   +Rails.application.credentials.opencode.api_key+
-      # instead of breaking +api_key+ into +api+ and +key+.
+      #   4. For deeply nested, +resolve(:nvidia_nim_api_key)+ tries:
+      #      a. +Rails.application.credentials.nvidia.nim_api_key+      ← nvidia + nim_api_key
+      #      b. +Rails.application.credentials.nvidia.nim.api_key+      ← nvidia.nim + api_key
+      #      c. +Rails.application.credentials.nvidia.nim.api.key+     ← fully split
+      #
+      # Strategy 2b/3b/4b keep +api_key+ intact as a single credential key
+      # instead of breaking it into +api+ and +key+.
       #
       # Safely returns nil when Rails is not loaded.
       class RailsCredentials
@@ -29,33 +36,39 @@ module Ask
           creds = ::Rails.application.credentials
           s = name.to_s
           parts = s.split("_")
+          return nil if parts.empty?
 
-          # 1. Full name as a single top-level key (e.g., credentials.opencode_api_key)
-          #    Must check the returned value, not just respond_to?, because
-          #    ActiveSupport::OrderedOptions#respond_to? returns true for any
-          #    method name even when the key doesn't exist in the hash.
+          # 1. Full name as a single top-level key
+          #    Must check the value, not just respond_to?, because
+          #    ActiveSupport::OrderedOptions#respond_to? returns true
+          #    for any method name, even when the key doesn't exist.
           val = creds.public_send(s) rescue nil
           return val if val
 
-          # 2. First segment as namespace, joined rest as sub-key
-          #    e.g., opencode_api_key → credentials.opencode.api_key
-          if parts.length >= 2
-            first = parts.first
-            rest = parts.drop(1).join("_")
-            if creds.respond_to?(first)
-              obj = creds.public_send(first)
-              return obj.public_send(rest) if obj.respond_to?(rest)
+          # 2. Try progressively longer prefixes, keeping the remainder
+          #    joined as a single key name at each level.
+          #    split_at=1: parts[0] as prefix, parts[1..] joined as key
+          #    split_at=2: parts[0..1] as prefix, parts[2..] joined as key
+          #    etc.
+          (1...parts.length).each do |split_at|
+            prefix_parts = parts.take(split_at)
+            key = parts.drop(split_at).join("_")
+
+            obj = prefix_parts.reduce(creds) do |o, p|
+              break nil unless o.respond_to?(p)
+              o.public_send(p)
             end
-          end
+            next unless obj
 
-          # 3. Fully split path (original behavior)
-          #    e.g., opencode.go.api_key → credentials.opencode.go.api_key
-          value = parts.reduce(creds) do |obj, part|
-            break nil unless obj.respond_to?(part)
-            obj.public_send(part)
+            begin
+              val = obj.public_send(key)
+              return val if val
+            rescue NoMethodError
+              # respond_to? can lie for some credential objects
+            end
           end
 
-          value
+          nil
         end
       end
     end

data/lib/ask/auth/version.rb

@@ -2,6 +2,6 @@
 
 module Ask
   module Auth
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/lib/ask/auth.rb

@@ -18,10 +18,12 @@ module Ask
   #
   module Auth
     class MissingCredential < KeyError
-      def initialize(name)
-        super("No credential found for #{name.inspect}. " \
-              "Set #{name.to_s.upcase} in your environment, add it to ~/.ask/credentials.yml, " \
-              "or configure a provider.")
+      def initialize(names)
+        names = Array(names).flatten
+        inspected = names.map(&:inspect).join(", ")
+        super("No credential found for #{inspected}. " \
+              "Set one of #{names.map { |n| n.to_s.upcase }.uniq.join(", ")} in your environment, " \
+              "add it to ~/.ask/credentials.yml, or configure a provider.")
       end
     end
 
@@ -49,21 +51,29 @@ module Ask
       end
 
       # Walk providers in order and return the first non-nil credential.
-      # +name+:: Symbol or String identifying the credential (e.g. +:github_token+)
+      # Accepts one or more credential names — tries each in order,
+      # returning the first match across all providers.
+      #
+      #   Ask::Auth.resolve(:openai_api_key)
+      #   Ask::Auth.resolve(:opencode_go_api_key, :opencode_api_key, user: current_user)
+      #
+      # +names+:: One or more Symbols or Strings identifying the credential
       # +user+:: Optional user record for per-user providers (Database, OAuth)
-      def resolve(name, user: nil)
-        name = name.to_s.strip
-        return nil if name.empty?
+      def resolve(*names, user: nil)
+        names = names.flatten.map { |n| n.to_s.strip }.reject(&:empty?)
+        return nil if names.empty?
 
-        configuration.providers.each do |provider|
-          value = provider.call(name, user: user)
-          next if value.nil?
+        names.each do |name|
+          configuration.providers.each do |provider|
+            value = provider.call(name, user: user)
+            next if value.nil?
 
-          normalized = normalize(value)
-          return normalized unless normalized.nil?
+            normalized = normalize(value)
+            return normalized unless normalized.nil?
+          end
         end
 
-        raise MissingCredential, name
+        raise MissingCredential, names
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Kaka Ruto