metanorma-release 0.2.24 → 0.2.25

data/lib/metanorma/release/site.rb

@@ -13,7 +13,7 @@ module Metanorma
         @index = index
         @output_dir = output_dir
         @data_dir = data_dir
-        @display_categories = display_categories || []
+        @flattener = DocumentFlattener.new(display_categories: display_categories)
       end
 
       def write!
@@ -50,12 +50,13 @@ module Metanorma
         index.publications.map do |pub|
           enrich_publication(pub)
         rescue StandardError => e
-          warn "  Skip #{pub.identifier}: #{e.message}"
+          Metanorma::Release.logger.warn "Skip #{pub.identifier}: #{e.message}"
           pub.to_h
         end
       end
 
       def enrich_publication(pub)
+        require "relaton/bib"
         rxl_file = pub.files.find { |f| f.format == "rxl" }
         return pub.to_h unless rxl_file
 
@@ -78,171 +79,10 @@ module Metanorma
 
       def write_data_file(documents)
         FileUtils.mkdir_p(@data_dir)
-        items = documents.compact.map { |doc| flatten_for_site(doc) }
+        items = documents.compact.map { |doc| @flattener.flatten(doc) }
         File.write(File.join(@data_dir, "documents.json"),
                    JSON.pretty_generate({ "items" => items }))
       end
-
-      def flatten_for_site(doc)
-        bib = doc["bibliographic"] || {}
-        doctype = extract_doctype(bib) || doc.fetch("doctype", "")
-        formats = doc["formats"] || []
-        base = {
-          "slug" => doc["id"],
-          "id" => resolve_doc_id(bib, doc),
-          "title" => doc["title"].to_s,
-          "abstract" => extract_abstract(bib),
-          "stage" => (doc["stage"] || "published").to_s.downcase,
-          "doctype" => doctype,
-          "edition" => doc["edition"],
-          "date" => extract_date(doc),
-          "channels" => doc["channels"] || [],
-          "formats" => formats,
-          "files" => doc["files"] || [],
-          "bibliographic" => bib,
-        }
-        add_format_flags(base, formats)
-        add_display_category(base, doctype)
-        add_contributors(base, bib)
-        base
-      end
-
-      def add_format_flags(hash, formats)
-        hash["has_html"] = formats.include?("html")
-        hash["has_pdf"] = formats.include?("pdf")
-        hash["has_xml"] = formats.include?("xml")
-        hash["has_rxl"] = formats.include?("rxl")
-
-        files = hash["files"]
-        html_file = files.find { |f| f["format"] == "html" }
-        hash["html_path"] = html_file["path"] if html_file
-        pdf_file = files.find { |f| f["format"] == "pdf" }
-        hash["pdf_path"] = pdf_file["path"] if pdf_file
-        xml_file = files.find { |f| f["format"] == "xml" }
-        hash["xml_path"] = xml_file["path"] if xml_file
-        rxl_file = files.find { |f| f["format"] == "rxl" }
-        hash["rxl_path"] = rxl_file["path"] if rxl_file
-      end
-
-      def add_display_category(hash, doctype)
-        cat = resolve_display_category(doctype)
-        hash["stage_css"] = hash["stage"].gsub(/\s+/, "-")
-        hash["doctype_class"] = "type-#{doctype.downcase}"
-        hash["display_category"] = cat&.fetch("name", nil)
-        hash["display_category_slug"] = cat&.fetch("slug", nil)
-      end
-
-      def resolve_doc_id(bib, doc)
-        extract_primary_id(bib) || doc["identifier"] || doc["id"]
-      end
-
-      def extract_primary_id(bib)
-        ids = bib["docidentifier"]
-        return nil unless ids&.any?
-
-        primary = ids.find { |di| di["primary"] == true } || ids.first
-        primary["content"]
-      end
-
-      def extract_doctype(bib)
-        bib.dig("ext", "doctype", "content")
-      end
-
-      def extract_abstract(bib)
-        abstracts = bib["abstract"]
-        return nil unless abstracts&.any?
-
-        abstracts.first["content"]
-      end
-
-      def extract_date(doc)
-        bib_date = extract_bib_date(doc["bibliographic"])
-        return bib_date if bib_date
-
-        release_date = doc.dig("source", "releaseDate")
-        return nil unless release_date
-
-        release_date.to_s.split(/[T ]/).first
-      end
-
-      def extract_bib_date(bib)
-        return nil unless bib
-
-        dates = bib["date"]
-        return nil if dates.nil? || dates.empty?
-
-        published = dates.find { |d| d["type"] == "published" }
-        entry = published || dates.first
-        at = entry["at"]
-        at ? at.to_s.split(/[T ]/).first : nil
-      end
-
-      def resolve_display_category(doctype)
-        return nil if doctype.nil? || doctype.empty?
-
-        @display_categories.each do |cat|
-          doctypes = cat["doctypes"] || []
-          return { "name" => cat["name"], "slug" => cat["slug"] } if doctypes.include?(doctype)
-        end
-        nil
-      end
-
-      def add_contributors(hash, bib)
-        contribs = bib["contributor"] || []
-        persons, committees = partition_contributors(contribs)
-        hash["authors"] = persons
-        hash["committee"] = committees.first
-      end
-
-      def partition_contributors(contribs)
-        persons = contribs.filter_map { |c| parse_person(c) }
-        committees = contribs.filter_map { |c| parse_committee(c) }
-        [persons, committees]
-      end
-
-      def parse_person(contrib)
-        return nil unless contrib["person"]
-
-        name = extract_person_name(contrib["person"])
-        return nil unless name
-
-        role = (contrib["role"] || []).first&.fetch("type", nil)
-        { "name" => name, "role" => role }
-      end
-
-      def parse_committee(contrib)
-        return nil unless contrib["organization"]
-
-        extract_org_subdivision(contrib["organization"])
-      end
-
-      def extract_person_name(person)
-        n = person["name"] || {}
-        complete = n["completename"]
-        return complete["content"] if complete.is_a?(Hash) && complete["content"]
-        return complete if complete.is_a?(String)
-
-        surname = n["surname"]
-        given = n["given"]
-        given_str = given.is_a?(Hash) ? given["content"].to_s : given.to_s
-        parts = [given_str, surname].compact
-        parts.empty? ? nil : parts.join(" ")
-      end
-
-      def extract_org_subdivision(org)
-        subs = org["subdivision"]
-        return nil unless subs&.any?
-
-        sd = subs.first
-        sd_name = sd["name"]
-        if sd_name.is_a?(Array)
-          sd_name.first&.dig("content")
-        elsif sd_name.is_a?(Hash)
-          sd_name["content"]
-        else
-          sd_name.to_s
-        end
-      end
     end
   end
 end

data/lib/metanorma/release/slug_strategy.rb

@@ -11,6 +11,21 @@ module Metanorma
         raise NotImplementedError,
               "#{self.class} must implement #compute_asset_name"
       end
+
+      def self.slug_from_identifier(identifier)
+        identifier.to_s.strip
+          .gsub(/\s+/, "-")
+          .gsub(/:+/, "-")
+          .downcase
+          .gsub(/--+/, "-")
+          .gsub(/[-.]+$/, "")
+      end
+
+      def self.publisher_from_identifier(identifier)
+        return nil if identifier.nil? || identifier.strip.empty?
+
+        identifier.strip.split(/[\s-]/).first&.downcase
+      end
     end
 
     class EditionSlug
@@ -18,18 +33,12 @@ module Metanorma
 
       def compute_tag(publication)
         tag = "#{publication.slug}/ed#{publication.edition}"
-        { tag: tag, pre_release: draft?(publication) }
+        { tag: tag, pre_release: publication.draft? }
       end
 
       def compute_asset_name(publication)
         "#{publication.slug}-ed#{publication.edition}.zip"
       end
-
-      private
-
-      def draft?(publication)
-        %w[20 30 40 50].include?(publication.stage.to_s)
-      end
     end
 
     class VersionSlug
@@ -37,18 +46,12 @@ module Metanorma
 
       def compute_tag(publication)
         tag = "#{publication.slug}/v#{publication.edition}"
-        { tag: tag, pre_release: draft?(publication) }
+        { tag: tag, pre_release: publication.draft? }
       end
 
       def compute_asset_name(publication)
         "#{publication.slug}-v#{publication.edition}.zip"
       end
-
-      private
-
-      def draft?(publication)
-        %w[20 30 40 50].include?(publication.stage.to_s)
-      end
     end
 
     class InternetDraftSlug
@@ -129,6 +132,18 @@ module Metanorma
         @strategies.fetch(publisher.to_s, @default)
       end
 
+      def with_default(strategy)
+        registry = new
+        @strategies.each { |pub, s| registry.register(pub, s) }
+        registry.set_default(strategy)
+        registry
+      end
+
+      def set_default(strategy)
+        @default = strategy
+        self
+      end
+
       def self.from_config(config)
         registry = new
         config.slug_strategies.each do |publisher, strategy_name|
@@ -136,7 +151,7 @@ module Metanorma
           registry.register(publisher, strategy) if strategy
         end
         default = build_strategy(config.slug_default_strategy) || EditionSlug.new
-        registry.instance_variable_set(:@default, default)
+        registry.set_default(default)
         registry
       end
 

data/lib/metanorma/release/version.rb

@@ -2,6 +2,6 @@
 
 module Metanorma
   module Release
-    VERSION = "0.2.24"
+    VERSION = "0.2.25"
   end
 end

data/lib/metanorma/release.rb

@@ -4,18 +4,32 @@ module Metanorma
   module Release
     require_relative "release/version"
 
-    # Domain models
-    autoload :Publication,       "metanorma/release/publication"
-    autoload :PublicationFile,   "metanorma/release/publication"
-    autoload :PublicationSource, "metanorma/release/publication"
-    autoload :Index,             "metanorma/release/index"
-    autoload :Site,              "metanorma/release/site"
-    autoload :Channel,           "metanorma/release/channel"
-    autoload :Config,            "metanorma/release/config"
-    autoload :DocumentEntry,     "metanorma/release/config"
-    autoload :ChannelResolver,   "metanorma/release/config"
-    autoload :ContentHash,       "metanorma/release/content_hash"
+    require "logger"
+
+    class << self
+      attr_writer :logger
 
+      def logger
+        @logger ||= Logger.new($stderr, level: Logger::WARN)
+      end
+    end
+
+    # Domain models
+    autoload :Publication,           "metanorma/release/publication"
+    autoload :PublicationFile,       "metanorma/release/publication"
+    autoload :PublicationSource,     "metanorma/release/publication"
+    autoload :PublicationSerializer, "metanorma/release/publication_serializer"
+    autoload :RxlExtractor,          "metanorma/release/rxl_extractor"
+    autoload :Index,                 "metanorma/release/index"
+    autoload :Site,                  "metanorma/release/site"
+    autoload :Channel,               "metanorma/release/channel"
+    autoload :Config,                "metanorma/release/config"
+    autoload :ConfigLoader,          "metanorma/release/config"
+    autoload :DocumentEntry,         "metanorma/release/config"
+    autoload :ChannelResolver,       "metanorma/release/config"
+    autoload :ContentHash,           "metanorma/release/content_hash"
+    autoload :DependencyValidation,  "metanorma/release/dependency_validation"
+    autoload :DocumentFlattener,     "metanorma/release/document_flattener"
     # Strategies
     autoload :SlugStrategy,      "metanorma/release/slug_strategy"
     autoload :EditionSlug,       "metanorma/release/slug_strategy"
@@ -25,14 +39,17 @@ module Metanorma
     autoload :DraftSuffixSlug,   "metanorma/release/slug_strategy"
     autoload :SlugRegistry,      "metanorma/release/slug_strategy"
 
-    # Interfaces
-    autoload :Filter,          "metanorma/release/interfaces"
-    autoload :ChangeDetector,  "metanorma/release/interfaces"
-    autoload :Packager,        "metanorma/release/interfaces"
-    autoload :Publisher,       "metanorma/release/interfaces"
-    autoload :RepoDiscoverer,  "metanorma/release/interfaces"
-    autoload :ReleaseFetcher,  "metanorma/release/interfaces"
-    autoload :ManifestReader,  "metanorma/release/interfaces"
+    # Interfaces & shared types
+    autoload :Extractor,         "metanorma/release/interfaces"
+    autoload :Release,          "metanorma/release/interfaces"
+    autoload :Asset,            "metanorma/release/interfaces"
+    autoload :Filter,           "metanorma/release/interfaces"
+    autoload :ChangeDetector,   "metanorma/release/interfaces"
+    autoload :Packager,         "metanorma/release/interfaces"
+    autoload :Publisher,        "metanorma/release/interfaces"
+    autoload :RepoDiscoverer,   "metanorma/release/interfaces"
+    autoload :ReleaseFetcher,   "metanorma/release/interfaces"
+    autoload :ManifestReader,   "metanorma/release/interfaces"
 
     # Pipeline components
     autoload :RepoRef,                   "metanorma/release/repo_ref"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-release
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-23 00:00:00.000000000 Z
+date: 2026-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib
@@ -104,6 +104,8 @@ files:
 - lib/metanorma/release/config.rb
 - lib/metanorma/release/content_hash.rb
 - lib/metanorma/release/delta_state.rb
+- lib/metanorma/release/dependency_validation.rb
+- lib/metanorma/release/document_flattener.rb
 - lib/metanorma/release/file_routing.rb
 - lib/metanorma/release/index.rb
 - lib/metanorma/release/interfaces.rb
@@ -118,11 +120,15 @@ files:
 - lib/metanorma/release/platform/local/fetcher.rb
 - lib/metanorma/release/platform/local/publisher.rb
 - lib/metanorma/release/platform/null.rb
+- lib/metanorma/release/platform/null/manifest_reader.rb
 - lib/metanorma/release/platform/null/publisher.rb
+- lib/metanorma/release/platform/static_discoverer.rb
 - lib/metanorma/release/platform_factory.rb
 - lib/metanorma/release/publication.rb
+- lib/metanorma/release/publication_serializer.rb
 - lib/metanorma/release/release_pipeline.rb
 - lib/metanorma/release/repo_ref.rb
+- lib/metanorma/release/rxl_extractor.rb
 - lib/metanorma/release/site.rb
 - lib/metanorma/release/slug_strategy.rb
 - lib/metanorma/release/version.rb