dcc 0.2.0 → 0.2.1

data/CHANGELOG.adoc

@@ -12,6 +12,36 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 * Performance memoization for hot paths
 * Plugin system for custom validators and converters
 
+=== Fixed
+* `dcc:list` no longer parses as an empty `si:list`. The D-SI re-export was
+  overwriting the DCC `list` registration, so every list and the quantities
+  inside it were dropped on parse.
+* `si:expandedUnc` and `si:coverageInterval` now survive a parse. Both are
+  members of the same `si:real` choice group and neither was mapped, so D-SI
+  v1 uncertainties were discarded.
+* `dcc:mathml` now parses. It is a `dcc:xmlType` wrapper around `ml:math`,
+  not the `ml:math` element itself, so `formula.mathml` was always `nil`.
+  Known gap: `ml:ci/@xref` does not survive a round-trip. `Mml::V3::Ci`
+  has no `xref` attribute, so the value is lost on parse and never reaches
+  the output. Those xrefs bind the formula variables to their
+  `dcc:quantity/@id`. A round-tripped formula keeps its MathML and loses
+  those bindings, with no warning. The fix belongs in the `mml` gem, not
+  here.
+* Decimal XML lists serialize as one space-separated element again. Each
+  value was being written as its own element containing a Ruby array
+  literal, e.g. `<si:valueXMLList>[0.72e-1]</si:valueXMLList>`. `NaN`
+  round-trips too, which every D-SI decimal type admits.
+* `UncertaintyConsistency` accepts a single entry broadcast across every
+  value, and now checks `coverageFactorXMLList`, `coverageProbabilityXMLList`
+  and `distributionXMLList` rather than the uncertainty list alone.
+* CSV export renders list values as plain decimals instead of `0.72e-1`.
+
+=== Changed
+* *Breaking:* `formula.mathml` returns a `Dcc::V2::Mathml` / `Dcc::V3::Mathml`
+  wrapper instead of an `Mml::V3::Math`. The MathML tree moves one level
+  down, so callers now read `formula.mathml.math`. This matches the XSD,
+  where `dcc:mathml` is a `dcc:xmlType` wrapper.
+
 == [0.1.0] — 2026-07-22
 
 === Added
@@ -48,7 +78,10 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 * No `require "dcc/..."` with internal paths.
 * No `send` / `instance_variable_set` / `instance_variable_get`.
 * No `respond_to?` for type checking.
-* No Nokogiri outside `lib/dcc/validate/xsd.rb`.
+* No Nokogiri outside `lib/dcc/validate/xsd.rb`. The v2-to-v3 migration later
+  added `lib/dcc/migrate/v2_to_v3.rb` as a second sanctioned file, because a
+  version transform has to rewrite documents the object model cannot
+  round-trip. To be removed once the parser round-trips without loss.
 * No doubles in specs.
 * `frozen_string_literal: true` everywhere.
 * OCP/MECE/DRY throughout.

data/CONTRIBUTING.adoc

@@ -34,7 +34,14 @@ constraints:
 * `send` to call private methods — redesign the API boundary.
 * `instance_variable_set` / `instance_variable_get` — use accessors.
 * `respond_to?` for type checking — use `is_a?` or model the type hierarchy.
-* Nokogiri anywhere outside `lib/dcc/validate/xsd.rb`.
+* Nokogiri anywhere outside `lib/dcc/validate/xsd.rb` and
+  `lib/dcc/migrate/v2_to_v3.rb`.
++
+The migration exception exists because a version transform rewrites element
+names and moves subtrees on documents the object model cannot round-trip —
+doing it through the model would discard the very constructs the transform
+has to carry. Revisit and remove this exception when the parser round-trips
+a DCC without loss, at which point the transform can run on the model.
 * Doubles in specs — use real model instances.
 * Hand-rolled `to_h`/`from_h` on model classes — use lutaml-model mappings.
 

data/Gemfile

@@ -4,22 +4,20 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "canon"
-gem "lutaml-model", github: "lutaml/lutaml-model", branch: "main"
-gem "mml", "~> 2.4.0"
-gem "moxml"
-gem "nokogiri"
+gem "canon", github: "lutaml/canon", branch: "main" # main-only Canon::Config
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.21"
 gem "rubocop-performance"
 gem "rubocop-rake"
 gem "rubocop-rspec"
-gem "tty-table"
 
 # Optional dependencies — loaded lazily by the feature that needs them.
 group :optional do
   gem "sinatra"      # Dcc::Server REST API
   gem "tty-prompt"   # dcc issue (interactive builder)
-  gem "xmldsig"      # Dcc::Signature
+  gem "tty-table"    # dcc extract files (aligned table)
 end
+
+gem "puma", "~> 8.0"
+gem "rackup", "~> 2.3"

data/README.adoc

@@ -10,19 +10,66 @@ provides a fully typed Ruby object representation of both the DCC and D-SI
 XML schemas, with per-major-version class hierarchies mirroring the approach
 used by the https://github.com/plurimath/mml[`mml`^] gem for MathML.
 
+== What is a Digital Calibration Certificate?
+
+A Digital Calibration Certificate (DCC) is an XML-based, machine-readable
+calibration certificate developed by Germany's national metrology institute,
+the https://ptb.de[Physikalisch-Technische Bundesanstalt (PTB)^]. It is
+designed to replace traditional paper-based calibration certificates with
+a format that both humans and machines can process automatically.
+
+A DCC document contains three primary sections:
+
+* **Administrative data** — identifies the calibration laboratory, the
+  customer, the calibrated item(s), responsible persons, performance dates,
+  and any statements about traceability or conformity.
+* **Measurement results** — the actual calibration data: measured values,
+  uncertainties, units, environmental conditions, and the methods/equipment
+  used. Each measurement quantity is expressed using the D-SI format.
+* **Document** — optional attached files (PDF reports, spreadsheets, images)
+  embedded as base64 binary data.
+
+The certificate can be digitally signed using W3C XMLDSig to guarantee
+authenticity and integrity.
+
+=== What is D-SI?
+
+D-SI (Digital System of Units) is a companion XML format for expressing
+SI-based measurement quantities with full uncertainty information. A D-SI
+quantity carries the value, unit (in siunitx notation), and an uncertainty
+model (standard, expanded with coverage factor k, or coverage interval).
+
+For example, a resistance measurement of 100.0225 Ω ± 0.003 Ω (k=2):
+
+[source,xml]
+----
+<si:real>
+  <si:value>100.0225</si:value>
+  <si:unit>\ohm</si:unit>
+  <si:expandedMU>
+    <si:valueExpandedMU>0.003</si:valueExpandedMU>
+    <si:coverageFactor>2</si:coverageFactor>
+    <si:coverageProbability>0.95</si:coverageProbability>
+  </si:expandedMU>
+</si:real>
+----
+
+D-SI also supports complex quantities, constants, lists (both verbose and
+compact XML-list forms), hybrid multi-unit representations, covariance
+matrices, and coverage regions for multivariate uncertainties.
+
 == Highlights
 
 * Fully typed object model for DCC v2.x and v3.x (no more XPath over `lxml`)
 * Fully typed object model for D-SI v1.x and v2.x
-* Lossless round-trip XML fidelity (parsing then serializing is byte-equivalent after canonicalization)
+* Lossless round-trip XML fidelity (parsing then serializing is byte-equivalent after canonicalization via `moxml`)
 * Pure-Ruby Schematron engine implementing the 14 PTB Schematron patterns
   (no Java/Saxon-HE dependency)
 * XSD validation against all 12 bundled DCC schema versions
 * JSON / YAML / CSV / HTML converters
-* MathML formula extraction with BigDecimal-based evaluation
-* XMLDSig signature signing and verification (soft dependency on `xmldsig`)
-* XSLT 1.0 transformation via Nokogiri (optional Saxon-HE bridge for XSLT 2.0/3.0)
-* Programmatic DCC builder DSL
+* MathML formula support via the `mml` gem (typed model, not raw strings)
+* XMLDSig signature signing and verification via `moxml` native Signature
+* Programmatic DCC builder DSL for issuing new certificates
 * Structural diff of two certificates
 * Version migration helpers
 * Thor-based CLI with `validate`, `convert`, `extract`, `signature`,
@@ -42,7 +89,7 @@ require "dcc"
 
 dcc = Dcc.parse(File.read("certificate.xml"))
 dcc.administrative_data.core_data.unique_identifier
-dcc.measurement_results.first.results.first.data.quantities.first.value
+dcc.measurement_results.measurement_result.first.results.result.first.data.first.quantity.first.name
 ----
 
 Validate:
@@ -53,11 +100,119 @@ result = Dcc::Validate::Xsd.call(File.read("certificate.xml"), version: "3.3.0")
 result.ok? # => true
 ----
 
-Or via the CLI:
+== Building a new DCC
+
+Use the builder DSL to issue a certificate programmatically:
+
+[source,ruby]
+----
+require "dcc"
+
+dcc = Dcc.build(version: 3) do
+  administrative_data do
+    core_data do
+      unique_identifier "urn:uuid:00000000-0000-0000-0000-000000000001"
+      country_code "DE"
+      used_lang "en"
+      mandatory_lang "en"
+      begin_performance_date Date.today
+      end_performance_date Date.today
+    end
+
+    items do
+      item(model: "Pt100", manufacturer: "ACME Sensors") do
+        name { content lang: "en", value: "Resistance Thermometer" }
+      end
+    end
+
+    calibration_laboratory do
+      calibration_laboratory_code "PTB-123"
+      contact do
+        name { content lang: "en", value: "Calibration Lab" }
+        e_mail "lab@example.org"
+        location do
+          city "Berlin"
+          country_code "DE"
+        end
+      end
+    end
+
+    resp_persons do
+      resp_person do
+        person do
+          name { content lang: "en", value: "Dr. Jane Doe" }
+          e_mail "jane@example.org"
+        end
+        main_signer true
+      end
+    end
+
+    customer do
+      name { content lang: "en", value: "Acme Corp" }
+    end
+  end
+
+  measurement_results do
+    measurement_result do
+      name { content lang: "en", value: "Resistance at 0 °C" }
+      results do
+        result do
+          name { content lang: "en", value: "R(0 °C)" }
+          data do
+            quantity do
+              name { content lang: "en", value: "Measured resistance" }
+              # D-SI quantity element (si:real) is wired via the typed model
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+puts dcc.to_xml
+----
+
+== Signing a DCC
+
+Sign with an X.509 certificate and RSA private key:
+
+[source,ruby]
+----
+require "dcc"
+
+cert_pem = File.read("cert.pem")
+key_pem  = File.read("cert.key")
+
+signed_xml = Dcc::Signature::Signer.call(
+  File.read("certificate.xml"),
+  cert_pem: cert_pem,
+  key_pem: key_pem,
+)
+
+File.write("certificate_signed.xml", signed_xml)
+----
+
+Verify a signed certificate:
+
+[source,ruby]
+----
+result = Dcc::Signature::Verifier.call(
+  File.read("certificate_signed.xml"),
+  ca_cert_pem: cert_pem,
+)
+result.valid? # => true
+----
+
+== CLI
 
     $ dcc inspect certificate.xml
     $ dcc validate all certificate.xml
     $ dcc convert json certificate.xml -o certificate.json
+    $ dcc extract files certificate.xml
+    $ dcc signature sign cert.pem key.pem certificate.xml -o signed.xml
+    $ dcc signature verify cert.pem signed.xml
+    $ dcc diff a.xml b.xml
 
 == Status
 

data/dcc.gemspec

@@ -35,7 +35,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 3.2.0"
 
-  spec.add_dependency "lutaml-model", "~> 0.8"
+  spec.add_dependency "base64" # not a default gem since Ruby 3.4
+  spec.add_dependency "csv" # not a default gem since Ruby 3.4
+  spec.add_dependency "forwardable" # stdlib, declared for the packaging guard
+  spec.add_dependency "liquid", "~> 5"
+  spec.add_dependency "lutaml-model", "~> 0.8.114"
   spec.add_dependency "mml", "~> 2.4.0"
-  spec.add_dependency "thor"
+  spec.add_dependency "moxml", "~> 0.5"
+  spec.add_dependency "nokogiri", "~> 1.16"
+  spec.add_dependency "thor", "~> 1.4"
 end

data/docs/schema-versions.adoc

@@ -51,15 +51,28 @@ Dcc::Schema::Version.resolve_dcc(:auto, xml: xml) # => "3.3.0"
 
 == Migration
 
-Use `Dcc.migrate` to upgrade or downgrade between schema versions:
+Use `Dcc.migrate` to upgrade a DCC to a newer schema version:
 
 [source,ruby]
 ----
-dcc = Dcc.parse(File.read("v3.xml"))
-migrated = Dcc.migrate(dcc, from: "3.3.0", to: "3.2.1")
-puts migrated.schema_version # => 3.2.1
+xml = File.read("v2.xml")
+migrated = Dcc.migrate(xml, from: "2.3.0", to: "3.3.0")
+puts migrated.schema_version # => 3.3.0
 ----
 
-Cross-major migration (e.g. v2 → v3) serializes the source DCC and
-re-parses it under the target version's context. Same-major just
-rewrites the `schemaVersion` attribute in place.
+Pass the source XML whenever you have it. `Dcc.migrate` also accepts a
+parsed DCC, but a model has to be serialized back to XML before the
+transform runs — so anything the parser could not round-trip is already
+gone, and the migration can neither carry it nor report it.
+
+Migration is one-way. Downgrading raises `Dcc::UnsupportedMigrationError`,
+because v3 adds elements and attributes no older schema accepts:
+
+[source,ruby]
+----
+Dcc.migrate(xml, from: "3.3.0", to: "3.2.1") # raises
+----
+
+Cross-major migration (e.g. v2 → v3) applies the route's field rules to the
+XML and parses the result under the target version's context. Same-major
+just rewrites the `schemaVersion` attribute.

data/examples/convert_all_formats.rb

@@ -11,7 +11,8 @@ require "dcc"
 path = ARGV[0] || File.expand_path("../spec/fixtures/dcclib/valid.xml", __dir__)
 dcc = Dcc.parse(File.read(path))
 
-[Dcc::Convert::Json, Dcc::Convert::Yaml, Dcc::Convert::Csv, Dcc::Convert::Html].each do |service|
+[Dcc::Convert::Json, Dcc::Convert::Yaml, Dcc::Convert::Csv,
+ Dcc::Convert::Html].each do |service|
   result = service.call(dcc)
   puts "== #{service.name.split('::').last} =="
   puts result.to_s[0, 200] + "..."

data/examples/quantity_math_demo.rb

@@ -9,12 +9,12 @@
 require "dcc"
 require "bigdecimal"
 
-ten_k   = Dcc::QuantityMath::Real.new(value: BigDecimal("10"),
+ten_k = Dcc::QuantityMath::Real.new(value: BigDecimal(10),
+                                    unit: "\\kelvin",
+                                    uncertainty: BigDecimal("0.1"))
+twenty_k = Dcc::QuantityMath::Real.new(value: BigDecimal(20),
                                        unit: "\\kelvin",
-                                       uncertainty: BigDecimal("0.1"))
-twenty_k = Dcc::QuantityMath::Real.new(value: BigDecimal("20"),
-                                        unit: "\\kelvin",
-                                        uncertainty: BigDecimal("0.2"))
+                                       uncertainty: BigDecimal("0.2"))
 
 puts "ten:      #{ten_k}"
 puts "twenty:   #{twenty_k}"
@@ -24,8 +24,8 @@ puts "ratio:    #{twenty_k / ten_k}"
 
 # Pretty-print with SmartCom-style formats.
 fmt = Dcc::QuantityFormat::Formatter.new(value: BigDecimal("42.00"),
-                                          uncertainty: BigDecimal("0.05"),
-                                          unit: "\\kelvin")
+                                         uncertainty: BigDecimal("0.05"),
+                                         unit: "\\kelvin")
 puts
 puts "Short:    #{fmt.to_short}"
 puts "Long:     #{fmt.to_long}"

data/examples/validate_full.rb

@@ -22,6 +22,6 @@ dcc = Dcc.parse(xml)
     else service.call(dcc)
     end
   puts "== #{service.name} =="
-  puts result.to_s
+  puts result
   puts
 end

data/lib/dcc/base/calibration_laboratory.rb

@@ -19,7 +19,8 @@ module Dcc
             map_attribute "id", to: :id
             map_attribute "refId", to: :ref_id
             map_attribute "refType", to: :ref_type
-            map_element "calibrationLaboratoryCode", to: :calibration_laboratory_code
+            map_element "calibrationLaboratoryCode",
+                        to: :calibration_laboratory_code
             map_element "contact", to: :contact
           end
         end

data/lib/dcc/base/condition.rb

@@ -3,7 +3,10 @@
 module Dcc
   module Base
     # `dcc:conditionType` — single influence condition: name + description +
-    # optional state enum (beforeAdjustment, etc.) + data.
+    # optional status enum (beforeAdjustment, etc.) + data.
+    #
+    # v3 calls that child `status`; v2 calls it `state`, which
+    # `Dcc::V2::Condition` maps.
     module Condition
       def self.included(klass)
         klass.class_eval do
@@ -24,7 +27,7 @@ module Dcc
             map_attribute "refType", to: :ref_type
             map_element "name", to: :name
             map_element "description", to: :description
-            map_element "state", to: :status
+            map_element "status", to: :status
             map_element "data", to: :data
           end
         end

data/lib/dcc/base/core_data.rb

@@ -11,13 +11,16 @@ module Dcc
           attribute :ref_id, :string
           attribute :ref_type, :string
           attribute :country_code_iso_3166_1, ::Dcc::Type::IsoCountryCode
-          attribute :used_lang_code_iso_639_1, ::Dcc::Type::IsoLanguageCode, collection: true
-          attribute :mandatory_lang_code_iso_639_1, ::Dcc::Type::IsoLanguageCode, collection: true
+          attribute :used_lang_code_iso_639_1, ::Dcc::Type::IsoLanguageCode,
+                    collection: true
+          attribute :mandatory_lang_code_iso_639_1,
+                    ::Dcc::Type::IsoLanguageCode, collection: true
           attribute :unique_identifier, :string
           attribute :identifications, :identifications
           attribute :receipt_date, :date
           attribute :begin_performance_date, :date
           attribute :end_performance_date, :date
+          attribute :performance_location, :string
           attribute :previous_report, :previousReport
 
           xml do
@@ -29,12 +32,14 @@ module Dcc
             map_attribute "refType", to: :ref_type
             map_element "countryCodeISO3166_1", to: :country_code_iso_3166_1
             map_element "usedLangCodeISO639_1", to: :used_lang_code_iso_639_1
-            map_element "mandatoryLangCodeISO639_1", to: :mandatory_lang_code_iso_639_1
+            map_element "mandatoryLangCodeISO639_1",
+                        to: :mandatory_lang_code_iso_639_1
             map_element "uniqueIdentifier", to: :unique_identifier
             map_element "identifications", to: :identifications
             map_element "receiptDate", to: :receipt_date
             map_element "beginPerformanceDate", to: :begin_performance_date
             map_element "endPerformanceDate", to: :end_performance_date
+            map_element "performanceLocation", to: :performance_location
             map_element "previousReport", to: :previous_report
           end
         end

data/lib/dcc/base/formula.rb

@@ -5,7 +5,7 @@ require "mml"
 module Dcc
   module Base
     # `dcc:formulaType` — formula expression. Contains `latex` string,
-    # `mathml` (a typed `Mml::V3::Math` model), or legacy `siunitx`.
+    # `mathml` (a `dcc:xmlType` wrapper around `ml:math`), or legacy `siunitx`.
     module Formula
       def self.included(klass)
         klass.class_eval do
@@ -13,7 +13,7 @@ module Dcc
           attribute :ref_id, :string
           attribute :ref_type, :string
           attribute :latex, :string
-          attribute :mathml, ::Mml::V3::Math
+          attribute :mathml, :mathml
           attribute :siunitx, :string
 
           xml do
@@ -30,4 +30,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/base/identification.rb

@@ -3,14 +3,17 @@
 module Dcc
   module Base
     # `dcc:identificationType` — single identifier (issuer, value, optional
-    # description). Issuer enum: manufacturer, calibrationLaboratory, customer,
+    # name). Issuer enum: manufacturer, calibrationLaboratory, customer,
     # owner, other.
+    #
+    # v3 calls the third child `name`; v2 calls it `description`, which
+    # `Dcc::V2::Identification` maps.
     module Identification
       def self.included(klass)
         klass.class_eval do
           attribute :issuer, :string
           attribute :value, :string
-          attribute :description, :text
+          attribute :name, :text
 
           xml do
             namespace ::Dcc::Namespace::Dcc
@@ -18,7 +21,7 @@ module Dcc
             ordered
             map_element "issuer", to: :issuer
             map_element "value", to: :value
-            map_element "description", to: :description
+            map_element "name", to: :name
           end
         end
       end

data/lib/dcc/base/mathml.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "mml"
+
+module Dcc
+  module Base
+    # `dcc:mathml` — a `dcc:xmlType` wrapper carrying a single foreign-namespace
+    # child, which for a formula is `ml:math`. The MathML tree hangs below the
+    # wrapper rather than replacing it.
+    module Mathml
+      # rubocop:disable Metrics/MethodLength -- one lutaml mapping block,
+      # split the same way every sibling module in Dcc::Base is written.
+      def self.included(klass)
+        klass.class_eval do
+          attribute :id, :string
+          attribute :ref_id, :string
+          attribute :ref_type, :string
+          attribute :math, ::Mml::V3::Math
+
+          xml do
+            namespace ::Dcc::Namespace::Dcc
+            element "mathml"
+            map_attribute "id", to: :id
+            map_attribute "refId", to: :ref_id
+            map_attribute "refType", to: :ref_type
+            map_element "math", to: :math
+          end
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end

data/lib/dcc/base/quantity.rb

@@ -25,7 +25,8 @@ module Dcc
           attribute :constant, :constant, collection: true
           attribute :hybrid, :hybrid, collection: true
           attribute :real_list_xml_list, :realListXMLList, collection: true
-          attribute :complex_list_xml_list, :complexListXMLList, collection: true
+          attribute :complex_list_xml_list, :complexListXMLList,
+                    collection: true
           attribute :list, :list, collection: true
           # Ancillary DCC sections
           attribute :used_methods, :usedMethods

data/lib/dcc/base/resp_person.rb

@@ -28,8 +28,10 @@ module Dcc
             map_element "description", to: :description
             map_element "mainSigner", to: :main_signer
             map_element "cryptElectronicSeal", to: :crypt_electronic_seal
-            map_element "cryptElectronicSignature", to: :crypt_electronic_signature
-            map_element "cryptElectronicTimeStamp", to: :crypt_electronic_time_stamp
+            map_element "cryptElectronicSignature",
+                        to: :crypt_electronic_signature
+            map_element "cryptElectronicTimeStamp",
+                        to: :crypt_electronic_time_stamp
           end
         end
       end

data/lib/dcc/base/text.rb

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

data/lib/dcc/base.rb

@@ -53,6 +53,7 @@ module Dcc
     autoload :MeasurementMetaData, "dcc/base/measurement_meta_data"
     autoload :MeasurementMetaDataList, "dcc/base/measurement_meta_data_list"
     autoload :AdministrativeData, "dcc/base/administrative_data"
-    autoload :DigitalCalibrationCertificate, "dcc/base/digital_calibration_certificate"
+    autoload :DigitalCalibrationCertificate,
+             "dcc/base/digital_calibration_certificate"
   end
 end

data/lib/dcc/builder/dsl.rb

@@ -7,4 +7,4 @@ module Dcc
     module Dsl
     end
   end
-end
+end