suma 0.5.24 → 0.5.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 84aed10cf4b395df03b1e9c479f211c35620ea1b25c7fdc820b53445b82aba35
4
- data.tar.gz: 66ebda5f4630fe796071be9109c2f9a89f472a22d9904dd62bdf2f58e91c9e8a
3
+ metadata.gz: 2e9770021702dc3605470e975804e1f752c0a464be25d9222f2eb32622511599
4
+ data.tar.gz: 85e96be55abd1f40e05e26c0fa86097e74971b81f718c6be1307a4fa66d5c7e0
5
5
  SHA512:
6
- metadata.gz: 26085e6362b8acd67ba3d80b6aef6f7bcc64ff81317702d01f34f1b359b2e9944a83b0dde81c0d933022953d93cfc8d581b77064fa117b94724bbc08ccc49d6d
7
- data.tar.gz: 2a5a8d7b7b10ceaee01719e18c8ce4431470311e1642db68ef27d2811e4ed47f000cbe770d534120460675e3a14eb36be73c0081314c28dd2af31112a1a686d1
6
+ metadata.gz: 7ddb66fb8666af7c26259711024bb2fa600f5abe85f4fbe221e87143e77f1d2fab5a532fd70d83fa8e4a4b3ffc444c314e7011e199c4ab34c104e668577b3e66
7
+ data.tar.gz: 61d450a1d32d94c42d5a9b913f8ae94840ea75c213ed1bc573421ae713213f6c6b7d909a46dbb90429db541eb31668abd1d6e9de63cd0372502130a905eb13f5
@@ -384,7 +384,8 @@ module Suma
384
384
  end
385
385
 
386
386
  def write_reinflate_manifest(docrefs, reinf_dir)
387
- rebuilt = with_stubbed_members(manifest["manifest"], docrefs, [0])
387
+ rebuilt = with_stubbed_members(manifest["manifest"], docrefs, [0],
388
+ reinf_dir)
388
389
  reinf_path = File.join(reinf_dir, "reinflate.yml")
389
390
  File.write(reinf_path,
390
391
  base_manifest.merge("manifest" => rebuilt).to_yaml)
@@ -409,33 +410,131 @@ module Suma
409
410
  # Deep-copy the manifest tree, replacing each member entry (same
410
411
  # predicate and pre-order as collection_members) with its stub docref,
411
412
  # and absolutizing non-member filerefs (attachments) against the
412
- # collection root.
413
- def with_stubbed_members(node, docrefs, counter)
413
+ # collection root. A member entry referencing a nested collection
414
+ # manifest additionally has that manifest's attachment docrefs grafted
415
+ # beside the stub: metanorma grafts nested manifests only around a
416
+ # surviving referencing entry, which the stub is not, so the reinflate
417
+ # manifest has to carry the attachment entries itself (suma#169).
418
+ def with_stubbed_members(node, docrefs, counter, reinf_dir)
414
419
  case node
415
420
  when Array
416
- node.map { |child| with_stubbed_members(child, docrefs, counter) }
421
+ node.flat_map do |child|
422
+ rewritten = with_stubbed_members(child, docrefs, counter, reinf_dir)
423
+ [rewritten, *carried_attachments(child, reinf_dir)]
424
+ end
417
425
  when Hash
418
- with_stubbed_members_hash(node, docrefs, counter)
426
+ with_stubbed_members_hash(node, docrefs, counter, reinf_dir)
419
427
  else
420
428
  node
421
429
  end
422
430
  end
423
431
 
424
- def with_stubbed_members_hash(node, docrefs, counter)
432
+ def with_stubbed_members_hash(node, docrefs, counter, reinf_dir)
425
433
  rewritten = node.dup
426
434
  rewritten.each_key do |key|
427
- rewritten[key] = rewrite_entry_value(key, rewritten[key], docrefs, counter)
435
+ rewritten[key] =
436
+ rewrite_entry_value(key, rewritten[key], docrefs, counter, reinf_dir)
428
437
  end
429
438
  stub_for(rewritten, docrefs, counter) || rewritten
430
439
  end
431
440
 
432
- def rewrite_entry_value(key, value, docrefs, counter)
441
+ def rewrite_entry_value(key, value, docrefs, counter, reinf_dir)
433
442
  if %w[file fileref].include?(key) && value &&
434
443
  !Pathname.new(value).absolute?
435
444
  File.expand_path(value, @config_dir)
436
445
  else
437
- with_stubbed_members(value, docrefs, counter)
446
+ with_stubbed_members(value, docrefs, counter, reinf_dir)
447
+ end
448
+ end
449
+
450
+ # The attachment docrefs a member entry's nested collection manifest
451
+ # declares, as one grouping node to graft after the member's stub.
452
+ # The filerefs are re-expressed relative to +reinf_dir+ (where the
453
+ # reinflate manifest is written), so the render resolves each source
454
+ # and derives the destination path the plain build does: the leading
455
+ # ../ climb is truncated into the output directory.
456
+ def carried_attachments(member, reinf_dir)
457
+ return [] unless member.is_a?(Hash) && member_entry?(member)
458
+
459
+ ref = member["fileref"] || member["file"]
460
+ return [] unless manifest_ref?(ref)
461
+
462
+ attachments = []
463
+ collect_nested_attachments(ref, @config_dir, attachments, reinf_dir)
464
+ return [] if attachments.empty?
465
+
466
+ [{ "level" => "attachments", "title" => "Attachments",
467
+ "identifier" => [member["identifier"], "attachments"]
468
+ .compact.join("-"),
469
+ "docref" => attachments }]
470
+ end
471
+
472
+ def collect_nested_attachments(ref, dir, out, reinf_dir)
473
+ path = File.expand_path(ref, dir)
474
+ tree = nested_manifest_tree(path) or return
475
+ collect_attachments(tree, File.dirname(path), out, reinf_dir)
476
+ end
477
+
478
+ # Every attachment docref of a (nested) manifest tree, in declaration
479
+ # order: attachment entries are carried with their fileref re-expressed
480
+ # relative to +reinf_dir+; entries referencing further nested manifests
481
+ # recurse into those files; every other entry is walked in place.
482
+ def collect_attachments(node, dir, out, reinf_dir)
483
+ case node
484
+ when Array
485
+ node.each { |child| collect_attachments(child, dir, out, reinf_dir) }
486
+ when Hash
487
+ collect_attachments_hash(node, dir, out, reinf_dir)
488
+ end
489
+ end
490
+
491
+ def collect_attachments_hash(node, dir, out, reinf_dir)
492
+ dispatch_attachments(node, dir, out, reinf_dir)
493
+ node.each_value { |value| collect_attachments(value, dir, out, reinf_dir) }
494
+ end
495
+
496
+ # An attachment entry is carried with its fileref re-expressed; an
497
+ # entry referencing a further nested manifest recurses into that file.
498
+ def dispatch_attachments(node, dir, out, reinf_dir)
499
+ ref = node["fileref"] || node["file"]
500
+ return unless ref
501
+
502
+ if truthy?(node["attachment"])
503
+ out << carried_attachment_entry(node, dir, reinf_dir)
504
+ elsif manifest_ref?(ref)
505
+ collect_nested_attachments(ref, dir, out, reinf_dir)
506
+ end
507
+ end
508
+
509
+ def carried_attachment_entry(node, dir, reinf_dir)
510
+ carried = node.dup
511
+ %w[fileref file].each do |key|
512
+ next unless carried[key]
513
+
514
+ carried[key] = reinf_relative(File.expand_path(carried[key], dir),
515
+ reinf_dir)
438
516
  end
517
+ carried
518
+ end
519
+
520
+ def reinf_relative(path, reinf_dir)
521
+ base = Pathname.new(File.expand_path(reinf_dir))
522
+ Pathname.new(File.expand_path(path)).relative_path_from(base).to_s
523
+ end
524
+
525
+ def manifest_ref?(ref)
526
+ /\.ya?ml\z/.match?(ref)
527
+ end
528
+
529
+ # The manifest tree of a nested collection manifest file: its +manifest+
530
+ # node, the same node metanorma grafts at render time. A file that is
531
+ # not a collection manifest carries nothing.
532
+ def nested_manifest_tree(path)
533
+ return unless File.file?(path)
534
+
535
+ nested = YAML.load_file(path)
536
+ tree = nested.is_a?(Hash) ? nested["manifest"] : nil
537
+ tree if tree.is_a?(Hash) || tree.is_a?(Array)
439
538
  end
440
539
 
441
540
  def stub_for(node, docrefs, counter)
data/lib/suma/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Suma
4
- VERSION = "0.5.24"
4
+ VERSION = "0.5.25"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: suma
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.24
4
+ version: 0.5.25
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2026-11-03 00:00:00.000000000 Z
11
+ date: 2026-11-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: expressir