ask-auth 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f788282e5d4084f09abe670765dbe0fab939ae87e1e7d2ec60b905c13a97085
-  data.tar.gz: 500ce5057d6a97cb72e559c69bbddda3ba5cebf21d771fcb8f6837ba63d5a510
+  metadata.gz: f8535335b52d412f3c6cd8cb70de3547d5872c21e0aac5465c1bac88a5446847
+  data.tar.gz: 1072dfab33c51e9ab57b6ccd928f97f9f55a947dd27d542696dece9330fa0326
 SHA512:
-  metadata.gz: 448a0bb43bbbd3935a3b0f728e1e251721256e75b995d6b5f673627c7661dbacb43e594c898e1563773c63f90f8a12ec3d93fdb6577e78d6a0441fa0fa1b8f98
-  data.tar.gz: 402ea9c20b006bbdb8166899f7f908cd3e77b729f715b5f0ceb62673a4a78a42f752162bb35e84ba796bc66185a5af227f5a8cb4e2de2c03460ab1db95426594
+  metadata.gz: 349a4863d2061377b373402ea937e9fbaf15a8928662ec3af72e7754fc3e87542bf2e62e9355fbe90140e1a61c4d5e77985b1c87a706eddda8cf8abcd4599fe2
+  data.tar.gz: b01eabafd424f1bf3348b55f05678b6ff6aeb20b805e870cf975631d400915e992d05f64799c74e9cc53a0a37e16db332b1a9bac096be25fd413df0acd8bb100

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

@@ -5,16 +5,52 @@ module Ask
     module Providers
       # Resolves credentials from Rails encrypted credentials.
       #
-      # Convention: +resolve(:github_token)+ looks up +Rails.application.credentials.github.token+
-      # (dot-separated path from the credential name).
+      # Convention: +resolve(:github_token)+ looks up multiple paths in order:
+      #
+      #   1. Full name as a single top-level key (flat layout):
+      #      +Rails.application.credentials.github_token+
+      #
+      #   2. First segment as namespace, joined rest as sub-key (nested layout):
+      #      +Rails.application.credentials.github.token+
+      #
+      #   3. Fully split path (deeply nested layout):
+      #      +Rails.application.credentials.github.api.key+
+      #
+      # 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+.
       #
       # Safely returns nil when Rails is not loaded.
       class RailsCredentials
         def call(name, user: nil)
           return nil unless defined?(::Rails) && ::Rails.application.respond_to?(:credentials)
 
-          parts = name.to_s.split("_")
-          value = parts.reduce(::Rails.application.credentials) do |obj, part|
+          creds = ::Rails.application.credentials
+          s = name.to_s
+          parts = s.split("_")
+
+          # 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.
+          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)
+            end
+          end
+
+          # 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)
           end

data/lib/ask/auth/version.rb

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

metadata

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