ro 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce865a6e0af863e98426c6a5822464695d0baf15ab6ebc1b7e0acdbf88cdc51a
-  data.tar.gz: 8e20b5b872b2aef30ae6ff524d287266d8d720ff7ffb63c22513160aab773b72
+  metadata.gz: a38ecc039006ed4a514cf2e7ef7704b571911ab495100939f858abab5018ede2
+  data.tar.gz: 0de7ade28c2f781b79cb7320ef4a28cba44c1d7c5551281ec7352c88efdc8885
 SHA512:
-  metadata.gz: 8b32bd17c787b5969801e7fb72146802aaf8758a0003994eb5363b821508fab65128b4d7dfe614c5df2fee1a5f507cf4c88aaeaa37df4799e11303b87e486600
-  data.tar.gz: a6dfe0e278908e892f8c79c15003c9b0ccfe7eadde98efb086b0a8d44f4f59716a81bd76c9bc4dd6af854b5b24ffb34ae75a2801c752e66995e0411a7ca36401
+  metadata.gz: 50b5cb23987b64672b73a5e9437dd922b901c0708639ea145f70a417888cbd98cdccbfb20329d74b012223709c93b901f238189f864ebe59f305669cdcdfa186
+  data.tar.gz: 528110f18aeb57caff429b4d27f8fe18cab2f8e6043bd25a9f9e28ff2cc300fba280a2c4e8c4ed4acbd68b9334e4ff0ec73dad7c30b675dfb149459b54c06c2c

data/lib/ro/_lib.rb

@@ -1,5 +1,5 @@
 module Ro
-  VERSION = '5.1.0' unless defined?(VERSION)
+  VERSION = '5.2.0' unless defined?(VERSION)
 
   class << self
     def version

data/lib/ro/collection.rb

@@ -34,18 +34,39 @@ module Ro
       Node.new(path)
     end
 
-    # T021: Scan for metadata files in new structure format
+    # T021: Scan for metadata files in both new and old structure formats
+    # Returns array of hashes: [{id: 'node-id', path: Path, type: :new|:old}]
     def metadata_files
       extensions = %w[yml yaml json toml]
-      files = []
+      metadata_map = {}
 
+      # First, scan for new structure: collection-level metadata files (e.g., posts/ara.yml)
       extensions.each do |ext|
         @path.glob("*.#{ext}").each do |file|
-          files << file if file.file?
+          next unless file.file?
+          node_id = file.basename.to_s.sub(/\.(yml|yaml|json|toml)$/, '')
+          metadata_map[node_id] ||= {id: node_id, path: file, type: :new}
         end
       end
 
-      files.sort
+      # Second, scan for old structure: subdirectory attributes files (e.g., posts/ara/attributes.yml)
+      subdirectories.each do |subdir|
+        node_id = subdir.basename.to_s
+
+        # Check if this subdirectory has an attributes file
+        extensions.each do |ext|
+          attributes_file = subdir.join("attributes.#{ext}")
+          if attributes_file.exist? && attributes_file.file?
+            # Only use old structure if new structure doesn't exist
+            # This allows gradual migration - new structure takes precedence
+            metadata_map[node_id] ||= {id: node_id, path: attributes_file, type: :old}
+            break
+          end
+        end
+      end
+
+      # Return sorted array of metadata info
+      metadata_map.values.sort_by { |m| m[:id] }
     end
 
     def subdirectories(...)
@@ -56,28 +77,43 @@ module Ro
       @path.subdirectory_for(name)
     end
 
-    # T020: Modified to discover nodes from metadata files (new structure)
+    # T020: Modified to discover nodes from metadata files (both new and old structure)
     def each(offset:nil, limit:nil, &block)
       # Return enumerator if no block given and no offset/limit
       return to_enum(:each, offset: offset, limit: limit) unless block_given?
 
-      # Use metadata files for new structure instead of subdirectories
-      files = metadata_files
+      # Get metadata from both old and new structure
+      metadata_entries = metadata_files
 
       if offset
         i = -1
         n = 0
-        files.each do |metadata_file|
+        metadata_entries.each do |entry|
           i += 1
           next if i < offset
-          node = Node.new(self, metadata_file)
+
+          # Create node based on structure type
+          node = if entry[:type] == :new
+            Node.new(self, entry[:path])
+          else
+            # Old structure: pass subdirectory path
+            Node.new(entry[:path].parent)
+          end
+
           block.call(node)
           n += 1
           break if limit && n >= limit
         end
       else
-        files.each do |metadata_file|
-          node = Node.new(self, metadata_file)
+        metadata_entries.each do |entry|
+          # Create node based on structure type
+          node = if entry[:type] == :new
+            Node.new(self, entry[:path])
+          else
+            # Old structure: pass subdirectory path
+            Node.new(entry[:path].parent)
+          end
+
           block.call(node)
         end
       end

data/lib/ro/methods.rb

@@ -5,7 +5,8 @@ module Ro
     # v
     def cast(which, arg, *args)
       which = which.to_s
-      values = [arg, *args].join(',').scan(/[^,\s]+/)
+      # Split on commas only, not whitespace, to preserve datetime strings
+      values = [arg, *args].flat_map { |v| v.to_s.split(',') }.map(&:strip).reject(&:empty?)
 
       list_of = which.match(/^list_of_(.+)$/)
       which = list_of[1] if list_of

data/lib/ro/migrator.rb

@@ -45,12 +45,14 @@ module Ro
         result[:collections] << collection_name
 
         # Check for new structure (metadata files at collection level)
-        collection.metadata_files.each do |metadata_file|
-          node_id = metadata_file.basename.to_s.sub(/\.(yml|yaml|json|toml)$/, '')
+        collection.metadata_files.each do |entry|
+          # Only count new-structure nodes for migration purposes
+          next unless entry[:type] == :new
+
           result[:new_nodes] << {
             collection: collection_name,
-            node_id: node_id,
-            metadata_file: metadata_file
+            node_id: entry[:id],
+            metadata_file: entry[:path]
           }
           result[:has_new_structure] = true
         end

data/lib/ro/node.rb

@@ -85,19 +85,26 @@ module Ro
 
     # T026: Modified to load from external metadata_file (new structure)
     def _load_base_attributes
+      # Start with collection-level metadata (new structure) if it exists
+      base_attrs = Map.new
+
       if @metadata_file && @metadata_file.exist?
         # New structure: load from explicit metadata file
         attrs = _render(@metadata_file)
-        update_attributes!(attrs, file: @metadata_file)
-      else
-        # Old structure: search for attributes.yml in node directory
-        glob = "attributes.{yml,yaml,json}"
+        base_attrs = Map.for(attrs)
+      end
 
-        @path.glob(glob) do |file|
-          attrs = _render(file)
-          update_attributes!(attrs, file:)
-        end
+      # Then merge in nested attributes.yml (old structure) if it exists
+      # "Deeper more specific wins" - nested attributes override collection-level
+      glob = "attributes.{yml,yaml,json}"
+      @path.glob(glob) do |file|
+        nested_attrs = _render(file)
+        # Use Map's smart merge: base.apply(override) means override wins
+        base_attrs = base_attrs.apply(Map.for(nested_attrs))
       end
+
+      # Update with the merged result
+      update_attributes!(base_attrs.to_hash, file: @metadata_file || @path) if base_attrs.any?
     end
 
     def _load_asset_attributes

data/ro.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "ro"
-  spec.version = "5.1.0"
+  spec.version = "5.2.0"
   spec.required_ruby_version = '>= 3.0'
   spec.platform = Gem::Platform::RUBY
   spec.summary = "all your content in github, as god intended"
@@ -269,6 +269,7 @@ Gem::Specification::new do |spec|
  "test/fixtures/old_structure/posts/sample-post/assets/image.jpg",
  "test/fixtures/old_structure/posts/sample-post/attributes.yml",
  "test/integration",
+ "test/integration/dual_structure_test.rb",
  "test/integration/ro_integration_test.rb",
  "test/test_helper.rb",
  "test/tmp/migration_test_1760746513.backup.20251018001513",
@@ -433,6 +434,86 @@ Gem::Specification::new do |spec|
  "test/tmp/migration_test_1760941048.backup.20251020061728/posts/sample-post/assets/body.md",
  "test/tmp/migration_test_1760941048.backup.20251020061728/posts/sample-post/assets/image.jpg",
  "test/tmp/migration_test_1760941048.backup.20251020061728/posts/sample-post/attributes.yml",
+ "test/tmp/migration_test_1760944190.backup.20251020070950",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/assets-only",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/assets-only/assets",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/assets-only/assets/test.txt",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/assets",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/assets/body.md",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/assets/image.jpg",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/attributes.yml",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/posts",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/posts/assets-only",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/posts/assets-only/assets",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/posts/assets-only/assets/test.txt",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/assets",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/assets/body.md",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/assets/image.jpg",
+ "test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/attributes.yml",
+ "test/tmp/migration_test_1760949758.backup.20251020084238",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/assets-only",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/assets-only/assets",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/assets-only/assets/test.txt",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/assets",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/assets/body.md",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/assets/image.jpg",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/attributes.yml",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/posts",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/posts/assets-only",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/posts/assets-only/assets",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/posts/assets-only/assets/test.txt",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/assets",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/assets/body.md",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/assets/image.jpg",
+ "test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/attributes.yml",
+ "test/tmp/migration_test_1760949808.backup.20251020084328",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/assets-only",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/assets-only/assets",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/assets-only/assets/test.txt",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/assets",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/assets/body.md",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/assets/image.jpg",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/attributes.yml",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/posts",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/posts/assets-only",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/posts/assets-only/assets",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/posts/assets-only/assets/test.txt",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/assets",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/assets/body.md",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/assets/image.jpg",
+ "test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/attributes.yml",
+ "test/tmp/migration_test_1760982056.backup.20251020174056",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/assets-only",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/assets-only/assets",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/assets-only/assets/test.txt",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/assets",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/assets/body.md",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/assets/image.jpg",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/attributes.yml",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/posts",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/posts/assets-only",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/posts/assets-only/assets",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/posts/assets-only/assets/test.txt",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/assets",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/assets/body.md",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/assets/image.jpg",
+ "test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/attributes.yml",
  "test/tmp/new_structure_test_1760746452",
  "test/tmp/new_structure_test_1760746452/mixed",
  "test/tmp/new_structure_test_1760746452/mixed/test-json.json",
@@ -447,6 +528,22 @@ Gem::Specification::new do |spec|
  "test/tmp/new_structure_test_1760746452/posts/sample-post.yml",
  "test/tmp/new_structure_test_1760746452/posts/sample-post/body.md",
  "test/tmp/new_structure_test_1760746452/posts/sample-post/image.jpg",
+ "test/tmp/new_structure_test_1760949758",
+ "test/tmp/new_structure_test_1760949758/mixed",
+ "test/tmp/new_structure_test_1760949758/mixed/test-json.json",
+ "test/tmp/new_structure_test_1760949758/mixed/test-yaml.yml",
+ "test/tmp/new_structure_test_1760949758/posts",
+ "test/tmp/new_structure_test_1760949758/posts/metadata-only.yml",
+ "test/tmp/new_structure_test_1760949758/posts/nested-test",
+ "test/tmp/new_structure_test_1760949758/posts/nested-test.yml",
+ "test/tmp/new_structure_test_1760949758/posts/nested-test/assets",
+ "test/tmp/new_structure_test_1760949758/posts/nested-test/assets/subdirectory",
+ "test/tmp/new_structure_test_1760949758/posts/nested-test/assets/subdirectory/image.png",
+ "test/tmp/new_structure_test_1760949758/posts/sample-post",
+ "test/tmp/new_structure_test_1760949758/posts/sample-post.yml",
+ "test/tmp/new_structure_test_1760949758/posts/sample-post/assets",
+ "test/tmp/new_structure_test_1760949758/posts/sample-post/assets/body.md",
+ "test/tmp/new_structure_test_1760949758/posts/sample-post/assets/image.jpg",
  "test/unit",
  "test/unit/asset_test.rb",
  "test/unit/collection_test.rb",

data/test/integration/dual_structure_test.rb

@@ -0,0 +1,232 @@
+require_relative '../test_helper'
+
+class DualStructureTest < RoTestCase
+  def setup
+    @test_dir = Pathname.new(Dir.mktmpdir("dual_structure_test"))
+    @ro_dir = @test_dir.join('ro')
+    @posts_dir = @ro_dir.join('posts')
+    @posts_dir.mkpath
+  end
+
+  def teardown
+    FileUtils.rm_rf(@test_dir) if @test_dir && @test_dir.exist?
+  end
+
+  def test_discovers_new_structure_nodes
+    # Create new structure: posts/foo.yml
+    File.write(@posts_dir.join('foo.yml'), {title: 'Foo New'}.to_yaml)
+    @posts_dir.join('foo').mkpath
+
+    root = Ro::Root.new(@ro_dir)
+    posts = root.posts
+
+    assert_equal 1, posts.to_a.size
+    assert_equal 'foo', posts.first.id
+    assert_equal 'Foo New', posts.first.attributes[:title]
+  end
+
+  def test_discovers_old_structure_nodes
+    # Create old structure: posts/bar/attributes.yml
+    bar_dir = @posts_dir.join('bar')
+    bar_dir.mkpath
+    File.write(bar_dir.join('attributes.yml'), {title: 'Bar Old'}.to_yaml)
+
+    root = Ro::Root.new(@ro_dir)
+    posts = root.posts
+
+    assert_equal 1, posts.to_a.size
+    assert_equal 'bar', posts.first.id
+    assert_equal 'Bar Old', posts.first.attributes[:title]
+  end
+
+  def test_discovers_both_structure_types_simultaneously
+    # Create new structure node
+    File.write(@posts_dir.join('new-node.yml'), {title: 'New Structure'}.to_yaml)
+    @posts_dir.join('new-node').mkpath
+
+    # Create old structure node
+    old_dir = @posts_dir.join('old-node')
+    old_dir.mkpath
+    File.write(old_dir.join('attributes.yml'), {title: 'Old Structure'}.to_yaml)
+
+    root = Ro::Root.new(@ro_dir)
+    posts = root.posts
+    nodes = posts.to_a
+
+    assert_equal 2, nodes.size
+
+    new_node = nodes.find { |n| n.id == 'new-node' }
+    old_node = nodes.find { |n| n.id == 'old-node' }
+
+    assert_equal 'New Structure', new_node.attributes[:title]
+    assert_equal 'Old Structure', old_node.attributes[:title]
+  end
+
+  def test_new_structure_takes_precedence_over_old
+    # Create both structures for same node - new should win
+    node_id = 'conflict'
+
+    # New structure
+    File.write(@posts_dir.join("#{node_id}.yml"), {title: 'New Wins'}.to_yaml)
+
+    # Old structure
+    node_dir = @posts_dir.join(node_id)
+    node_dir.mkpath
+    File.write(node_dir.join('attributes.yml'), {title: 'Old Loses'}.to_yaml)
+
+    root = Ro::Root.new(@ro_dir)
+    posts = root.posts
+    node = posts.to_a.first
+
+    assert_equal 'conflict', node.id
+    assert_equal 'New Wins', node.attributes[:title]
+  end
+
+  def test_mixed_structure_with_assets
+    # New structure with assets
+    File.write(@posts_dir.join('new-with-assets.yml'), {title: 'New'}.to_yaml)
+    new_assets_dir = @posts_dir.join('new-with-assets', 'assets')
+    new_assets_dir.mkpath
+    File.write(new_assets_dir.join('image.jpg'), 'fake jpg')
+
+    # Old structure with assets
+    old_dir = @posts_dir.join('old-with-assets')
+    old_dir.mkpath
+    File.write(old_dir.join('attributes.yml'), {title: 'Old'}.to_yaml)
+    old_assets_dir = old_dir.join('assets')
+    old_assets_dir.mkpath
+    File.write(old_assets_dir.join('photo.png'), 'fake png')
+
+    root = Ro::Root.new(@ro_dir)
+    posts = root.posts
+    nodes = posts.to_a
+
+    assert_equal 2, nodes.size
+
+    new_node = nodes.find { |n| n.id == 'new-with-assets' }
+    old_node = nodes.find { |n| n.id == 'old-with-assets' }
+
+    # Both should have assets
+    assert_equal 1, new_node.assets.size
+    assert new_node.assets.first.to_s.include?('image.jpg')
+
+    assert_equal 1, old_node.assets.size
+    assert old_node.assets.first.to_s.include?('photo.png')
+  end
+
+  def test_iteration_order_consistent
+    # Create nodes with both structures
+    File.write(@posts_dir.join('a-new.yml'), {}.to_yaml)
+    @posts_dir.join('a-new').mkpath
+
+    b_dir = @posts_dir.join('b-old')
+    b_dir.mkpath
+    File.write(b_dir.join('attributes.yml'), {}.to_yaml)
+
+    File.write(@posts_dir.join('c-new.yml'), {}.to_yaml)
+    @posts_dir.join('c-new').mkpath
+
+    root = Ro::Root.new(@ro_dir)
+    posts = root.posts
+    ids = posts.to_a.map(&:id)
+
+    # Should be sorted alphabetically regardless of structure type
+    assert_equal ['a-new', 'b-old', 'c-new'], ids
+  end
+
+  def test_supports_multiple_metadata_formats
+    # New structure with different formats
+    File.write(@posts_dir.join('yaml-new.yml'), {format: 'yaml'}.to_yaml)
+    @posts_dir.join('yaml-new').mkpath
+
+    File.write(@posts_dir.join('json-new.json'), {format: 'json'}.to_json)
+    @posts_dir.join('json-new').mkpath
+
+    # Old structure with different formats
+    yaml_old_dir = @posts_dir.join('yaml-old')
+    yaml_old_dir.mkpath
+    File.write(yaml_old_dir.join('attributes.yaml'), {format: 'yaml_old'}.to_yaml)
+
+    json_old_dir = @posts_dir.join('json-old')
+    json_old_dir.mkpath
+    File.write(json_old_dir.join('attributes.json'), {format: 'json_old'}.to_json)
+
+    root = Ro::Root.new(@ro_dir)
+    posts = root.posts
+    nodes = posts.to_a
+
+    assert_equal 4, nodes.size
+
+    formats = nodes.map { |n| n.attributes[:format] }.sort
+    assert_equal ['json', 'json_old', 'yaml', 'yaml_old'], formats
+  end
+
+  def test_merges_both_metadata_files_when_both_exist
+    # Create collection-level metadata
+    File.write(@posts_dir.join('merged.yml'), {
+      title: 'Collection Level',
+      author: 'Collection Author',
+      tags: ['collection']
+    }.to_yaml)
+
+    # Create nested attributes - should override collection level
+    merged_dir = @posts_dir.join('merged')
+    merged_dir.mkpath
+    File.write(merged_dir.join('attributes.yml'), {
+      title: 'Nested Wins',  # Override
+      published: true,       # New field
+      tags: ['nested', 'specific']  # Override
+    }.to_yaml)
+
+    root = Ro::Root.new(@ro_dir)
+    posts = root.posts
+    node = posts.to_a.first
+
+    # Nested (deeper, more specific) should win
+    assert_equal 'Nested Wins', node.attributes[:title]
+    assert_equal true, node.attributes[:published]
+    assert_equal ['nested', 'specific'], node.attributes[:tags]
+
+    # Collection-level field that wasn't overridden should still be there
+    assert_equal 'Collection Author', node.attributes[:author]
+  end
+
+  def test_deep_merge_with_nested_hashes
+    # Collection-level with nested structure
+    File.write(@posts_dir.join('deep.yml'), {
+      meta: {
+        created: '2024-01-01',
+        source: 'collection'
+      },
+      settings: {
+        public: true,
+        featured: false
+      }
+    }.to_yaml)
+
+    # Nested attributes with partial override
+    deep_dir = @posts_dir.join('deep')
+    deep_dir.mkpath
+    File.write(deep_dir.join('attributes.yml'), {
+      meta: {
+        updated: '2024-02-01',
+        source: 'nested'  # Override
+      },
+      settings: {
+        featured: true  # Override just this field
+      }
+    }.to_yaml)
+
+    root = Ro::Root.new(@ro_dir)
+    posts = root.posts
+    node = posts.to_a.first
+
+    # Deep merge should preserve non-conflicting values
+    assert_equal '2024-01-01', node.attributes[:meta][:created]
+    assert_equal '2024-02-01', node.attributes[:meta][:updated]
+    assert_equal 'nested', node.attributes[:meta][:source]  # Nested wins
+
+    assert_equal true, node.attributes[:settings][:public]
+    assert_equal true, node.attributes[:settings][:featured]  # Nested wins
+  end
+end

data/test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/assets-only/assets/test.txt

@@ -0,0 +1 @@
+test asset

data/test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/assets/body.md

@@ -0,0 +1,5 @@
+# Sample Post
+
+This is the body content of the sample post in the old structure.
+
+It has multiple paragraphs and should be treated as content, not an asset.

data/test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/assets/image.jpg

@@ -0,0 +1,2 @@
+FAKE_JPEG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file representing an image asset in the old structure.

data/test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/attributes.yml

@@ -0,0 +1,2 @@
+title: Sample Post (Old Structure)
+author: Test Author

data/test/tmp/migration_test_1760944190.backup.20251020070950/posts/assets-only/assets/test.txt

@@ -0,0 +1 @@
+test asset

data/test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/assets/body.md

@@ -0,0 +1,5 @@
+# Sample Post
+
+This is the body content of the sample post in the old structure.
+
+It has multiple paragraphs and should be treated as content, not an asset.

data/test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/assets/image.jpg

@@ -0,0 +1,2 @@
+FAKE_JPEG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file representing an image asset in the old structure.

data/test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/attributes.yml

@@ -0,0 +1,2 @@
+title: Sample Post (Old Structure)
+author: Test Author

data/test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/assets-only/assets/test.txt

@@ -0,0 +1 @@
+test asset

data/test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/assets/body.md

@@ -0,0 +1,5 @@
+# Sample Post
+
+This is the body content of the sample post in the old structure.
+
+It has multiple paragraphs and should be treated as content, not an asset.

data/test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/assets/image.jpg

@@ -0,0 +1,2 @@
+FAKE_JPEG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file representing an image asset in the old structure.

data/test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/attributes.yml

@@ -0,0 +1,2 @@
+title: Sample Post (Old Structure)
+author: Test Author

data/test/tmp/migration_test_1760949758.backup.20251020084238/posts/assets-only/assets/test.txt

@@ -0,0 +1 @@
+test asset

data/test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/assets/body.md

@@ -0,0 +1,5 @@
+# Sample Post
+
+This is the body content of the sample post in the old structure.
+
+It has multiple paragraphs and should be treated as content, not an asset.

data/test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/assets/image.jpg

@@ -0,0 +1,2 @@
+FAKE_JPEG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file representing an image asset in the old structure.

data/test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/attributes.yml

@@ -0,0 +1,2 @@
+title: Sample Post (Old Structure)
+author: Test Author

data/test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/assets-only/assets/test.txt

@@ -0,0 +1 @@
+test asset

data/test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/assets/body.md

@@ -0,0 +1,5 @@
+# Sample Post
+
+This is the body content of the sample post in the old structure.
+
+It has multiple paragraphs and should be treated as content, not an asset.

data/test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/assets/image.jpg

@@ -0,0 +1,2 @@
+FAKE_JPEG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file representing an image asset in the old structure.

data/test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/attributes.yml

@@ -0,0 +1,2 @@
+title: Sample Post (Old Structure)
+author: Test Author

data/test/tmp/migration_test_1760949808.backup.20251020084328/posts/assets-only/assets/test.txt

@@ -0,0 +1 @@
+test asset

data/test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/assets/body.md

@@ -0,0 +1,5 @@
+# Sample Post
+
+This is the body content of the sample post in the old structure.
+
+It has multiple paragraphs and should be treated as content, not an asset.

data/test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/assets/image.jpg

@@ -0,0 +1,2 @@
+FAKE_JPEG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file representing an image asset in the old structure.

data/test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/attributes.yml

@@ -0,0 +1,2 @@
+title: Sample Post (Old Structure)
+author: Test Author

data/test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/assets-only/assets/test.txt

@@ -0,0 +1 @@
+test asset

data/test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/assets/body.md

@@ -0,0 +1,5 @@
+# Sample Post
+
+This is the body content of the sample post in the old structure.
+
+It has multiple paragraphs and should be treated as content, not an asset.

data/test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/assets/image.jpg

@@ -0,0 +1,2 @@
+FAKE_JPEG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file representing an image asset in the old structure.

data/test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/attributes.yml

@@ -0,0 +1,2 @@
+title: Sample Post (Old Structure)
+author: Test Author

data/test/tmp/migration_test_1760982056.backup.20251020174056/posts/assets-only/assets/test.txt

@@ -0,0 +1 @@
+test asset

data/test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/assets/body.md

@@ -0,0 +1,5 @@
+# Sample Post
+
+This is the body content of the sample post in the old structure.
+
+It has multiple paragraphs and should be treated as content, not an asset.

data/test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/assets/image.jpg

@@ -0,0 +1,2 @@
+FAKE_JPEG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file representing an image asset in the old structure.

data/test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/attributes.yml

@@ -0,0 +1,2 @@
+title: Sample Post (Old Structure)
+author: Test Author

data/test/tmp/new_structure_test_1760949758/mixed/test-json.json

@@ -0,0 +1,5 @@
+{
+  "title": "JSON Format Test",
+  "format": "json",
+  "extension": "json"
+}

data/test/tmp/new_structure_test_1760949758/mixed/test-yaml.yml

@@ -0,0 +1,3 @@
+title: "YAML Format Test"
+format: "yaml"
+extension: "yml"

data/test/tmp/new_structure_test_1760949758/posts/metadata-only.yml

@@ -0,0 +1,7 @@
+title: "Metadata Only Node"
+author: "Test Author"
+published_at: "2025-01-02"
+tags:
+  - test
+  - metadata-only
+description: "This node has no asset directory - testing FR-007"

data/test/tmp/new_structure_test_1760949758/posts/nested-test/assets/subdirectory/image.png

@@ -0,0 +1,2 @@
+FAKE_PNG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file in a nested subdirectory.

data/test/tmp/new_structure_test_1760949758/posts/nested-test.yml

@@ -0,0 +1,7 @@
+title: "Nested Assets Test"
+author: "Test Author"
+published_at: "2025-01-03"
+tags:
+  - test
+  - nested-assets
+description: "This node has nested subdirectories with assets"

data/test/tmp/new_structure_test_1760949758/posts/sample-post/assets/body.md

@@ -0,0 +1,5 @@
+# Sample Post
+
+This is the body content of the sample post in the new structure.
+
+It has multiple paragraphs and should be treated as content, not an asset.

data/test/tmp/new_structure_test_1760949758/posts/sample-post/assets/image.jpg

@@ -0,0 +1,2 @@
+FAKE_JPEG_DATA_FOR_TESTING_PURPOSES_ONLY
+This is a test file representing an image asset in the new structure (no assets/ subdirectory).

data/test/tmp/new_structure_test_1760949758/posts/sample-post.yml

@@ -0,0 +1,7 @@
+title: "Sample Post (New Structure)"
+author: "Test Author"
+published_at: "2025-01-01"
+tags:
+  - test
+  - new-structure
+description: "This is a test fixture in the new structure format"

data/test/unit/collection_test.rb

@@ -11,31 +11,32 @@ class CollectionTest < RoTestCase
 
   # T011: Test Collection#metadata_files
   def test_metadata_files_returns_yml_and_json_files
-    files = @collection.metadata_files
+    entries = @collection.metadata_files
 
-    assert_not_nil files, "metadata_files should not be nil"
-    assert files.is_a?(Array), "metadata_files should return an Array"
+    assert_not_nil entries, "metadata_files should not be nil"
+    assert entries.is_a?(Array), "metadata_files should return an Array"
 
     # Should find .yml and .json files
-    yml_files = files.select { |f| f.to_s.end_with?('.yml') }
-    assert yml_files.any?, "Should find at least one .yml file"
+    yml_entries = entries.select { |e| e[:path].to_s.end_with?('.yml') }
+    assert yml_entries.any?, "Should find at least one .yml file"
 
-    # Should be Pathname or Ro::Path objects
-    assert files.all? { |f| f.is_a?(Pathname) || f.is_a?(Ro::Path) }, "All files should be Pathname or Ro::Path objects"
+    # Each entry should be a hash with :id, :path, :type
+    assert entries.all? { |e| e.is_a?(Hash) && e[:id] && e[:path] && e[:type] }, "All entries should be hashes with :id, :path, :type"
   end
 
   def test_metadata_files_excludes_directories
-    files = @collection.metadata_files
+    entries = @collection.metadata_files
 
     # Should only return files, not directories
-    assert files.all?(&:file?), "metadata_files should only return files, not directories"
+    assert entries.all? { |e| e[:path].file? }, "metadata_files should only return file entries"
   end
 
   def test_metadata_files_sorted
-    files = @collection.metadata_files
+    entries = @collection.metadata_files
 
-    # Should be sorted
-    assert_equal files.sort.map(&:to_s), files.map(&:to_s), "metadata_files should be sorted"
+    # Should be sorted by id
+    ids = entries.map { |e| e[:id] }
+    assert_equal ids.sort, ids, "metadata_files should be sorted by id"
   end
 
   # T012: Test Collection#each with new structure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-20 00:00:00.000000000 Z
+date: 2025-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -329,6 +329,7 @@ files:
 - test/fixtures/old_structure/posts/sample-post/assets/body.md
 - test/fixtures/old_structure/posts/sample-post/assets/image.jpg
 - test/fixtures/old_structure/posts/sample-post/attributes.yml
+- test/integration/dual_structure_test.rb
 - test/integration/ro_integration_test.rb
 - test/test_helper.rb
 - test/tmp/migration_test_1760746513.backup.20251018001513/migration_test_1760746513/posts/sample-post/assets/image.jpg
@@ -399,6 +400,38 @@ files:
 - test/tmp/migration_test_1760941048.backup.20251020061728/posts/sample-post/assets/body.md
 - test/tmp/migration_test_1760941048.backup.20251020061728/posts/sample-post/assets/image.jpg
 - test/tmp/migration_test_1760941048.backup.20251020061728/posts/sample-post/attributes.yml
+- test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/assets-only/assets/test.txt
+- test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/assets/body.md
+- test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/assets/image.jpg
+- test/tmp/migration_test_1760944190.backup.20251020070950/migration_test_1760944190/posts/sample-post/attributes.yml
+- test/tmp/migration_test_1760944190.backup.20251020070950/posts/assets-only/assets/test.txt
+- test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/assets/body.md
+- test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/assets/image.jpg
+- test/tmp/migration_test_1760944190.backup.20251020070950/posts/sample-post/attributes.yml
+- test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/assets-only/assets/test.txt
+- test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/assets/body.md
+- test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/assets/image.jpg
+- test/tmp/migration_test_1760949758.backup.20251020084238/migration_test_1760949758/posts/sample-post/attributes.yml
+- test/tmp/migration_test_1760949758.backup.20251020084238/posts/assets-only/assets/test.txt
+- test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/assets/body.md
+- test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/assets/image.jpg
+- test/tmp/migration_test_1760949758.backup.20251020084238/posts/sample-post/attributes.yml
+- test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/assets-only/assets/test.txt
+- test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/assets/body.md
+- test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/assets/image.jpg
+- test/tmp/migration_test_1760949808.backup.20251020084328/migration_test_1760949808/posts/sample-post/attributes.yml
+- test/tmp/migration_test_1760949808.backup.20251020084328/posts/assets-only/assets/test.txt
+- test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/assets/body.md
+- test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/assets/image.jpg
+- test/tmp/migration_test_1760949808.backup.20251020084328/posts/sample-post/attributes.yml
+- test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/assets-only/assets/test.txt
+- test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/assets/body.md
+- test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/assets/image.jpg
+- test/tmp/migration_test_1760982056.backup.20251020174056/migration_test_1760982056/posts/sample-post/attributes.yml
+- test/tmp/migration_test_1760982056.backup.20251020174056/posts/assets-only/assets/test.txt
+- test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/assets/body.md
+- test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/assets/image.jpg
+- test/tmp/migration_test_1760982056.backup.20251020174056/posts/sample-post/attributes.yml
 - test/tmp/new_structure_test_1760746452/mixed/test-json.json
 - test/tmp/new_structure_test_1760746452/mixed/test-yaml.yml
 - test/tmp/new_structure_test_1760746452/posts/metadata-only.yml
@@ -407,6 +440,14 @@ files:
 - test/tmp/new_structure_test_1760746452/posts/sample-post.yml
 - test/tmp/new_structure_test_1760746452/posts/sample-post/body.md
 - test/tmp/new_structure_test_1760746452/posts/sample-post/image.jpg
+- test/tmp/new_structure_test_1760949758/mixed/test-json.json
+- test/tmp/new_structure_test_1760949758/mixed/test-yaml.yml
+- test/tmp/new_structure_test_1760949758/posts/metadata-only.yml
+- test/tmp/new_structure_test_1760949758/posts/nested-test.yml
+- test/tmp/new_structure_test_1760949758/posts/nested-test/assets/subdirectory/image.png
+- test/tmp/new_structure_test_1760949758/posts/sample-post.yml
+- test/tmp/new_structure_test_1760949758/posts/sample-post/assets/body.md
+- test/tmp/new_structure_test_1760949758/posts/sample-post/assets/image.jpg
 - test/unit/asset_test.rb
 - test/unit/collection_test.rb
 - test/unit/migrator_test.rb