RubyGems - dcc - Versions diffs - 0.2.0 → 0.2.2 - Mend

dcc 0.2.0 → 0.2.2

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.

Files changed (176) hide show

checksums.yaml +4 -4
data/.github/workflows/ci.yml +19 -0
data/.github/workflows/release.yml +28 -0
data/.gitignore +4 -0
data/.rubocop_todo.yml +560 -10
data/CHANGELOG.adoc +34 -1
data/CONTRIBUTING.adoc +8 -1
data/Gemfile +5 -7
data/README.adoc +162 -7
data/dcc.gemspec +9 -2
data/docs/schema-versions.adoc +20 -7
data/examples/build_minimal_dcc.rb +0 -0
data/examples/convert_all_formats.rb +2 -1
data/examples/parse_and_inspect.rb +0 -0
data/examples/quantity_math_demo.rb +7 -7
data/examples/validate_full.rb +1 -1
data/lib/dcc/base/calibration_laboratory.rb +2 -1
data/lib/dcc/base/condition.rb +5 -2
data/lib/dcc/base/core_data.rb +8 -3
data/lib/dcc/base/formula.rb +3 -3
data/lib/dcc/base/identification.rb +6 -3
data/lib/dcc/base/mathml.rb +33 -0
data/lib/dcc/base/quantity.rb +2 -1
data/lib/dcc/base/resp_person.rb +4 -2
data/lib/dcc/base/text.rb +1 -1
data/lib/dcc/base.rb +2 -1
data/lib/dcc/builder/dsl.rb +1 -1
data/lib/dcc/builder/session.rb +16 -14
data/lib/dcc/builder.rb +3 -3
data/lib/dcc/cli/cli.rb +152 -26
data/lib/dcc/cli/formatters.rb +35 -7
data/lib/dcc/cli.rb +1 -1
data/lib/dcc/context_configuration.rb +2 -1
data/lib/dcc/context_options.rb +4 -2
data/lib/dcc/convert/csv.rb +27 -9
data/lib/dcc/convert/html.rb +26 -110
data/lib/dcc/convert/json.rb +10 -7
data/lib/dcc/convert/liquid_filters.rb +58 -0
data/lib/dcc/convert/result.rb +1 -1
data/lib/dcc/convert/templates/report.liquid +250 -0
data/lib/dcc/convert/yaml.rb +1 -1
data/lib/dcc/convert.rb +1 -0
data/lib/dcc/diff/change.rb +1 -1
data/lib/dcc/diff/result.rb +8 -4
data/lib/dcc/diff.rb +43 -11
data/lib/dcc/error.rb +7 -0
data/lib/dcc/extract/file.rb +3 -4
data/lib/dcc/extract/formula/ast.rb +137 -0
data/lib/dcc/extract/formula/evaluator.rb +357 -0
data/lib/dcc/extract/formula/parser.rb +305 -0
data/lib/dcc/extract/formula/quantity.rb +89 -0
data/lib/dcc/extract/formula.rb +110 -0
data/lib/dcc/extract/ring.rb +1 -1
data/lib/dcc/extract.rb +1 -1
data/lib/dcc/i18n/text_lookup.rb +8 -4
data/lib/dcc/i18n.rb +1 -1
data/lib/dcc/inspect/report.rb +51 -14
data/lib/dcc/inspect.rb +1 -1
data/lib/dcc/migrate/route.rb +44 -0
data/lib/dcc/migrate/v2_to_v3.rb +445 -0
data/lib/dcc/migrate.rb +130 -26
data/lib/dcc/plugin/base.rb +64 -0
data/lib/dcc/plugin/registry.rb +7 -2
data/lib/dcc/plugin.rb +6 -2
data/lib/dcc/quantity_format/formatter.rb +16 -10
data/lib/dcc/quantity_format.rb +1 -1
data/lib/dcc/quantity_math/complex.rb +252 -0
data/lib/dcc/quantity_math/matrix.rb +217 -0
data/lib/dcc/quantity_math/quantity.rb +1 -1
data/lib/dcc/quantity_math/real.rb +6 -6
data/lib/dcc/quantity_math.rb +31 -3
data/lib/dcc/schema/version.rb +2 -2
data/lib/dcc/server/app.html +282 -0
data/lib/dcc/server/app.rb +171 -87
data/lib/dcc/server/demo_cert.xml +244 -0
data/lib/dcc/server/storage/entry.rb +1 -1
data/lib/dcc/server/storage/memory.rb +3 -2
data/lib/dcc/server/storage.rb +1 -1
data/lib/dcc/server.rb +1 -1
data/lib/dcc/si/base/complex.rb +1 -1
data/lib/dcc/si/base/complex_list_xml_list.rb +1 -1
data/lib/dcc/si/base/constant.rb +1 -1
data/lib/dcc/si/base/coverage_interval.rb +36 -0
data/lib/dcc/si/base/coverage_interval_mu.rb +1 -1
data/lib/dcc/si/base/expanded_mu.rb +1 -1
data/lib/dcc/si/base/expanded_unc.rb +34 -0
data/lib/dcc/si/base/expanded_unc_xml_list.rb +3 -2
data/lib/dcc/si/base/hybrid.rb +3 -2
data/lib/dcc/si/base/measurement_uncertainty_univariate.rb +1 -1
data/lib/dcc/si/base/real.rb +13 -3
data/lib/dcc/si/base/real_list_xml_list.rb +5 -3
data/lib/dcc/si/base/si_list.rb +3 -2
data/lib/dcc/si/base/standard_mu.rb +1 -1
data/lib/dcc/si/base.rb +5 -2
data/lib/dcc/si/v1/coverage_interval.rb +8 -0
data/lib/dcc/si/v1/expanded_unc.rb +1 -16
data/lib/dcc/si/v1/measurement_uncertainty_univariate.rb +2 -1
data/lib/dcc/si/v1.rb +5 -2
data/lib/dcc/si/v2/coverage_interval.rb +8 -0
data/lib/dcc/si/v2/coverage_interval_mu_xml_list.rb +4 -2
data/lib/dcc/si/v2/expanded_mu_xml_list.rb +2 -1
data/lib/dcc/si/v2/expanded_unc.rb +8 -0
data/lib/dcc/si/v2/measurement_uncertainty_univariate.rb +2 -1
data/lib/dcc/si/v2.rb +8 -3
data/lib/dcc/signature/result.rb +2 -2
data/lib/dcc/signature/signer.rb +31 -18
data/lib/dcc/signature/verifier.rb +23 -21
data/lib/dcc/signature.rb +1 -1
data/lib/dcc/streaming/reader.rb +246 -0
data/lib/dcc/streaming.rb +79 -0
data/lib/dcc/transform/result.rb +1 -1
data/lib/dcc/transform/xslt.rb +22 -12
data/lib/dcc/transform.rb +5 -4
data/lib/dcc/type/base64_binary.rb +5 -3
data/lib/dcc/type/decimal_xml_list.rb +99 -13
data/lib/dcc/type/iso_country_code.rb +3 -2
data/lib/dcc/type/iso_language_code.rb +3 -2
data/lib/dcc/type/schema_version.rb +3 -2
data/lib/dcc/type/si_unit.rb +3 -2
data/lib/dcc/type_guards.rb +3 -3
data/lib/dcc/v2/calibration_laboratory.rb +2 -1
data/lib/dcc/v2/condition.rb +22 -1
data/lib/dcc/v2/configuration.rb +1 -1
data/lib/dcc/v2/digital_calibration_certificate.rb +2 -1
data/lib/dcc/v2/identification.rb +14 -1
data/lib/dcc/v2/mathml.rb +8 -0
data/lib/dcc/v2/measurement_meta_data_list.rb +2 -1
data/lib/dcc/v2/quantity.rb +4 -2
data/lib/dcc/v2.rb +4 -2
data/lib/dcc/v3/calibration_laboratory.rb +2 -1
data/lib/dcc/v3/configuration.rb +1 -1
data/lib/dcc/v3/digital_calibration_certificate.rb +2 -1
data/lib/dcc/v3/mathml.rb +8 -0
data/lib/dcc/v3/measurement_meta_data_list.rb +2 -1
data/lib/dcc/v3/quantity.rb +4 -2
data/lib/dcc/v3.rb +12 -2
data/lib/dcc/validate/business_rules.rb +23 -9
data/lib/dcc/validate/issue.rb +2 -1
data/lib/dcc/validate/result.rb +6 -4
data/lib/dcc/validate/schematron/profile.rb +73 -18
data/lib/dcc/validate/schematron/rule.rb +13 -3
data/lib/dcc/validate/schematron/rules/administrative_data_completeness.rb +11 -4
data/lib/dcc/validate/schematron/rules/base.rb +1 -2
data/lib/dcc/validate/schematron/rules/date_range_check.rb +11 -5
data/lib/dcc/validate/schematron/rules/id_refid_linking.rb +0 -3
data/lib/dcc/validate/schematron/rules/influence_conditions_placement.rb +22 -12
data/lib/dcc/validate/schematron/rules/iso_code_validation.rb +31 -14
data/lib/dcc/validate/schematron/rules/language_code_dedup.rb +12 -5
data/lib/dcc/validate/schematron/rules/non_si_declaration.rb +7 -4
data/lib/dcc/validate/schematron/rules/release_format_check.rb +7 -4
data/lib/dcc/validate/schematron/rules/schema_version_check.rb +13 -9
data/lib/dcc/validate/schematron/rules/uncertainty_consistency.rb +39 -10
data/lib/dcc/validate/schematron/rules/unit_format_check.rb +2 -3
data/lib/dcc/validate/schematron/rules/used_methods_placement.rb +15 -10
data/lib/dcc/validate/schematron/rules/used_software_placement.rb +15 -10
data/lib/dcc/validate/schematron/rules/xml_list_spacing.rb +4 -3
data/lib/dcc/validate/schematron/rules.rb +28 -14
data/lib/dcc/validate/schematron.rb +1 -1
data/lib/dcc/validate/xsd.rb +9 -3
data/lib/dcc/validate.rb +1 -1
data/lib/dcc/version.rb +1 -1
data/lib/dcc/versioned_parser.rb +1 -1
data/lib/dcc.rb +68 -10
data/sample_dcc.xml +140 -0
data/web/index.html +12 -0
data/web/package-lock.json +1599 -0
data/web/package.json +22 -0
data/web/src/App.vue +349 -0
data/web/src/lib/builder.ts +171 -0
data/web/src/lib/dcc.ts +338 -0
data/web/src/lib/units.json +5581 -0
data/web/src/main.ts +5 -0
data/web/src/style.css +27 -0
data/web/tsconfig.json +15 -0
data/web/vite.config.ts +14 -0
metadata +148 -9

data/lib/dcc/convert/html.rb CHANGED Viewed

@@ -1,127 +1,43 @@
 # frozen_string_literal: true
+require "liquid"
 module Dcc
   module Convert
-    # `Dcc::Convert::Html` renders a parsed DCC into a human-readable HTML
-    # report with collapsible sections per administrative section and
-    # measurement result.
     module Html
-      class << self
-        # @param dcc [Lutaml::Model::Serializable]
-        # @return [Dcc::Convert::Result]
-        def call(dcc)
-          payload = <<~HTML
-            <!DOCTYPE html>
-            <html lang="en">
-            <head>
-              <meta charset="utf-8">
-              <title>DCC Report #{escape(unique_identifier_of(dcc))}</title>
-              <style>
-                body { font-family: -apple-system, system-ui, sans-serif; margin: 2rem; }
-                h1, h2, h3 { color: #333; }
-                section { margin-bottom: 1.5rem; padding: 1rem; border: 1px solid #eee; border-radius: 4px; }
-                table { border-collapse: collapse; }
-                th, td { border: 1px solid #ddd; padding: 0.5rem 1rem; text-align: left; }
-                th { background: #f5f5f5; }
-              </style>
-            </head>
-            <body>
-              <h1>Digital Calibration Certificate</h1>
-              #{summary_table(dcc)}
-              #{administrative_section(dcc)}
-              #{measurement_section(dcc)}
-            </body>
-            </html>
-          HTML
+      TEMPLATE_PATH = File.expand_path("templates/report.liquid",
+                                       __dir__).freeze
+      class << self
+        def call(dcc_or_xml, lang: nil)
+          if dcc_or_xml.is_a?(::String)
+            xml = dcc_or_xml
+            hash = ::Dcc::Convert::Json.xml_to_hash(xml)
+            schema_version = hash["schemaVersion"]
+            source_class = "xml"
+          else
+            xml = dcc_or_xml.to_xml
+            hash = ::Dcc::Convert::Json.xml_to_hash(xml)
+            schema_version = dcc_or_xml.schema_version.to_s
+            source_class = dcc_or_xml.class.name
+          end
+          rendered = render_template(hash, lang: lang)
           ::Dcc::Convert::Result.new(
             format: :html,
-            payload: payload,
-            source_class: dcc.class.name,
-            schema_version: dcc.schema_version.to_s,
+            payload: rendered,
+            source_class: source_class,
+            schema_version: schema_version,
           )
         end
         private
-        def summary_table(dcc)
-          <<~HTML
-            <section>
-              <h2>Identity</h2>
-              <table>
-                <tr><th>Schema version</th><td>#{escape(dcc.schema_version)}</td></tr>
-                <tr><th>Unique identifier</th><td>#{escape(unique_identifier_of(dcc))}</td></tr>
-                <tr><th>Country</th><td>#{escape(country_of(dcc))}</td></tr>
-              </table>
-            </section>
-          HTML
-        end
-        def administrative_section(dcc)
-          return "" unless Dcc::TypeGuards.has_attribute?(dcc, :administrative_data) && dcc.administrative_data
-          admin = dcc.administrative_data
-          items = Dcc::TypeGuards.has_attribute?(admin, :items) && admin.items ? Array(admin.items.item) : []
-          <<~HTML
-            <section>
-              <h2>Items (#{items.size})</h2>
-              <ul>
-                #{items.map { |i| "<li>#{escape(name_of(i))}</li>" }.join("\n")}
-              </ul>
-            </section>
-          HTML
-        end
-        def measurement_section(dcc)
-          return "" unless Dcc::TypeGuards.has_attribute?(dcc, :measurement_results) && dcc.measurement_results
-          mrs = Array(dcc.measurement_results.measurement_result)
-          <<~HTML
-            <section>
-              <h2>Measurement Results (#{mrs.size})</h2>
-              <ul>
-                #{mrs.map { |mr| "<li>#{escape(name_of(mr))}</li>" }.join("\n")}
-              </ul>
-            </section>
-          HTML
-        end
-        def unique_identifier_of(dcc)
-          Dcc::TypeGuards.has_attribute?(dcc, :administrative_data) &&
-            Dcc::TypeGuards.has_attribute?(dcc.administrative_data, :core_data) &&
-            dcc.administrative_data.core_data &&
-            dcc.administrative_data.core_data.unique_identifier.to_s
-        end
-        def country_of(dcc)
-          Dcc::TypeGuards.has_attribute?(dcc, :administrative_data) &&
-            Dcc::TypeGuards.has_attribute?(dcc.administrative_data, :core_data) &&
-            dcc.administrative_data.core_data &&
-            dcc.administrative_data.core_data.country_code_iso_3166_1.to_s
-        end
-        def name_of(node)
-          return "" unless node && Dcc::TypeGuards.has_attribute?(node, :name)
-          return "" unless node.name
-          content = Dcc::TypeGuards.has_attribute?(node.name, :content) ? node.name.content : []
-          first = Array(content).first
-          return "" unless first
-          vals = Dcc::TypeGuards.has_attribute?(first, :value) ? first.value : []
-          Array(vals).first.to_s
-        end
-        def escape(s)
-          return "" if s.nil?
-          s.to_s
-            .gsub("&", "&amp;")
-            .gsub("<", "&lt;")
-            .gsub(">", "&gt;")
-            .gsub('"', "&quot;")
+        def render_template(hash, lang:)
+          template = ::Liquid::Template.parse(File.read(TEMPLATE_PATH))
+          template.render({ "dcc" => hash, "page_lang" => lang },
+                          filters: [::Dcc::Convert::LiquidFilters])
         end
       end
     end
   end
-end
+end

data/lib/dcc/convert/json.rb CHANGED Viewed

@@ -45,18 +45,21 @@ module Dcc
             return hash
           end
+          grouped = {}
           children.each do |child|
             name = child.name.to_s.split(":").last
-            value = element_to_hash(child)
-            if hash.key?(name)
-              hash[name] = Array(hash[name]) << value
-            else
-              hash[name] = value
-            end
+            grouped[name] ||= []
+            grouped[name] << child
           end
+          grouped.each do |name, child_list|
+            values = child_list.map { |c| element_to_hash(c) }
+            hash[name] = values.size == 1 ? values.first : values
+          end
+          hash["_text"] = combined_text unless combined_text.empty?
           hash
         end
       end
     end
   end
-end
+end

data/lib/dcc/convert/liquid_filters.rb ADDED Viewed

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+module Dcc
+  module Convert
+    module LiquidFilters
+      def dcc_text(content, lang = nil)
+        return "" if content.nil? || content == ""
+        case content
+        when ::String
+          content
+        when ::Hash
+          content["_text"] || content[:_text] || content.to_s
+        when ::Array
+          if lang
+            entry = content.find do |c|
+              c.is_a?(::Hash) && (c["lang"] == lang || c[:lang] == lang)
+            end
+            return dcc_text(entry, lang) if entry
+          end
+          first = content.find { |c| c.is_a?(::Hash) }
+          first ? (first["_text"] || first[:_text] || "") : ""
+        else
+          content.to_s
+        end
+      end
+      def dcc_initials(name)
+        return "?" if name.nil? || name.empty?
+        parts = name.split
+        return parts.first[0..0].upcase if parts.size == 1
+        (parts.first[0] + parts.last[0]).upcase
+      end
+      def dcc_count(obj)
+        return 0 if obj.nil?
+        case obj
+        when ::Array then obj.size
+        when ::Hash then 1
+        else 1
+        end
+      end
+      def dcc_items(obj)
+        return [] if obj.nil?
+        case obj
+        when ::Array then obj
+        when ::Hash then [obj]
+        else [obj]
+        end
+      end
+    end
+  end
+end

data/lib/dcc/convert/result.rb CHANGED Viewed

@@ -48,4 +48,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/convert/templates/report.liquid ADDED Viewed

@@ -0,0 +1,250 @@
+<!DOCTYPE html>
+<html lang="{{ page_lang | default: 'en' }}">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>DCC {{ dcc.administrativeData.coreData.uniqueIdentifier | default: "Certificate" }}</title>
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;500;700&family=IBM+Plex+Mono:wght@300;400;500&family=IBM+Plex+Sans:wght@300;400;500;600;700&display=swap" rel="stylesheet">
+<style>
+  :root {
+    --bg: #0a0e1a; --surface: #111827; --surface-2: #1a2236;
+    --border: #1e293b; --border-hi: #334155;
+    --text: #e2e8f0; --text-dim: #94a3b8; --text-mute: #64748b;
+    --accent: #38bdf8; --accent-glow: rgba(56,189,248,0.12);
+    --green: #4ade80; --amber: #fbbf24; --red: #f87171;
+  }
+  * { margin:0; padding:0; box-sizing:border-box; }
+  body { background:var(--bg); color:var(--text); font-family:'IBM Plex Sans',sans-serif; font-size:14px; line-height:1.6; -webkit-font-smoothing:antialiased; }
+  .mono { font-family:'IBM Plex Mono',monospace; }
+  .display { font-family:'DM Sans',sans-serif; letter-spacing:-0.02em; }
+  .page { max-width:1100px; margin:0 auto; padding:2.5rem 1.5rem 4rem; }
+  .header { position:relative; border:1px solid var(--border); border-radius:16px; padding:2.5rem; background:linear-gradient(135deg,var(--surface),var(--surface-2)); overflow:hidden; margin-bottom:1.5rem; }
+  .header::before { content:''; position:absolute; top:-50%; right:-20%; width:60%; height:200%; background:radial-gradient(ellipse,var(--accent-glow) 0%,transparent 60%); pointer-events:none; }
+  .header::after { content:''; position:absolute; top:0; left:0; right:0; height:1px; background:linear-gradient(90deg,transparent,var(--accent),transparent); opacity:0.5; }
+  .header-grid { display:grid; grid-template-columns:1fr auto; gap:2rem; align-items:start; position:relative; z-index:1; }
+  .badge { display:inline-flex; align-items:center; gap:0.5rem; padding:0.35rem 0.8rem; border:1px solid var(--accent); border-radius:100px; font-size:0.7rem; font-weight:500; letter-spacing:0.1em; text-transform:uppercase; color:var(--accent); background:var(--accent-glow); margin-bottom:1rem; }
+  .badge-dot { width:6px; height:6px; border-radius:50%; background:var(--accent); animation:pulse 2s ease-in-out infinite; }
+  @keyframes pulse { 0%,100% { opacity:1; } 50% { opacity:0.3; } }
+  .header h1 { font-size:2.2rem; font-weight:700; line-height:1.1; margin-bottom:0.5rem; background:linear-gradient(180deg,#f8fafc,#94a3b8); -webkit-background-clip:text; -webkit-text-fill-color:transparent; }
+  .header .subtitle { color:var(--text-dim); font-size:0.95rem; }
+  .header .uid { font-family:'IBM Plex Mono',monospace; font-size:0.85rem; color:var(--text-mute); margin-top:0.75rem; }
+  .header-side { text-align:right; border-left:1px solid var(--border-hi); padding-left:2rem; }
+  .version-tag { font-family:'IBM Plex Mono',monospace; font-size:1.1rem; font-weight:500; color:var(--green); }
+  .version-label { font-size:0.7rem; text-transform:uppercase; letter-spacing:0.1em; color:var(--text-mute); }
+  .card { border:1px solid var(--border); border-radius:12px; background:var(--surface); overflow:hidden; animation:slideUp 0.5s ease-out both; }
+  .card + .card { margin-top:1.5rem; }
+  .card:nth-child(2) { animation-delay:0.08s; }
+  .card:nth-child(3) { animation-delay:0.16s; }
+  .card:nth-child(4) { animation-delay:0.24s; }
+  .card:nth-child(5) { animation-delay:0.32s; }
+  .card:nth-child(6) { animation-delay:0.4s; }
+  @keyframes slideUp { from { opacity:0; transform:translateY(12px); } to { opacity:1; transform:translateY(0); } }
+  .card-header { padding:1.25rem 1.5rem; border-bottom:1px solid var(--border); display:flex; align-items:center; gap:0.75rem; }
+  .card-icon { width:32px; height:32px; border-radius:8px; display:flex; align-items:center; justify-content:center; font-size:1rem; border:1px solid var(--border-hi); background:var(--surface-2); }
+  .card-title { font-size:0.85rem; font-weight:600; letter-spacing:0.08em; text-transform:uppercase; color:var(--text-dim); }
+  .card-body { padding:1.5rem; }
+  .data-grid { display:grid; grid-template-columns:repeat(auto-fill,minmax(250px,1fr)); gap:1px; background:var(--border); border:1px solid var(--border); border-radius:8px; overflow:hidden; }
+  .data-cell { background:var(--surface); padding:1rem 1.25rem; }
+  .data-label { font-size:0.7rem; text-transform:uppercase; letter-spacing:0.1em; color:var(--text-mute); margin-bottom:0.25rem; }
+  .data-value { font-size:0.95rem; color:var(--text); }
+  .data-value.mono { font-family:'IBM Plex Mono',monospace; font-size:0.9rem; }
+  .data-table { width:100%; border-collapse:collapse; }
+  .data-table th { text-align:left; padding:0.6rem 1rem; font-size:0.7rem; text-transform:uppercase; letter-spacing:0.08em; color:var(--text-mute); font-weight:500; border-bottom:1px solid var(--border-hi); }
+  .data-table td { padding:0.75rem 1rem; border-bottom:1px solid var(--border); font-size:0.875rem; }
+  .data-table tr:last-child td { border-bottom:none; }
+  .data-table tr:hover td { background:var(--surface-2); }
+  .signer { display:flex; align-items:center; gap:0.75rem; padding:0.75rem 1rem; border:1px solid var(--border); border-radius:8px; background:var(--surface-2); }
+  .signer + .signer { margin-top:0.5rem; }
+  .signer-avatar { width:36px; height:36px; border-radius:50%; display:flex; align-items:center; justify-content:center; font-weight:600; font-size:0.8rem; color:var(--surface); background:var(--accent); flex-shrink:0; }
+  .signer-name { font-weight:500; font-size:0.875rem; }
+  .signer-role { font-size:0.75rem; color:var(--text-mute); }
+  .signer-main { margin-left:auto; padding:0.2rem 0.6rem; border-radius:100px; font-size:0.65rem; font-weight:600; text-transform:uppercase; letter-spacing:0.08em; color:var(--green); border:1px solid var(--green); background:rgba(74,222,128,0.1); }
+  .mr-block { border:1px solid var(--border); border-radius:8px; padding:1.25rem; background:var(--surface-2); }
+  .mr-block + .mr-block { margin-top:0.75rem; }
+  .mr-title { font-weight:500; margin-bottom:0.75rem; }
+  @media (max-width:700px) { .header-grid { grid-template-columns:1fr; } .header-side { border-left:none; border-top:1px solid var(--border-hi); padding-left:0; padding-top:1rem; text-align:left; } }
+</style>
+</head>
+<body>
+<div class="page">
+  {% assign admin = dcc.administrativeData %}
+  {% assign core = admin.coreData %}
+  {% assign lab = admin.calibrationLaboratory %}
+  {% assign results = dcc.measurementResults %}
+  <!-- Header -->
+  <div class="header">
+    <div class="header-grid">
+      <div>
+        <div class="badge"><span class="badge-dot"></span> Digital Calibration Certificate</div>
+        {% assign item_obj = admin.items.item %}
+        <h1 class="display">{{ item_obj.name.content | dcc_text | default: "Calibration Certificate" }}</h1>
+        <p class="subtitle">{{ lab.contact.name.content | dcc_text | default: "" }}</p>
+        <p class="uid mono">ID: {{ core.uniqueIdentifier | default: "—" }}</p>
+      </div>
+      <div class="header-side">
+        <div class="version-label">Schema</div>
+        <div class="version-tag mono">v{{ dcc.schemaVersion }}</div>
+        {% if core.countryCodeISO3166_1 %}
+        <div style="margin-top:0.5rem;">
+          <div class="version-label">Country</div>
+          <div class="mono" style="font-size:1.1rem;">{{ core.countryCodeISO3166_1 }}</div>
+        </div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+  <!-- Core Data -->
+  <div class="card">
+    <div class="card-header"><div class="card-icon">&#9881;</div><span class="card-title">Core Data</span></div>
+    <div class="card-body">
+      <div class="data-grid">
+        <div class="data-cell"><div class="data-label">Unique ID</div><div class="data-value mono">{{ core.uniqueIdentifier | default: "—" }}</div></div>
+        {% if core.receiptDate %}<div class="data-cell"><div class="data-label">Receipt Date</div><div class="data-value mono">{{ core.receiptDate }}</div></div>{% endif %}
+        {% if core.beginPerformanceDate %}<div class="data-cell"><div class="data-label">Performance Begin</div><div class="data-value mono">{{ core.beginPerformanceDate }}</div></div>{% endif %}
+        {% if core.endPerformanceDate %}<div class="data-cell"><div class="data-label">Performance End</div><div class="data-value mono">{{ core.endPerformanceDate }}</div></div>{% endif %}
+        {% if core.usedLangCodeISO639_1 %}<div class="data-cell"><div class="data-label">Languages</div><div class="data-value mono">{{ core.usedLangCodeISO639_1 | dcc_items | join: ", " }}</div></div>{% endif %}
+        {% if core.mandatoryLangCodeISO639_1 %}<div class="data-cell"><div class="data-label">Mandatory Language</div><div class="data-value mono">{{ core.mandatoryLangCodeISO639_1 }}</div></div>{% endif %}
+      </div>
+    </div>
+  </div>
+  <!-- Items -->
+  {% assign items_data = admin.items.item %}
+  {% if items_data %}
+  <div class="card">
+    <div class="card-header"><div class="card-icon">&#9776;</div><span class="card-title">Calibrated Item</span></div>
+    <div class="card-body">
+      {% if items_data.name %}
+        {% assign item = items_data %}
+        <div class="data-grid">
+          <div class="data-cell"><div class="data-label">Name</div><div class="data-value">{{ item.name.content | dcc_text | default: "—" }}</div></div>
+          {% if item.model %}<div class="data-cell"><div class="data-label">Model</div><div class="data-value">{{ item.model }}</div></div>{% endif %}
+          {% if item.manufacturer %}<div class="data-cell"><div class="data-label">Manufacturer</div><div class="data-value">{{ item.manufacturer.name.content | dcc_text }}</div></div>{% endif %}
+        </div>
+        {% if item.identifications %}
+        <table class="data-table" style="margin-top:0.75rem;">
+          <thead><tr><th>Identification</th><th>Issuer</th></tr></thead>
+          <tbody>
+          {% assign ids = item.identifications.identification %}
+          {% if ids.name %}
+            <tr><td class="mono">{{ ids.value }}</td><td>{{ ids.issuer }}</td></tr>
+          {% else %}
+            {% for id in ids %}<tr><td class="mono">{{ id.value }}</td><td>{{ id.issuer }}</td></tr>{% endfor %}
+          {% endif %}
+          </tbody>
+        </table>
+        {% endif %}
+      {% else %}
+        {% for item in items_data %}
+        <div class="data-grid">
+          <div class="data-cell"><div class="data-label">Name</div><div class="data-value">{{ item.name.content | dcc_text | default: "—" }}</div></div>
+          {% if item.model %}<div class="data-cell"><div class="data-label">Model</div><div class="data-value">{{ item.model }}</div></div>{% endif %}
+          {% if item.manufacturer %}<div class="data-cell"><div class="data-label">Manufacturer</div><div class="data-value">{{ item.manufacturer.name.content | dcc_text }}</div></div>{% endif %}
+        </div>
+        {% endfor %}
+      {% endif %}
+    </div>
+  </div>
+  {% endif %}
+  <!-- Calibration Laboratory -->
+  {% if lab.contact %}
+  <div class="card">
+    <div class="card-header"><div class="card-icon">&#9745;</div><span class="card-title">Calibration Laboratory</span></div>
+    <div class="card-body">
+      <div class="data-grid">
+        <div class="data-cell"><div class="data-label">Name</div><div class="data-value">{{ lab.contact.name.content | dcc_text }}</div></div>
+        {% if lab.contact.eMail %}<div class="data-cell"><div class="data-label">Email</div><div class="data-value mono">{{ lab.contact.eMail }}</div></div>{% endif %}
+        {% if lab.contact.phone %}<div class="data-cell"><div class="data-label">Phone</div><div class="data-value mono">{{ lab.contact.phone }}</div></div>{% endif %}
+        {% if lab.contact.location %}
+        <div class="data-cell"><div class="data-label">Address</div><div class="data-value">
+          {% if lab.contact.location.street %}{{ lab.contact.location.street }} {{ lab.contact.location.streetNo }}{% endif %}
+          {% if lab.contact.location.postCode %}<br>{{ lab.contact.location.postCode }} {{ lab.contact.location.city }}{% endif %}
+          {% if lab.contact.location.countryCode %}<br>{{ lab.contact.location.countryCode }}{% endif %}
+        </div></div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+  {% endif %}
+  <!-- Responsible Persons -->
+  {% assign persons = admin.respPersons.respPerson | dcc_items %}
+  {% if persons.size > 0 %}
+  <div class="card">
+    <div class="card-header"><div class="card-icon">&#9794;</div><span class="card-title">Responsible Persons</span></div>
+    <div class="card-body">
+      {% for p in persons %}
+      {% assign pname = p.person.name.content | dcc_text %}
+      <div class="signer">
+        <div class="signer-avatar">{{ pname | dcc_initials }}</div>
+        <div>
+          <div class="signer-name">{{ pname }}</div>
+          {% if p.person.eMail %}<div class="signer-role mono">{{ p.person.eMail }}</div>{% endif %}
+        </div>
+        {% if p.mainSigner %}<span class="signer-main">Main Signer</span>{% endif %}
+      </div>
+      {% endfor %}
+    </div>
+  </div>
+  {% endif %}
+  <!-- Measurement Results -->
+  {% assign mrs = results.measurementResult | dcc_items %}
+  {% if mrs.size > 0 %}
+  <div class="card">
+    <div class="card-header"><div class="card-icon">&#9889;</div><span class="card-title">Measurement Results</span></div>
+    <div class="card-body">
+      {% for mr in mrs %}
+      <div class="mr-block">
+        <div class="mr-title">{{ mr.name.content | dcc_text | default: "Untitled Result" }}</div>
+        {% if mr.usedMethods %}
+          {% for method in mr.usedMethods.usedMethod | dcc_items %}
+            {% if method.name %}
+            <div style="color:var(--text-dim); font-size:0.8rem; padding-bottom:0.25rem;">{{ method.name.content | dcc_text }}</div>
+            {% endif %}
+          {% endfor %}
+        {% endif %}
+        {% if mr.results %}
+          {% for r in mr.results.result | dcc_items %}
+            {% if r.name %}
+            <div style="padding:0.5rem 0.75rem; border-left:2px solid var(--accent); margin-top:0.5rem; background:rgba(56,189,248,0.05); border-radius:0 6px 6px 0;">
+              {{ r.name.content | dcc_text }}
+            </div>
+            {% endif %}
+          {% endfor %}
+        {% endif %}
+      </div>
+      {% endfor %}
+    </div>
+  </div>
+  {% endif %}
+  <!-- Customer -->
+  {% if admin.customer %}
+  <div class="card">
+    <div class="card-header"><div class="card-icon">&#10148;</div><span class="card-title">Customer</span></div>
+    <div class="card-body">
+      <div class="data-grid">
+        <div class="data-cell"><div class="data-label">Name</div><div class="data-value">{{ admin.customer.name.content | dcc_text }}</div></div>
+        {% if admin.customer.eMail %}<div class="data-cell"><div class="data-label">Email</div><div class="data-value mono">{{ admin.customer.eMail }}</div></div>{% endif %}
+      </div>
+    </div>
+  </div>
+  {% endif %}
+</div>
+</body>
+</html>

data/lib/dcc/convert/yaml.rb CHANGED Viewed

@@ -18,4 +18,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/convert.rb CHANGED Viewed

@@ -9,6 +9,7 @@ module Dcc
     autoload :Json, "dcc/convert/json"
     autoload :Yaml, "dcc/convert/yaml"
     autoload :Csv, "dcc/convert/csv"
+    autoload :LiquidFilters, "dcc/convert/liquid_filters"
     autoload :Html, "dcc/convert/html"
   end
 end

data/lib/dcc/diff/change.rb CHANGED Viewed

@@ -18,4 +18,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/diff/result.rb CHANGED Viewed

@@ -31,7 +31,7 @@ module Dcc
           "(no structural changes)"
         else
           header = "#{changes.size} change(s): " \
-                  "#{additions.size} added, #{removals.size} removed, #{modifications.size} changed"
+                   "#{additions.size} added, #{removals.size} removed, #{modifications.size} changed"
           ([header] + changes.map(&:to_s)).join("\n")
         end
       end
@@ -41,7 +41,9 @@ module Dcc
         ::JSON.pretty_generate(
           additions: additions.map { |c| { path: c.path, value: c.after } },
           removals: removals.map { |c| { path: c.path, value: c.before } },
-          modifications: modifications.map { |c| { path: c.path, before: c.before, after: c.after } },
+          modifications: modifications.map do |c|
+            { path: c.path, before: c.before, after: c.after }
+          end,
         )
       end
@@ -50,9 +52,11 @@ module Dcc
         {
           additions: additions.map { |c| { path: c.path, value: c.after } },
           removals: removals.map { |c| { path: c.path, value: c.before } },
-          modifications: modifications.map { |c| { path: c.path, before: c.before, after: c.after } },
+          modifications: modifications.map do |c|
+            { path: c.path, before: c.before, after: c.after }
+          end,
         }.to_yaml
       end
     end
   end
-end
+end

data/lib/dcc/diff.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "bigdecimal"
+require "date"
 require "lutaml/model"
 module Dcc
@@ -12,6 +13,12 @@ module Dcc
     autoload :Result, "dcc/diff/result"
     autoload :Change, "dcc/diff/change"
+    # Leaf types compared directly rather than descended into. Numeric covers
+    # BigDecimal and Date covers DateTime, so neither needs its own entry.
+    PRIMITIVE_TYPES = [
+      ::String, ::Numeric, ::Symbol, ::Time, ::Date
+    ].freeze
     class << self
       # @param a [Lutaml::Model::Serializable]
       # @param b [Lutaml::Model::Serializable]
@@ -27,20 +34,24 @@ module Dcc
       def collect_differences(a, b, path, changes)
         # Both nil - no diff
         return if a.nil? && b.nil?
         # One is nil - add/remove
         if a.nil?
-          changes << Change.new(path: path, kind: :add, before: nil, after: summarize(b))
+          changes << Change.new(path: path, kind: :add, before: nil,
+                                after: summarize(b))
           return
         end
         if b.nil?
-          changes << Change.new(path: path, kind: :remove, before: summarize(a), after: nil)
+          changes << Change.new(path: path, kind: :remove,
+                                before: summarize(a), after: nil)
           return
         end
         # Both primitives - compare values
         if primitive?(a) || primitive?(b)
-          if a != b
-            changes << Change.new(path: path, kind: :change, before: a, after: b)
+          unless equivalent?(a, b)
+            changes << Change.new(path: path, kind: :change, before: a,
+                                  after: b)
           end
           return
         end
@@ -63,14 +74,35 @@ module Dcc
         end
       end
+      # "Did this document change?" is not "are these numbers equal?".
+      # `BigDecimal("NaN") == BigDecimal("NaN")` is false by IEEE, and
+      # `Values#==` honours that, so two documents carrying the same
+      # not-measured entry would otherwise report a change to itself.
+      def equivalent?(a, b)
+        values = ::Dcc::Type::DecimalXmlList::Values
+        return a == b unless a.is_a?(values) && b.is_a?(values)
+        a.size == b.size && a.to_a.zip(b.to_a).all? { |x, y| same_decimal?(x, y) }
+      end
+      # `Values.new` takes whatever it is handed, so a list assigned in Ruby
+      # rather than parsed can hold anything. Only BigDecimals are asked
+      # whether they are NaN.
+      def same_decimal?(left, right)
+        return true if left == right
+        left.is_a?(::BigDecimal) && right.is_a?(::BigDecimal) &&
+          left.nan? && right.nan?
+      end
       def primitive?(value)
-        return true if value.nil?
-        return true if value.is_a?(::String) || value.is_a?(::Numeric) || value.is_a?(::Symbol)
-        return true if value == true || value == false
-        return true if value.is_a?(::Time) || value.is_a?(::Date) || value.is_a?(::DateTime)
-        return true if value.is_a?(::BigDecimal)
+        return true if value.nil? || [true, false].include?(value)
+        return false if value.is_a?(::Array)
+        return true if PRIMITIVE_TYPES.any? { |type| value.is_a?(type) }
-        false
+        # Anything we cannot descend into is compared with `==`, which covers
+        # value objects such as decimal XML lists.
+        !value.class.respond_to?(:attributes)
       end
       def summarize(node)
@@ -80,4 +112,4 @@ module Dcc
       end
     end
   end
-end
+end