andromeda_cms 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64670cf71e6544d5427eeb01b7fbd90eda3a717dbb28379dd836df5662d24563
-  data.tar.gz: 7966c38ad14347e3161f3a8f7018daa5438dddb00aacfee099e9d2c014e500d9
+  metadata.gz: 1d92fa60e3244d13f120342265e2f29a752dc6062dabd92a1c51b1a6f8c1f22a
+  data.tar.gz: 91a101ffae9034aa33c1eadc84c9d9d5cc0a8f08dea30f3e075a754917c053cf
 SHA512:
-  metadata.gz: b6fe4b7a80ca8828ef6ecfeb77ec1ceb8ec5717df836bd6f68e328adc5e9fdb162e1607d26b92167d7420639874c5a203ea25bcf7325d5952a4acbb1f76b76c3
-  data.tar.gz: 5db3fa88aab475e40522a9024d8d22f8887ec106fad290fbfec7b18addb13ab68dba3db3e48e080d43603c3c50a6439e14c6b0fec912ba40a8dba270fae82799
+  metadata.gz: d8f6e1c4f538a237870c99b5f2ac1bef995c4d0373320a86598b00a2eb889d9a8b2741f77bc2a109d20ec0891838d86db54d87294269a3ebdbe424dc5f0f9bd1
+  data.tar.gz: 64f980afb528c86e323a153b5d2932272ecad9e6df9b737255d4aa5062aaa102b8c139e2783e71fcaa9de990a14712f75157d9c7a9fda37809508cb5c6824d6f

data/CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.3] - 2026-10-16
+
+### Fixed
+
+- `andromeda:import_astro` no longer silently mishandles a `glob()` `pattern`
+  it cannot carry over. An array pattern is reduced to its first
+  non-exclusion element (it used to take the first string, even a `!`
+  exclusion), and a note in the report's "Needs a human" section plus a
+  `# TODO` above the generated `collection` line name what was lost:
+  exclusions that are not applied (those files are still copied and
+  loaded) and extra patterns that were dropped (those files are copied but
+  not loaded). An extglob pattern such as `!(drafts)/**/*.md`, which Ruby's
+  glob cannot match, is flagged the same way instead of leaving the
+  collection empty.
+- The gem now requires `tomlrb ~> 2.0`. tomlrb 3.0 removed
+  `Tomlrb::Scanner`, which TOML frontmatter parsing uses to report the line
+  of a syntax error, so on Ruby 3.3 and later a fresh install picked up 3.0
+  and every TOML frontmatter raised `NameError`.
+
 ## [0.6.2] - 2026-10-09
 
 ### Fixed
@@ -189,6 +208,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Generators: `andromeda:install`, `andromeda:collection`,
   `andromeda:component` and `andromeda:import_astro`.
 
+[0.6.3]: https://github.com/AndromedaCMS/andromeda_cms/releases/tag/v0.6.3
 [0.6.2]: https://github.com/AndromedaCMS/andromeda_cms/releases/tag/v0.6.2
 [0.6.1]: https://github.com/AndromedaCMS/andromeda_cms/releases/tag/v0.6.1
 [0.6.0]: https://github.com/AndromedaCMS/andromeda_cms/releases/tag/v0.6.0

data/lib/andromeda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Andromeda
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/generators/andromeda/import_astro/content_config_converter.rb

@@ -18,7 +18,19 @@ module Andromeda
       # already makes for MDX import statements. Anything shaped differently
       # falls through to `Attribute#unsupported?` rather than guessing.
       module ContentConfigConverter
-        Collection = Struct.new(:name, :base, :pattern, :attributes, keyword_init: true)
+        # `notes` are things about the collection itself (not one field)
+        # that still need a human -- e.g. a `pattern` this importer cannot
+        # carry over as written. Defaults to empty so existing
+        # `Collection.new` calls stay valid.
+        Collection = Struct.new(:name, :base, :pattern, :attributes, :notes, keyword_init: true) do
+          def initialize(notes: [], **rest) = super(notes: notes, **rest)
+        end
+
+        DEFAULT_PATTERN = "**/*.{md,mdx}"
+
+        # Bash-style extglob openers (`!(drafts)`, `@(a|b)`, ...), which
+        # Astro's glob loader accepts but Ruby's `Dir.glob` does not.
+        EXTGLOB_RE = /[!@+*?]\(/.freeze
 
         # One frontmatter field. `ruby_type` is nil when the Zod expression
         # could not be recognized at all -- `source` (the original
@@ -65,16 +77,64 @@ module Andromeda
         def build_collection(name, body, astro_root:)
           body = BalancedScanner.strip_comments(body)
           base = extract_string(body, /base\s*:/) || "./src/content/#{name}"
-          pattern = extract_string(body, /pattern\s*:/) || "**/*.{md,mdx}"
+          pattern, notes = extract_pattern(body)
 
           Collection.new(
             name: name,
             base: File.expand_path(base, astro_root),
             pattern: pattern,
-            attributes: extract_attributes(body)
+            attributes: extract_attributes(body),
+            notes: notes
           )
         end
 
+        # Astro's `glob({ pattern: ... })` also takes an array (with `!`
+        # exclusions) and extglob syntax -- neither of which `Dir.glob`
+        # understands. Rather than silently dropping them, the closest
+        # usable pattern is kept and a note says what was lost.
+        #
+        # @return [Array(String, Array<String>)] the pattern and any notes.
+        def extract_pattern(body)
+          match = /pattern\s*:\s*\[/.match(body)
+          return extract_array_pattern(body, match.end(0) - 1) if match
+
+          pattern = extract_string(body, /pattern\s*:/) || DEFAULT_PATTERN
+          return [pattern, []] unless pattern.match?(EXTGLOB_RE)
+
+          [pattern, ["pattern `#{pattern}` uses extglob syntax, which Ruby's glob does not support -- " \
+                     "no files will match this pattern"]]
+        end
+
+        # Only what was actually lost gets a note: `!` exclusions (still
+        # copied and loaded) and any further non-exclusion patterns (copied
+        # but not loaded). A one-element or empty array loses nothing.
+        def extract_array_pattern(body, open_index)
+          close = BalancedScanner.matching_close(body, open_index)
+          # Squished onto one line: the note also becomes a `# TODO` comment.
+          source = body[open_index..close].gsub(/\s+/, " ")
+          elements = BalancedScanner.split_top_level(body[(open_index + 1)...close]).map do |literal|
+            literal.gsub(/\A(['"`])(.*)\1\z/, '\2')
+          end.reject(&:empty?)
+          exclusions, includes = elements.partition { |element| element.start_with?("!") }
+          pattern = includes.first || DEFAULT_PATTERN
+          dropped = includes.drop(1)
+
+          notes = []
+          unless exclusions.empty?
+            notes << "exclusions #{backticked(exclusions)} from pattern array #{source} are not applied, " \
+                     "so the files they exclude are still copied and loaded"
+          end
+          unless dropped.empty?
+            notes << "patterns #{backticked(dropped)} from pattern array #{source} were dropped " \
+                     "(only `#{pattern}` was kept), so files matching only them are copied but not loaded"
+          end
+          [pattern, notes]
+        end
+
+        def backticked(elements)
+          elements.map { |element| "`#{element}`" }.join(", ")
+        end
+
         # @return [String, nil] the quoted value right after `label_re`, e.g.
         #   `base: './src/content/blog'` -> `"./src/content/blog"`.
         def extract_string(body, label_re)

data/lib/generators/andromeda/import_astro/import_astro_generator.rb

@@ -80,7 +80,10 @@ module Andromeda
             fallback_collections
           end
 
-        @collections.each { |collection| refine_with_json_schema!(collection) }
+        @collections.each do |collection|
+          refine_with_json_schema!(collection)
+          collection.notes.each { |note| @report[:notes] << "#{collection.name}: #{note}" }
+        end
       end
 
       # The fallback clause: every top-level directory under
@@ -231,6 +234,9 @@ module Andromeda
         lines = ["# frozen_string_literal: true", ""]
         namespace_modules.each_with_index { |mod, i| lines << "#{"  " * i}module #{mod}" }
         lines << "#{indent}class #{collection.name.to_s.singularize.camelize} < Andromeda::Entry"
+        collection.notes.each do |note|
+          lines << "#{indent}  # TODO: #{note} (content.config.ts) -- fix `pattern` by hand."
+        end
         lines << "#{indent}  collection :#{collection.name}, base: \"app/content/#{collection.name}\", " \
                  "pattern: \"#{collection.pattern}\""
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: andromeda_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - LIMHAUS Inc.
@@ -55,14 +55,14 @@ dependencies:
   name: tomlrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency