relaton-render 1.3.0 → 1.4.0.pre.alpha.2

data/lib/relaton/render/iso690/template.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Relaton
+  module Render
+    module Iso690
+      # A citation template as declared in a style instance: literal text
+      # interleaved with {{slot}} placeholders resolved against the ISO 690
+      # data element inventory. A leading literal attaches to the first
+      # slot, and a literal between two slots to the preceding one, so an
+      # absent field never orphans punctuation around it. The last rendered
+      # slot gives up its trailing literal in favour of the template
+      # terminator, appended once when any field rendered and the output
+      # does not already end with it.
+      class Template
+        SLOT = /\{\{\s*([\w-]+)\s*\}\}/.freeze
+
+        Field = Struct.new(:present?, :text)
+
+        def initialize(source)
+          @slots = []
+          @terminator = ""
+          scan(source.to_s)
+        end
+
+        def evaluate(fields)
+          rendered = @slots.filter_map do |(name, head, tail)|
+            field = fields[normalise(name)] or next
+            next unless field.present?
+
+            [head, field.text, tail]
+          end
+          return "" if rendered.empty?
+
+          terminate(rendered.each_with_index.map do |(head, text, tail), i|
+            i == rendered.size - 1 ? "#{head}#{text}" : "#{head}#{text}#{tail}"
+          end.join).rstrip
+        end
+
+        private
+
+        def scan(source)
+          rest = source
+          while (slot = SLOT.match(rest))
+            head = @slots.empty? ? rest[0...slot.begin(0)] : ""
+            @slots << [slot[1], head, ""]
+            rest = rest[slot.end(0)..]
+            following = SLOT.match(rest)
+            boundary = following ? following.begin(0) : rest.length
+            literal = rest[0...boundary]
+            if following
+              @slots.last[2] = literal
+            else
+              @terminator = literal
+            end
+            rest = rest[boundary..]
+          end
+        end
+
+        def terminate(body)
+          return body if @terminator.strip.empty?
+          return body if body.rstrip.end_with?(@terminator.strip)
+
+          "#{body}#{@terminator}"
+        end
+
+        def normalise(slot)
+          slot.to_s.delete("_").downcase
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/iso690.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Relaton
+  module Render
+    # Citation rendering per the ISO 690 architecture: a style instance
+    # places the inventory's data elements (clause 7) in each resource
+    # kind's order (clause 8); the engine is a template evaluator over a
+    # field resolver and holds no styles, no vocabularies, no i18n.
+    # The v1 compatibility facade (relaton-render#90): isodoc's
+    # render-isodoc subclasses Relaton::Render::General.
+    autoload :General, "relaton/render/general"
+
+    module Iso690
+      autoload :Element, "relaton/render/iso690/element"
+      autoload :Elements, "relaton/render/iso690/elements"
+      autoload :Fields, "relaton/render/iso690/fields"
+      autoload :I18n, "relaton/render/iso690/i18n"
+      autoload :IndexRenderer, "relaton/render/iso690/index_renderer"
+      autoload :IdentifierKinds, "relaton/render/iso690/identifier_kinds"
+      autoload :Kinds, "relaton/render/iso690/kinds"
+      autoload :Renderer, "relaton/render/iso690/renderer"
+      autoload :Style, "relaton/render/iso690/style"
+      autoload :Template, "relaton/render/iso690/template"
+    end
+  end
+end

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "1.3.0".freeze
+    VERSION = "1.4.0.pre.alpha.2".freeze
   end
 end

data/lib/relaton-render.rb

@@ -1,8 +1,4 @@
+# frozen_string_literal: true
+
 require "relaton/render/version"
-require "relaton/render/general/render"
-require "relaton/render/fields/fields"
-require "relaton/render/parse/parse"
-require "relaton/render/i18n/i18n"
-require "isodoc/i18n"
-require "base64" # Liquid
-require "bigdecimal" # Liquid
+require "relaton/render/iso690"

data/relaton-render.gemspec

@@ -19,25 +19,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "canon"
-  spec.add_development_dependency "debug"
-  spec.add_development_dependency "isodoc"
-  spec.add_development_dependency "openssl"
-  spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "simplecov"
-
-  spec.add_dependency "base64" # Liquid
-  spec.add_dependency "bigdecimal" # Liquid
-  spec.add_dependency "isodoc-i18n", "~> 1.5.0"
-  spec.add_dependency "liquid", "~> 5"
-  spec.add_dependency "metanorma-utils", "~> 2"
-  spec.add_dependency "nokogiri"
-  spec.add_dependency "relaton-bib", ">= 2.0.0.pre.alpha.6", "< 3"
-  spec.add_dependency "twitter_cldr"
-  spec.add_dependency "tzinfo-data" # we need this for windows only
+  spec.add_dependency "lutaml-model"
   # spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,247 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-15 00:00:00.000000000 Z
+date: 2026-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: canon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: openssl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bigdecimal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: isodoc-i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: liquid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: metanorma-utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: relaton-bib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: twitter_cldr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: tzinfo-data
+  name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -284,21 +54,38 @@ files:
 - lib/isodoc-yaml/i18n-zh-Hant.yaml
 - lib/isodoc/i18n.rb
 - lib/relaton-render.rb
-- lib/relaton/render/fields/date.rb
-- lib/relaton/render/fields/fields.rb
-- lib/relaton/render/general/citations.rb
-- lib/relaton/render/general/config.yml
-- lib/relaton/render/general/render.rb
-- lib/relaton/render/general/render_classes.rb
-- lib/relaton/render/general/uri.rb
-- lib/relaton/render/i18n/i18n.rb
-- lib/relaton/render/parse/parse.rb
-- lib/relaton/render/parse/parse_contributors.rb
-- lib/relaton/render/parse/parse_extract.rb
-- lib/relaton/render/parse/parse_id.rb
-- lib/relaton/render/template/liquid.rb
-- lib/relaton/render/template/subclasses.rb
-- lib/relaton/render/template/template.rb
+- lib/relaton/render/general.rb
+- lib/relaton/render/iso690.rb
+- lib/relaton/render/iso690/element.rb
+- lib/relaton/render/iso690/elements.rb
+- lib/relaton/render/iso690/elements/component_part.rb
+- lib/relaton/render/iso690/elements/creator.rb
+- lib/relaton/render/iso690/elements/edition.rb
+- lib/relaton/render/iso690/elements/identifier.rb
+- lib/relaton/render/iso690/elements/location.rb
+- lib/relaton/render/iso690/elements/medium.rb
+- lib/relaton/render/iso690/elements/numeration.rb
+- lib/relaton/render/iso690/elements/production.rb
+- lib/relaton/render/iso690/elements/pub_date.rb
+- lib/relaton/render/iso690/elements/series.rb
+- lib/relaton/render/iso690/elements/title.rb
+- lib/relaton/render/iso690/fields.rb
+- lib/relaton/render/iso690/i18n.rb
+- lib/relaton/render/iso690/i18n/en.yml
+- lib/relaton/render/iso690/i18n/fr.yml
+- lib/relaton/render/iso690/identifier_kinds.rb
+- lib/relaton/render/iso690/index_renderer.rb
+- lib/relaton/render/iso690/kinds.rb
+- lib/relaton/render/iso690/renderer.rb
+- lib/relaton/render/iso690/style.rb
+- lib/relaton/render/iso690/style/locale.rb
+- lib/relaton/render/iso690/style/name_form.rb
+- lib/relaton/render/iso690/style/scheme.rb
+- lib/relaton/render/iso690/style/sort_rule.rb
+- lib/relaton/render/iso690/style/template_map.rb
+- lib/relaton/render/iso690/style/type_template.rb
+- lib/relaton/render/iso690/styles/author-date.yml
+- lib/relaton/render/iso690/template.rb
 - lib/relaton/render/version.rb
 - relaton-render.gemspec
 homepage: https://github.com/relaton/relaton-render
@@ -313,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/relaton/render/fields/date.rb

@@ -1,48 +0,0 @@
-module Relaton
-  module Render
-    class Date
-      def initialize(date, options)
-        @date = date
-        @r = options[:renderer]
-        @type = options[:type]
-        @bibitem = options[:bibitem]
-      end
-
-      def render
-        return @date if @date.nil? || /^\d+$/.match?(@date)
-
-        render1(granularity)
-      end
-
-      # @r.date is using document language setting, not citation-specific
-      def render1(format)
-        datef = dateparse(format, @r.lang.to_sym)
-        case @r.date[format]
-        when "to_full_s", "to_long_s", "to_medium_s", "to_short_s"
-          datef.send @r.date[format]
-        else
-          datef.to_additional_s(@r.date[format])
-        end
-      end
-
-      def granularity
-        case @date
-        when /^\d+-\d+$/ then "month_year"
-        when /^\d+-\d+-\d+$/ then "day_month_year"
-        else "date_time"
-        end
-      end
-
-      def dateparse(format, lang)
-        case format
-        when "date_time"
-          DateTime.parse(@date).localize(lang, timezone: "Zulu")
-        when "day_month_year"
-          DateTime.parse(@date).localize(lang, timezone: "Zulu").to_date
-        when "month_year"
-          DateTime.parse("#{@date}-01").localize(lang, timezone: "Zulu").to_date
-        end
-      end
-    end
-  end
-end