asciichem 0.31.14 → 0.31.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 380b64ab12e3ccc18a554a5d1dc7793046bfa7ea5ba80d51330bb5d713ea618f
-  data.tar.gz: 4b3ec1535d5854626b5e2976adb060b4432bfb7f9d20331e79717ae0db4cdf73
+  metadata.gz: 3246a177690e1019834ab1e177da12f75aee9a7a75cdaa6caecaa3e7a721b227
+  data.tar.gz: e2194852b615ef5e61ddea0726e8b279543c6cbad326991a6238adf791e8d87c
 SHA512:
-  metadata.gz: 49ca402649027d0091acb25b77848e46a9ffaa5bf876e16512f14378d507a3bf32a6dbbb6245967bc54d1eb6728f0672a530db0e92c8db476ca9bfbdb87497f6
-  data.tar.gz: 1741914b553ebe4f1828fa3a294c3ed0249a22072dd90f57185d92aafea717a97eaded37236c97ac3b406032f2919cd449818ba6cf7a6094fdd37a81c7f5c44e
+  metadata.gz: 9fb5e64c26d57111cb9a742388228e225a99da2965d5ac7793cf8ec2366367a3c3b4ed24c14aab1c173f03d324309bd0f34919c52d29a0ee569cb34de88d1012
+  data.tar.gz: cc604167f949bac08b2f47c1dd6ec69e76d1b85ec9d2158ed7d0004a1c0f60c368ec5c1c5a6544fec68f6cc9f71ffec197d1fc2eb165c7da3ea6062e039db7f1

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to AsciiChem are documented here.
 This project follows [Semantic Versioning](https://semver.org/).
 
+## [0.31.15] - 2026-11-12
+
+### Fixed
+- Common Chemistry speaks its real key contract (CAS's access
+  email): `GET /direct-api/detail` with the token as the
+  `X-API-KEY` header plus `x-origin` and `accept` headers — not
+  the `apikey` query parameter 0.31.14 guessed. The key resolves
+  from `COMMON_CHEMISTRY_API_KEY` or the token's stored location
+  (`~/.config/cas-common-chemistry-api.key`); explicit nil means
+  no key. Verified live: formaldehyde resolves from production.
+- The fetch contract grows `get(url, headers = {})`; redirects
+  keep the headers.
+
 ## [0.31.14] - 2026-11-12
 
 ### Added

data/README.adoc

@@ -104,8 +104,10 @@ AsciiChem::Resolver.resolve(value: "50-78-2", convention: "cas",
 ----
 
 CAS key-gated the Common Chemistry API: live lookups there need a
-key (request one at cas.org/services/commonchemistry-api) exported
-as `COMMON_CHEMISTRY_API_KEY`. Without it, that source answers 401
+personal token (request one at cas.org/services/commonchemistry-api,
+valid 12 months). Export it as `COMMON_CHEMISTRY_API_KEY` or store
+it at `~/.config/cas-common-chemistry-api.key` — the adapter sends
+it as the `X-API-KEY` header. Without a key, that source answers 401
 and is skipped — PubChem and OPSIN keep resolving.
 
 === Citations: dataset bibitems with provenance

data/lib/asciichem/resolver/adapter.rb

@@ -78,18 +78,19 @@ module AsciiChem
 
     # Minimal stdlib HTTP transport. No runtime gem dependencies.
     class NetFetch
-      def get(url, limit = 3)
+      def get(url, headers = {}, limit = 3)
         raise Error, "too many redirects" if limit.zero?
 
         uri = URI(url)
+        merged = { "User-Agent" => "asciichem-resolver" }.merge(headers)
         response = Net::HTTP.start(uri.host, uri.port, use_ssl: true,
                                   open_timeout: 5, read_timeout: 10) do |http|
-          http.request(Net::HTTP::Get.new(uri.request_uri, "User-Agent" => "asciichem-resolver"))
+          http.request(Net::HTTP::Get.new(uri.request_uri, merged))
         end
 
         case response
         when Net::HTTPSuccess then response.body
-        when Net::HTTPRedirection then get(URI.join(uri, response["location"]).to_s, limit - 1)
+        when Net::HTTPRedirection then get(URI.join(uri, response["location"]).to_s, headers, limit - 1)
         when Net::HTTPNotFound then nil
         else
           raise Error, "HTTP #{response.code}: #{response.message}"

data/lib/asciichem/resolver/common_chemistry.rb

@@ -16,30 +16,40 @@ module AsciiChem
     # `Resolver.resolve(sources:)`.
     #
     # API access: CAS key-gated the API (401 without a key; request
-    # one at cas.org/services/commonchemistry-api — the exact contract
-    # arrives with the access email). The adapter sends the key as the
-    # `apikey` query parameter; set it per instance (`api_key:`) or
-    # through COMMON_CHEMISTRY_API_KEY, which the resolver's own
-    # instantiation picks up. Without a key, live lookups answer 401
-    # and the resolver skips this source (the other sources still
-    # resolve; seeded caches keep working).
+    # one at cas.org/services/commonchemistry-api). The access email
+    # defines the contract: GET /direct-api/detail with the token as
+    # the X-API-KEY header plus x-origin and accept headers. The key
+    # comes per instance (`api_key:`), from
+    # COMMON_CHEMISTRY_API_KEY, or from
+    # ~/.config/cas-common-chemistry-api.key (the token's stored
+    # location). Tokens are personal and expire after 12 months
+    # (CAS emails a renewal notice). Without a key, live lookups
+    # answer 401 and the resolver skips this source; seeded caches
+    # keep working.
     class CommonChemistry < Adapter
       source_name :common_chemistry
       supports "cas"
 
-      BASE = "https://commonchemistry.cas.org/api/detail"
+      BASE = "https://commonchemistry.cas.org/direct-api/detail"
+      ORIGIN = "https://commonchemistry.cas.org/api-overview"
+      KEY_FILE = File.expand_path("~/.config/cas-common-chemistry-api.key")
 
       attr_reader :api_key
 
-      def initialize(api_key: ENV.fetch("COMMON_CHEMISTRY_API_KEY", nil))
+      # Explicit nil means no key; the env/file lookup runs only when
+      # the argument is omitted.
+      def initialize(api_key: default_api_key)
         super()
         @api_key = api_key
       end
 
       def fetch_record(value:, convention:, fetch:)
-        url = "#{BASE}?cas_rn=#{CGI.escape(value.to_s)}"
-        url = "#{url}&apikey=#{CGI.escape(api_key)}" if api_key
-        body = fetch.get(url)
+        headers = {
+          "Accept" => "application/json",
+          "x-origin" => ORIGIN
+        }
+        headers["X-API-KEY"] = api_key if api_key
+        body = fetch.get("#{BASE}?cas_rn=#{CGI.escape(value.to_s)}", headers)
         return nil unless body
 
         data = JSON.parse(body)
@@ -56,6 +66,11 @@ module AsciiChem
 
       private
 
+      def default_api_key
+        ENV.fetch("COMMON_CHEMISTRY_API_KEY", nil) ||
+          (File.read(KEY_FILE).strip if File.readable?(KEY_FILE))
+      end
+
       def substance_from(data)
         provenance = default_provenance
         identifiers = [Identifier.new(value: data["rn"], convention: "cas",

data/lib/asciichem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AsciiChem
-  VERSION = "0.31.14"
+  VERSION = "0.31.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciichem
 version: !ruby/object:Gem::Version
-  version: 0.31.14
+  version: 0.31.15
 platform: ruby
 authors:
 - Ribose Inc.