metanorma-acme 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 471e22b64bfe89b616795392ad00f622e74ebe49f853855424fb53aaa57164f6
-  data.tar.gz: 164a35112070dc99ac9e8cfe5559bd93c104ee0648057fb506a997c15a433dd4
+  metadata.gz: 0e8878b8c45aca79d255b1c00055dab18317ee51f34c3444b2413a8c9d40eede
+  data.tar.gz: 81ec71492aa8194efa5613732f269be81968d9c24e50e5ad386e788ebffac35c
 SHA512:
-  metadata.gz: ee7769d61b4c768ea8c78a2be98142b5aef55be19e9db23a9399a6684ec070805a8e6ecb11ec2c238a3f43fec35d5b743a9e1701023a0db02a7027533b5b73eb
-  data.tar.gz: 93670ae87f6e3730406f2b1185eb93a82bb8490c3d5e15154e45c878466f36d41719ed5f554a851e9ab69868a968d688c936fbf30a779ec125ecba794394b7b9
+  metadata.gz: af551bed15e41f056f3b31d8ffe5768b2c0daae3dbe39e721f53733b9e88fe79c165e71a609dcf450374bd352d9092d053cdd6ae673b07b449ce9151c2784d92
+  data.tar.gz: 8448ed20ea599f56075ea49ea1293722e0fda3b2ef65039af1daeea0af11c31940afdf754c0590689748412270300784866c2c310d9a3f5de49c992a9fe12896

data/lib/asciidoctor/acme/acme.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+<grammar ns="https://www.metanorma.org/ns/acme" xmlns="http://relaxng.org/ns/structure/1.0">
   <!--
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different

data/lib/asciidoctor/acme/converter.rb

@@ -43,11 +43,17 @@ module Asciidoctor
         end
       end
 
+      def docidentifier_cleanup(xmldoc)
+        template = configuration.docid_template ||
+          "{{ organization_name_short }} {{ docnumeric }}"
+        docid = xmldoc.at("//bibdata/docidentifier")
+        id = boilerplate_isodoc(xmldoc).populate_template(template, nil)
+        id.empty? and docid.remove or docid.children = id
+      end
+
       def metadata_id(node, xml)
-        return unless node.attr("docnumber")
         xml.docidentifier do |i|
-          i << "#{configuration.organization_name_short} "\
-            "#{node.attr("docnumber")}"
+          i << "DUMMY"
         end
         xml.docnumber { |i| i << node.attr("docnumber") }
       end
@@ -64,16 +70,6 @@ module Asciidoctor
         end
       end
 
-      def metadata_security(node, xml)
-        security = node.attr("security") || return
-        xml.security security
-      end
-
-      def metadata_ext(node, xml)
-        super
-        metadata_security(node, xml)
-      end
-
       def title_validate(root)
         nil
       end
@@ -121,7 +117,7 @@ module Asciidoctor
         content_validate(doc)
         schema_validate(formattedstr_strip(doc.dup),
                         configuration.validate_rng_file ||
-                          File.join(File.dirname(__FILE__), "acme.rng"))
+                        File.join(File.dirname(__FILE__), "acme.rng"))
       end
 
       def html_path_acme(file)
@@ -154,6 +150,14 @@ module Asciidoctor
       def configuration
         Metanorma::Acme.configuration
       end
+
+      def boilerplate_isodoc(xmldoc)
+        conv = super
+        Metanorma::Acme::Configuration::CONFIG_ATTRS.each do |a|
+          conv.labels[a] = configuration.send a
+        end
+        conv
+      end
     end
   end
 end

data/lib/isodoc/acme/base_convert.rb

@@ -5,19 +5,13 @@ require "fileutils"
 module IsoDoc
   module Acme
     module BaseConvert
-      #def convert1(docxml, filename, dir)
-      #  FileUtils.cp html_doc_path('logo.jpg'), File.join(@localdir, "logo.jpg")
-      #  @files_to_delete << File.join(@localdir, "logo.jpg")
-      #  super
-      #end
-
       def metadata_init(lang, script, labels)
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        super
+      def baselocation(loc)
+        return nil if loc.nil?
+        File.expand_path(File.join(File.dirname(self.class::_file || __FILE__), "..", "..", "..", loc))
       end
 
       def annex_name(annex, name, div)

data/lib/isodoc/acme/html_convert.rb

@@ -13,6 +13,14 @@ module IsoDoc
         super
       end
 
+      class << self
+        attr_accessor :_file
+      end
+
+      def self.inherited( k )
+        k._file = caller_locations.first.absolute_path
+      end
+
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
@@ -23,15 +31,15 @@ module IsoDoc
 
       def default_file_locations(_options)
         {
-          htmlstylesheet: configuration.htmlstylesheet ||
+          htmlstylesheet: baselocation(configuration.htmlstylesheet) ||
             html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: configuration.htmlcoverpage ||
+          htmlcoverpage: baselocation(configuration.htmlcoverpage) ||
             html_doc_path("html_acme_titlepage.html"),
-          htmlintropage: configuration.htmlintropage ||
+          htmlintropage: baselocation(configuration.htmlintropage) ||
             html_doc_path("html_acme_intro.html"),
-          scripts: configuration.scripts ||
+          scripts: baselocation(configuration.scripts) ||
             html_doc_path("scripts.html"),
-          i18nyaml: configuration.i18nyaml
+          i18nyaml: baselocation(configuration.i18nyaml)
         }
       end
 

data/lib/isodoc/acme/metadata.rb

@@ -8,74 +8,40 @@ module IsoDoc
         super
         here = File.dirname(__FILE__)
         default_logo_path = File.expand_path(File.join(here, "html", "logo.jpg"))
-        set(:logo, configuration.logo_path || default_logo_path)
+        set(:logo, baselocation(configuration.logo_path) || default_logo_path)
       end
 
-      def configuration
-        Metanorma::Acme.configuration
-      end
-
-      def author(isoxml, _out)
-        super
-        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
-        set(:tc, tc.text) if tc
+      class << self
+        attr_accessor :_file
       end
 
-      def docid(isoxml, _out)
-        docnumber = isoxml.at(ns("//bibdata/docidentifier"))
-        docstatus = isoxml.at(ns("//bibdata/status/stage"))
-        dn = docnumber&.text
-        if docstatus
-          abbr = status_abbr(docstatus.text)
-          dn = "#{dn}(#{abbr})" unless abbr.empty?
-        end
-        set(:docnumber, dn)
+      def self.inherited( k )
+        k._file = caller_locations.first.absolute_path
       end
 
-      def status_abbr(status)
-        case status
-        when "working-draft" then "wd"
-        when "committee-draft" then "cd"
-        when "draft-standard" then "d"
-        else
-          ""
-        end
+      def baselocation(loc)
+        return nil if loc.nil?
+        File.expand_path(File.join(File.dirname(self.class::_file || __FILE__), "..", "..", "..", loc))
       end
 
-      def unpublished(status)
-        !%w(published withdrawn).include? status.downcase
+      def configuration
+        Metanorma::Acme.configuration
       end
 
-      def version(isoxml, _out)
+      def author(isoxml, _out)
         super
-        revdate = get[:revdate]
-        set(:revdate_monthyear, monthyr(revdate))
+        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
+        set(:tc, tc.text) if tc
       end
 
-      MONTHS = {
-        "01": "January",
-        "02": "February",
-        "03": "March",
-        "04": "April",
-        "05": "May",
-        "06": "June",
-        "07": "July",
-        "08": "August",
-        "09": "September",
-        "10": "October",
-        "11": "November",
-        "12": "December",
-      }.freeze
-
-      def monthyr(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo]
-        return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
+      def stage_abbr(status)
+        return super unless configuration.stage_abbreviations
+        Hash(configuration.stage_abbreviations).dig(status)
       end
 
-      def security(isoxml, _out)
-        security = isoxml.at(ns("//bibdata/ext/security")) || return
-        set(:security, security.text)
+      def unpublished(status)
+        stages = configuration&.published_stages || ["published"]
+        !(Array(stages).map { |m| m.downcase }.include? status.downcase)
       end
     end
   end

data/lib/isodoc/acme/pdf_convert.rb

@@ -11,6 +11,14 @@ module IsoDoc
         super
       end
 
+      class << self
+        attr_accessor :_file
+      end
+
+      def self.inherited( k )
+        k._file = caller_locations.first.absolute_path
+      end
+
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
@@ -21,13 +29,13 @@ module IsoDoc
 
       def default_file_locations(_options)
         {
-          htmlstylesheet: configuration.htmlstylesheet ||
+          htmlstylesheet: baselocation(configuration.htmlstylesheet) ||
             html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: configuration.htmlcoverpage ||
+          htmlcoverpage: baselocation(configuration.htmlcoverpage) ||
             html_doc_path("html_acme_titlepage.html"),
-          htmlintropage: configuration.htmlintropage ||
+          htmlintropage: baselocation(configuration.htmlintropage) ||
             html_doc_path("html_acme_intro.html"),
-          scripts_pdf: configuration.scripts_pdf ||
+          scripts_pdf: baselocation(configuration.scripts_pdf) ||
             html_doc_path("scripts.pdf.html")
         }
       end

data/lib/isodoc/acme/word_convert.rb

@@ -12,6 +12,14 @@ module IsoDoc
         super
       end
 
+      class << self
+        attr_accessor :_file
+      end
+
+      def self.inherited( k )
+        k._file = caller_locations.first.absolute_path
+      end
+
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
@@ -22,17 +30,17 @@ module IsoDoc
 
       def default_file_locations(options)
         {
-          wordstylesheet: configuration.wordstylesheet ||
+          wordstylesheet: baselocation(configuration.wordstylesheet) ||
             html_doc_path("wordstyle.scss"),
-          standardstylesheet: configuration.standardstylesheet ||
+          standardstylesheet: baselocation(configuration.standardstylesheet) ||
             html_doc_path("acme.scss"),
-          header: configuration.header ||
+          header: baselocation(configuration.header) ||
             html_doc_path("header.html"),
-          wordcoverpage: configuration.wordcoverpage ||
+          wordcoverpage: baselocation(configuration.wordcoverpage) ||
             html_doc_path("word_acme_titlepage.html"),
-          wordintropage: configuration.wordintropage ||
+          wordintropage: baselocation(configuration.wordintropage) ||
             html_doc_path("word_acme_intro.html"),
-          i18nyaml: configuration.i18nyaml,
+          i18nyaml: baselocation(configuration.i18nyaml),
           ulstyle: "l3",
           olstyle: "l2",
         }

data/lib/metanorma/acme.rb

@@ -1,12 +1,13 @@
 require "metanorma/acme/processor"
 require "metanorma/acme/version"
 require 'forwardable'
+require 'yaml'
 
 module Metanorma
   module Acme
     ORGANIZATION_NAME_SHORT = "Acme"
     ORGANIZATION_NAME_LONG = "Acme Corp."
-    DOCUMENT_NAMESPACE = "https://open.ribose.com/standards/acme"
+    DOCUMENT_NAMESPACE = "https://metanorma.org/ns/acme"
     YAML_CONFIG_FILE = 'metanorma.yml'
 
     class Configuration
@@ -14,12 +15,15 @@ module Metanorma
         organization_name_short
         organization_name_long
         document_namespace
+        docid_template
         i18nyaml
         logo_path
         header
         htmlcoverpage
         htmlintropage
         htmlstylesheet
+        published_stages
+        stage_abbreviations
         scripts
         scripts_pdf
         standardstylesheet

data/lib/metanorma/acme/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Acme
-    VERSION = "1.4.0"
+    VERSION = "1.4.1"
   end
 end

data/metanorma.yml.example

@@ -13,4 +13,7 @@ standardstylesheet: /metanorma-mine/lib/isodoc/mine/html/
 header: /metanorma-mine/lib/isodoc/mine/html/header.html
 wordcoverpage: /metanorma-mine/lib/isodoc/mine/html/word_mine_titlepage.html
 wordintropage: /metanorma-mine/lib/isodoc/mine/html/word_mine_intro.html
-wordstylesheet: /metanorma-mine/lib/isodoc/mine/html/wordstyle.scss
+wordstylesheet: /metanorma-mine/lib/isodoc/mine/html/wordstyle.scss
+docid_template: "{{ organization_name_short }} {{ docnumeric }}"
+published_stages:
+  - published

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-acme
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities