lib/metanorma/collection_manifest.rb in metanorma-1.7.6 vs lib/metanorma/collection_manifest.rb in metanorma-1.7.7

@@ -26,36 +26,57 @@
       def from_yaml(mnf)
         manifest = RelatonBib.array(mnf["manifest"]).map do |m|
           from_yaml m
         end
         docref = RelatonBib.array mnf["docref"]
-        new(mnf["level"], mnf["title"], docref, manifest)
+        new(mnf["level"], mnf["title"], parse_docrefs_yaml(docref), manifest)
       end
 
       # @param mnf [Nokogiri::XML::Element]
       # @return [Metanorma::CollectionManifest]
       def from_xml(mnf)
         level = mnf.at("level").text
         title = mnf.at("title")&.text
         manifest = mnf.xpath("xmlns:manifest").map { |m| from_xml(m) }
-        new(level, title, parse_docref(mnf), manifest)
+        new(level, title, parse_docrefs_xml(mnf), manifest)
       end
 
       private
 
+      def parse_docrefs_yaml(docrefs)
+        docrefs.map do |dr|
+          h = {}
+          h["identifier"] = dr["identifier"] ||
+            UUIDTools::UUID.random_create.to_s
+          dr["manifest"] and h["manifest"] = from_yaml(dr["manifest"].first)
+          %w(fileref url attachment sectionsplit index presentation-xml).each do |k|
+            dr.has_key?(k) and h[k] = dr[k]
+          end
+          h
+        end
+      end
+
       # @param mnf [Nokogiri::XML::Element]
       # @return [Hash{String=>String}]
-      def parse_docref(mnf)
+      def parse_docrefs_xml(mnf)
         mnf.xpath("xmlns:docref").map do |dr|
-          h = { "identifier" => dr.at("identifier").children.to_xml }
-          %i(fileref attachment sectionsplit index).each do |s|
+          h = { "identifier" => parse_docrefs_xml_id(dr) }
+          %i(fileref url attachment sectionsplit index).each do |s|
             h[s.to_s] = dr[s] if dr[s]
           end
+          m = dr.at("manifest") and h["manifest"] = from_xml(m)
           h["presentation-xml"] = dr[:presentationxml] if dr[:presentationxml]
           h
         end
       end
+
+      def parse_docrefs_xml_id(docref)
+        if i = docref.at("identifier")
+          i.children.to_xml
+        else UUIDTools::UUID.random_create
+        end
+      end
     end
 
     # @param col [Metanorma::Collection]
     def collection=(col)
       @collection = col
@@ -64,27 +85,34 @@
 
     # @param dir [String] path to collection
     # @return [Hash<String, Metanorma::Document>]
     def documents(dir = "")
       docs = @docref.each_with_object({}) do |dr, m|
-        dr["fileref"] or next m
-        m[Util::key dr["identifier"]] = Document.parse_file(
-          Util::rel_path_resolve(dir, dr["fileref"]),
-          dr["attachment"], dr["identifier"], dr["index"]
-        )
+        if dr["fileref"]
+          m[Util::key dr["identifier"]] = documents_add(dir, dr)
+        elsif dr["manifest"]
+          m.merge! dr["manifest"].documents(dir)
+        end
         m
       end
       @manifest.reduce(docs) { |mem, mnf| mem.merge mnf.documents(dir) }
     end
 
+    def documents_add(dir, docref)
+      Document.parse_file(
+        Util::rel_path_resolve(dir, docref["fileref"]),
+        docref["attachment"], docref["identifier"], docref["index"]
+      )
+    end
+
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
       builder.manifest do |b|
         b.level @level
         b.title @title if @title
         docref_to_xml b
-        @manifest.each { |m| m.to_xml b }
+        @manifest&.each { |m| m.to_xml b }
       end
     end
 
     # @return [Array<Hash{String=>String}>]
     def docrefs
@@ -95,45 +123,46 @@
     end
 
     def docref_by_id(docid)
       refs = docrefs
       dref = refs.detect { |k| k["identifier"] == docid }
-      dref || docrefs.detect { |k| /^#{k["identifier"]}/ =~ docid }
+      dref || docrefs.detect { |k| /^#{k['identifier']}/ =~ docid }
     end
 
     private
 
     # @param builder [Nokogiri::XML::Builder]
     def docref_to_xml(builder)
       @disambig = Util::DisambigFiles.new
       @docref.each do |dr|
         drf = builder.docref do |b|
           b.identifier { |i| i << dr["identifier"] }
-          !dr["attachment"] && !dr["sectionsplit"] &&
+          !dr["attachment"] && !dr["sectionsplit"] && @collection &&
             d = @collection.bibdatas[Util::key dr["identifier"]] and
             b.parent.add_child(d.bibitem.to_xml(bibdata: true))
+          m = dr["manifest"] and m.to_xml b
         end
         docref_to_xml_attrs(drf, dr)
       end
     end
 
     def docref_to_xml_attrs(elem, docref)
-      elem[:fileref] = @disambig.strip_root(docref["fileref"])
-      %i(attachment sectionsplit).each do |i|
+      f = docref["fileref"] and elem[:fileref] = @disambig.strip_root(f)
+      %i(attachment sectionsplit url).each do |i|
         elem[i] = docref[i.to_s] if docref[i.to_s]
       end
       elem[:index] = docref.has_key?("index") ? docref["index"] : "true"
       elem[:presentationxml] = "true" if docref["presentation-xml"] &&
         [true, "true"].include?(docref["presentation-xml"])
       docref_to_xml_attrs_id(elem, docref)
     end
 
     def docref_to_xml_attrs_id(elem, docref)
-      if collection.directives.include?("documents-inline")
+      if collection&.directives&.include?("documents-inline")
         id = collection.documents.find_index do |k, _|
           k == docref["identifier"]
         end
-        elem[:id] = format("doc%<index>09d", index: id)
+        id and elem[:id] = format("doc%<index>09d", index: id)
       end
     end
   end
 end