andromeda_cms 0.6.1-x86_64-linux → 0.6.3-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf53f64d37175f87d3e0333cd95a31cd861d3b449701914f00d3dbd00afd44f
-  data.tar.gz: e0358f652240a474ff2abb3a84929e92fe958e81c514f39ce4292102b6b17526
+  metadata.gz: 855263206dc24ebe87ce292d2bfd3c9c96d7927ae23eafed8ddb8e7c39cbf601
+  data.tar.gz: d1b5dbd227c3406c9f27495be1d11147c4a29b172f05694870494aad5b8aff83
 SHA512:
-  metadata.gz: 6a153185b4128ca6686fd671f663a882635bb221f45871893a4db1aec0f0d47cc9f2cb815ede58f15de097ecdf2581f47f0154957c034f58703bcb92f5b02447
-  data.tar.gz: 4cc6f596c60da5ce19319796dc6b8f9a47d40d4e80591ed310d6dd868c6d09ab23cfccf57a687a521a5a6549a2c96d7943fafacf3a5e377b5f0d6df92868c9ce
+  metadata.gz: a81f2ac3c3404fab70619a1b010c2e6819c341b0c04aa29dbc65a4a7ad419129b4a1b28f412947d95747d7ae3973f5859efd830ea7018307281006aa6fe9bb2c
+  data.tar.gz: c172675fb835d11c25e5e597fbe7bccd21d7c488ffb214b6386ed38c5e36d53b7a70772a8e005d627fbb5c8140fbb905b27d37c081f6a4538da1ab2f1df9006a

data/CHANGELOG.md

@@ -5,6 +5,37 @@ 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
+
+- `assets:precompile` no longer leaves out `tailwind.css` when an
+  application partial rendered during `andromeda:build` calls `image_tag` or
+  `asset_path`. Propshaft caches its file list on the first lookup, so a
+  fresh build (an empty `app/assets/builds/`) shipped without the files
+  written afterwards and every page raised `Propshaft::MissingAssetError`.
+  `andromeda:build` now discards that cache when it finishes, whether or not
+  the build succeeds.
+
 ## [0.6.1] - 2026-10-09
 
 ### Fixed
@@ -177,6 +208,8 @@ 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
 [0.5.0]: https://github.com/AndromedaCMS/andromeda_cms/releases/tag/v0.5.0

data/lib/andromeda/assets.rb

@@ -95,6 +95,21 @@ module Andromeda
       load_path.paths.any? { |directory| File.file?(File.join(directory.to_s, path)) }
     end
 
+    # Discards Propshaft's memoized file list. Propshaft builds it on the first
+    # lookup, and app partials rendered during `andromeda:build` can trigger
+    # that through `asset_path`. Files written afterwards (tailwind.css from
+    # tailwindcss:build, images copied by `publish`) would then be missing from
+    # assets:precompile, so the build calls this when it finishes. `clear_cache`
+    # is private API; if a Propshaft release renames it, skipping the reset is
+    # better than breaking the build.
+    def reset_pipeline_cache
+      load_path = pipeline_load_path
+      return if load_path.nil?
+
+      load_path.send(:clear_cache) if load_path.respond_to?(:clear_cache, true)
+      nil
+    end
+
     def pipeline_load_path
       return nil unless defined?(::Rails) && ::Rails.respond_to?(:application) && ::Rails.application
 

data/lib/andromeda/pipeline.rb

@@ -210,6 +210,8 @@ module Andromeda
 
         results
       end
+    ensure
+      Andromeda::Assets.reset_pipeline_cache
     end
 
     def self.default_entry_classes

data/lib/andromeda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Andromeda
-  VERSION = "0.6.1"
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: andromeda_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: x86_64-linux
 authors:
 - LIMHAUS Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-10-08 00:00:00.000000000 Z
+date: 2026-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -56,14 +56,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