ask-auth 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d839820898bcd001809176b196900faf071717a66b53d70ac4a9605b31b3aa1f
-  data.tar.gz: dc3b21d1e383b5c7ee08d9b3798bb966d828b5f8e245c5cd5be036931092c823
+  metadata.gz: 52438e8c475956073bd3f61dcba1e5f6f6ff0619cf83532ba6429603786373e6
+  data.tar.gz: 199345260588e9813e0feddd9881fbcf7290e67dae2ed5fd259c380085927dad
 SHA512:
-  metadata.gz: a092a91d436da5623755ca25116c28510921fad524fc7a562305fba76b94e2ec1d273d65264a847454e9e60813c742c930b2710545315c0b8e8790d303a10689
-  data.tar.gz: a0e8feee12cadfb082abac95349febe768b8f67e0697a9287dceee9b4a4feacf1d6fcbe141969196afd23055c47675e4cadacc17a285212700f1fb6c55a732f7
+  metadata.gz: 39dd2a342b2b02afb910bc1132b8e90e211a2607d0413db69808646ac04fa91653c16d9014284f5e6a841370a497621d4eb6b83c83151c46a7d6a73739f9f815
+  data.tar.gz: 0dc793d15763b903da6b55b85e0791ef90c4c86f6d81059abab08211767d7d980b492c774d305dea683d884d68869dd98f9d4269abd72b43980909a3b4407c3a

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,29 +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
-          return creds.public_send(s) if creds.respond_to?(s)
+          #    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. 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("_")
 
-          # 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)
+            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.2"
+    VERSION = "0.1.4"
   end
 end

metadata

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