dcc 0.2.0 → 0.2.1

data/lib/dcc/server/app.rb

@@ -1,133 +1,217 @@
 # frozen_string_literal: true
 
-# Loads Sinatra lazily so the gem works without it installed.
 begin
   require "sinatra/base"
   SINATRA_AVAILABLE = true
-rescue ::LoadError
+rescue LoadError
   SINATRA_AVAILABLE = false
 end
 
 module Dcc
   module Server
-    # Sinatra application exposing the DCC REST API. Mirrors PTB dcclib's
-    # endpoints: POST /dccs, GET /dccs/:id, DELETE /dccs/:id,
-    # POST /dccs/:id/validate/{xsd,schematron}, /convert/json,
-    # /extract/{files,formulae}, /signature, /transform/xslt.
-    #
-    # Run via:
-    #   require "dcc/server"
-    #   Dcc::Server::App.run!
     class App < ::Sinatra::Base
-      before do
-        content_type :json
-      end
-
-      # Storage instance — override in config.ru for production swaps.
-      set :storage, ::Dcc::Server::Storage::Memory.new
+      set :public_folder, File.expand_path("server", __dir__)
 
       get "/" do
-        {
-          title: "dcc gem REST API",
-          version: ::Dcc::VERSION,
-          endpoints: [
-            "POST /dccs",
-            "GET /dccs/:id",
-            "DELETE /dccs/:id",
-            "POST /dccs/:id/validate/xsd",
-            "POST /dccs/:id/validate/schematron",
-            "POST /dccs/:id/convert/json",
-            "GET /dccs/:id/extract/files",
-            "POST /dccs/:id/transform/xslt",
-          ],
-        }.to_json
+        content_type :html
+        File.read(File.expand_path("app.html", __dir__))
       end
 
-      post "/dccs" do
-        ensure_loaded!
-        body = JSON.parse(request.body.read)
-        xml = body.fetch("xml")
-        entry = settings.storage.put(xml)
-        status 201
-        { id: entry.id, expires: entry.expires_at }.to_json
-      rescue ::KeyError
-        status 400
-        { error: "missing 'xml' in request body" }.to_json
+      get "/demo.xml" do
+        content_type :xml
+        File.read(File.expand_path("demo_cert.xml", __dir__))
       end
 
-      get "/dccs/:id" do
-        entry = settings.storage.get(params[:id])
-        halt 404, { error: "not found" }.to_json unless entry
+      post "/validate" do
+        ensure_loaded!
+        xml = request.body.read
+        content_type :json
+
+        cert_data = extract_cert_data(xml)
+        validation = run_validation(xml)
 
-        { id: entry.id, xml: entry.xml, expires: entry.expires_at }.to_json
+        { cert: cert_data, validation: validation }.to_json
+      rescue StandardError => e
+        content_type :json
+        status 500
+        { error: e.message }.to_json
       end
 
-      delete "/dccs/:id" do
-        deleted = settings.storage.delete(params[:id])
-        halt 404, { error: "not found" }.to_json unless deleted
+      private
+
+      def ensure_loaded!
+        return if @loaded
 
-        status 204
+        ::Dcc.load_all!
+        @loaded = true
       end
 
-      post "/dccs/:id/validate/xsd" do
-        result = with_dcc(params[:id]) { |xml| ::Dcc::Validate::Xsd.call(xml) }
-        result.to_json
+      def extract_cert_data(xml)
+        hash = ::Dcc::Convert::Json.xml_to_hash(xml)
+        admin = hash["administrativeData"] || {}
+        core = admin["coreData"] || {}
+        items = admin["items"] || {}
+        item = items["item"].is_a?(::Array) ? items["item"].first : items["item"]
+        item ||= {}
+        lab = admin["calibrationLaboratory"] || {}
+        lab_contact = lab["contact"] || {}
+
+        {
+          schemaVersion: hash["schemaVersion"],
+          uniqueId: core["uniqueIdentifier"],
+          country: core["countryCodeISO3166_1"],
+          itemName: text(item["name"]),
+          labName: text(lab_contact["name"]),
+          coreData: build_core_data(core),
+          lab: {
+            name: text(lab_contact["name"]),
+            email: lab_contact["eMail"],
+            address: build_address(lab_contact["location"]),
+          },
+          signers: build_signers(admin["respPersons"]),
+          measurements: build_measurements(hash["measurementResults"]),
+        }
       end
 
-      post "/dccs/:id/validate/schematron" do
-        result = with_dcc(params[:id]) { |xml| ::Dcc::Validate::Schematron.call(::Dcc.parse(xml)) }
-        result.to_json
+      def text(node)
+        return "" unless node
+
+        c = node.is_a?(::Hash) ? node["content"] : node
+        return "" unless c
+
+        case c
+        when ::String then c
+        when ::Array
+          entry = c.find { |e| e.is_a?(::Hash) }
+          entry ? (entry["_text"] || "") : ""
+        when ::Hash then c["_text"] || ""
+        else ""
+        end
       end
 
-      post "/dccs/:id/convert/json" do
-        with_dcc(params[:id]) do |xml|
-          ::Dcc::Convert::Json.call(::Dcc.parse(xml)).payload
+      def build_core_data(core)
+        fields = []
+        if core["uniqueIdentifier"]
+          fields << { label: "Unique ID", value: core["uniqueIdentifier"] }
+        end
+        if core["beginPerformanceDate"]
+          fields << { label: "Begin Date", value: core["beginPerformanceDate"] }
+        end
+        if core["endPerformanceDate"]
+          fields << { label: "End Date", value: core["endPerformanceDate"] }
         end
+        langs = core["usedLangCodeISO639_1"]
+        langs_str = case langs
+                    when ::Array then langs.join(", ")
+                    when ::String then langs
+                    else ""
+                    end
+        unless langs_str.empty?
+          fields << { label: "Languages",
+                      value: langs_str }
+        end
+        fields
+      end
+
+      def build_address(loc)
+        return "" unless loc
+
+        parts = []
+        parts << "#{loc['street']} #{loc['streetNo']}" if loc["street"]
+        parts << "#{loc['postCode']} #{loc['city']}" if loc["postCode"]
+        parts << loc["countryCode"] if loc["countryCode"]
+        parts.join(", ")
       end
 
-      get "/dccs/:id/extract/files" do
-        with_dcc(params[:id]) do |xml|
-          files = ::Dcc::Extract::File.each(::Dcc.parse(xml))
+      def build_signers(resp_persons)
+        return [] unless resp_persons
+
+        rp = resp_persons["respPerson"]
+        list = rp.is_a?(::Array) ? rp : [rp]
+        list.map do |p|
+          person = p["person"] || {}
           {
-            files: files.map do |f|
-              {
-                name: f.name, file_name: f.file_name,
-                mime_type: f.mime_type, ring: f.ring.to_s,
-                data_base64: ::Base64.strict_encode64(f.data),
-              }
-            end,
-          }.to_json
+            name: text(person["name"]),
+            email: person["eMail"],
+            main: p["mainSigner"] == "true",
+          }
         end
       end
 
-      post "/dccs/:id/transform/xslt" do
-        body = JSON.parse(request.body.read)
-        xslt = body.fetch("xslt")
-        with_dcc(params[:id]) do |xml|
-          ::Dcc::Transform::Xslt.call(xml, xslt).payload
+      def build_measurements(mr_hash)
+        return [] unless mr_hash
+
+        mr = mr_hash["measurementResult"]
+        list = mr.is_a?(::Array) ? mr : [mr]
+        list.map do |m|
+          results = []
+          if m["results"]
+            r = m["results"]["result"]
+            r_list = r.is_a?(::Array) ? r : [r]
+            r_list.each do |res|
+              results << {
+                name: text(res["name"]),
+                values: extract_quantity_values(res["data"]),
+              }
+            end
+          end
+          {
+            name: text(m["name"]),
+            results: results,
+          }
         end
       end
 
-      private
+      def extract_quantity_values(data)
+        return [] unless data
 
-      def ensure_loaded!
-        return if @loaded
+        values = []
+        d = data.is_a?(::Array) ? data.first : data
+        return values unless d.is_a?(::Hash)
 
-        ::Dcc.load_all!
-        @loaded = true
+        qty = d["quantity"]
+        q_list = qty.is_a?(::Array) ? qty : [qty]
+        q_list.each do |q|
+          next unless q.is_a?(::Hash)
+
+          real = q["real"]
+          next unless real
+
+          values << {
+            value: real["value"],
+            unit: real["unit"],
+            uncertainty: extract_uncertainty(real),
+          }
+        end
+        values
       end
 
-      def with_dcc(id)
-        entry = settings.storage.get(id)
-        halt 404, { error: "not found" }.to_json unless entry
+      def extract_uncertainty(real)
+        mu = real["expandedMU"] || real["expandedUnc"]
+        return nil unless mu
 
-        ensure_loaded!
-        result = yield(entry.xml)
-        result.is_a?(::String) ? result : result.to_json
+        mu["valueExpandedMU"] || mu["uncertainty"]
+      end
+
+      def run_validation(xml)
+        xsd_result = ::Dcc::Validate::Xsd.call(xml)
+        issues = xsd_result.issues || []
+        {
+          ok: issues.none? { |i| i.severity == :error },
+          errors: issues.select { |i| i.severity == :error }.map do |i|
+            { line: i.line, message: i.message }
+          end,
+          warnings: issues.select { |i| i.severity == :warning }.map do |i|
+            { line: i.line, message: i.message }
+          end,
+        }
+      rescue StandardError => e
+        {
+          ok: false,
+          errors: [{ line: nil, message: e.message }],
+          warnings: [],
+        }
       end
     end
   end
 end
-
-require "base64"
-require "json"

data/lib/dcc/server/demo_cert.xml

@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dcc:digitalCalibrationCertificate
+    xmlns:dcc="https://ptb.de/dcc"
+    xmlns:si="https://ptb.de/si"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://ptb.de/dcc https://ptb.de/dcc/v3.3.0/dcc.xsd"
+    schemaVersion="3.3.0">
+
+  <dcc:administrativeData>
+    <dcc:dccSoftware>
+      <dcc:software>
+        <dcc:name>
+          <dcc:content lang="en">DCC Builder Demo</dcc:content>
+        </dcc:name>
+        <dcc:release>0.2.0</dcc:release>
+      </dcc:software>
+    </dcc:dccSoftware>
+
+    <dcc:coreData>
+      <dcc:countryCodeISO3166_1>NL</dcc:countryCodeISO3166_1>
+      <dcc:usedLangCodeISO639_1>en</dcc:usedLangCodeISO639_1>
+      <dcc:usedLangCodeISO639_1>de</dcc:usedLangCodeISO639_1>
+      <dcc:mandatoryLangCodeISO639_1>en</dcc:mandatoryLangCodeISO639_1>
+      <dcc:uniqueIdentifier>R117-2019-NL1-22.10-Rev2</dcc:uniqueIdentifier>
+      <dcc:identifications>
+        <dcc:identification>
+          <dcc:issuer>calibrationLaboratory</dcc:issuer>
+          <dcc:value>OIML-CS-R117-22.10</dcc:value>
+        </dcc:identification>
+      </dcc:identifications>
+      <dcc:beginPerformanceDate>2024-03-15</dcc:beginPerformanceDate>
+      <dcc:endPerformanceDate>2024-03-15</dcc:endPerformanceDate>
+    </dcc:coreData>
+
+    <dcc:items>
+      <dcc:name>
+        <dcc:content lang="en">Coriolis Mass Flow Transducer</dcc:content>
+        <dcc:content lang="de">Coriolis-Massendurchfluss-Messumformer</dcc:content>
+      </dcc:name>
+      <dcc:item id="promass-f-300">
+        <dcc:name>
+          <dcc:content lang="en">Promass F 300</dcc:content>
+        </dcc:name>
+        <dcc:equipmentClass>
+          <dcc:reference>OIML R117</dcc:reference>
+          <dcc:classID>Measurement transducer</dcc:classID>
+        </dcc:equipmentClass>
+        <dcc:manufacturer>
+          <dcc:name>
+            <dcc:content lang="en">Endress+Hauser Flowtec AG</dcc:content>
+          </dcc:name>
+          <dcc:location>
+            <dcc:street>Kägenstrasse</dcc:street>
+            <dcc:streetNo>7</dcc:streetNo>
+            <dcc:postCode>4153</dcc:postCode>
+            <dcc:city>Reinach</dcc:city>
+            <dcc:countryCode>CH</dcc:countryCode>
+          </dcc:location>
+        </dcc:manufacturer>
+        <dcc:model>Promass F 300 DNx</dcc:model>
+      </dcc:item>
+    </dcc:items>
+
+    <dcc:calibrationLaboratory>
+      <dcc:calibrationLaboratoryCode>NL1</dcc:calibrationLaboratoryCode>
+      <dcc:contact>
+        <dcc:name>
+          <dcc:content lang="en">NMi Certin B.V.</dcc:content>
+        </dcc:name>
+        <dcc:eMail>info@nmi.nl</dcc:eMail>
+        <dcc:location>
+          <dcc:countryCode>NL</dcc:countryCode>
+        </dcc:location>
+      </dcc:contact>
+    </dcc:calibrationLaboratory>
+
+    <dcc:respPersons>
+      <dcc:respPerson>
+        <dcc:person>
+          <dcc:name>
+            <dcc:content lang="en">M. Schmidt, Ph.D.</dcc:content>
+          </dcc:name>
+          <dcc:eMail>m.schmidt@nmi.nl</dcc:eMail>
+        </dcc:person>
+        <dcc:description>
+          <dcc:content lang="en">Person responsible</dcc:content>
+        </dcc:description>
+        <dcc:mainSigner>true</dcc:mainSigner>
+      </dcc:respPerson>
+    </dcc:respPersons>
+
+    <dcc:customer>
+      <dcc:name>
+        <dcc:content lang="en">Endress+Hauser Flowtec AG</dcc:content>
+      </dcc:name>
+      <dcc:location>
+        <dcc:street>Kägenstrasse</dcc:street>
+        <dcc:streetNo>7</dcc:streetNo>
+        <dcc:postCode>4153</dcc:postCode>
+        <dcc:city>Reinach</dcc:city>
+        <dcc:countryCode>CH</dcc:countryCode>
+      </dcc:location>
+    </dcc:customer>
+
+    <dcc:statements>
+      <dcc:statement refType="OIML_R117_conformity">
+        <dcc:countryCodeISO3166_1>NL</dcc:countryCodeISO3166_1>
+        <dcc:convention>OIML-CS</dcc:convention>
+        <dcc:declaration>
+          <dcc:content lang="en">The certified type conforms to OIML R 117 (2019).</dcc:content>
+        </dcc:declaration>
+        <dcc:valid>true</dcc:valid>
+      </dcc:statement>
+    </dcc:statements>
+  </dcc:administrativeData>
+
+  <dcc:measurementResults>
+    <dcc:measurementResult>
+      <dcc:name>
+        <dcc:content lang="en">Mass flow calibration — DN25</dcc:content>
+      </dcc:name>
+      <dcc:results>
+        <dcc:result>
+          <dcc:name>
+            <dcc:content lang="en">Maximum flow rate</dcc:content>
+          </dcc:name>
+          <dcc:data>
+            <dcc:quantity>
+              <dcc:name>
+                <dcc:content lang="en">Max mass flow</dcc:content>
+              </dcc:name>
+              <si:real>
+                <si:label>maxFlow</si:label>
+                <si:value>300</si:value>
+                <si:unit>\kilogram\per\minute</si:unit>
+                <si:expandedMU>
+                  <si:valueExpandedMU>0.15</si:valueExpandedMU>
+                  <si:coverageFactor>2</si:coverageFactor>
+                  <si:coverageProbability>0.95</si:coverageProbability>
+                </si:expandedMU>
+              </si:real>
+            </dcc:quantity>
+          </dcc:data>
+        </dcc:result>
+        <dcc:result>
+          <dcc:name>
+            <dcc:content lang="en">Density range</dcc:content>
+          </dcc:name>
+          <dcc:data>
+            <dcc:quantity>
+              <dcc:name>
+                <dcc:content lang="en">Density min</dcc:content>
+              </dcc:name>
+              <si:real>
+                <si:label>densityMin</si:label>
+                <si:value>300</si:value>
+                <si:unit>\kilogram\per\metre\tothe{3}</si:unit>
+              </si:real>
+            </dcc:quantity>
+            <dcc:quantity>
+              <dcc:name>
+                <dcc:content lang="en">Density max</dcc:content>
+              </dcc:name>
+              <si:real>
+                <si:label>densityMax</si:label>
+                <si:value>1400</si:value>
+                <si:unit>\kilogram\per\metre\tothe{3}</si:unit>
+              </si:real>
+            </dcc:quantity>
+          </dcc:data>
+        </dcc:result>
+        <dcc:result>
+          <dcc:name>
+            <dcc:content lang="en">Temperature range</dcc:content>
+          </dcc:name>
+          <dcc:data>
+            <dcc:quantity>
+              <dcc:name>
+                <dcc:content lang="en">Temperature min</dcc:content>
+              </dcc:name>
+              <si:real>
+                <si:label>tempMin</si:label>
+                <si:value>-40</si:value>
+                <si:unit>\degreeCelsius</si:unit>
+              </si:real>
+            </dcc:quantity>
+            <dcc:quantity>
+              <dcc:name>
+                <dcc:content lang="en">Temperature max</dcc:content>
+              </dcc:name>
+              <si:real>
+                <si:label>tempMax</si:label>
+                <si:value>55</si:value>
+                <si:unit>\degreeCelsius</si:unit>
+              </si:real>
+            </dcc:quantity>
+          </dcc:data>
+        </dcc:result>
+        <dcc:result>
+          <dcc:name>
+            <dcc:content lang="en">Accuracy classes</dcc:content>
+          </dcc:name>
+          <dcc:data>
+            <dcc:list>
+              <dcc:name>
+                <dcc:content lang="en">Accuracy class ratings</dcc:content>
+              </dcc:name>
+              <dcc:quantity>
+                <dcc:name>
+                  <dcc:content lang="en">Class 0.3</dcc:content>
+                </dcc:name>
+                <si:real>
+                  <si:label>accuracyClass1</si:label>
+                  <si:value>0.3</si:value>
+                  <si:unit>\percent</si:unit>
+                </si:real>
+              </dcc:quantity>
+              <dcc:quantity>
+                <dcc:name>
+                  <dcc:content lang="en">Class 0.5</dcc:content>
+                </dcc:name>
+                <si:real>
+                  <si:label>accuracyClass2</si:label>
+                  <si:value>0.5</si:value>
+                  <si:unit>\percent</si:unit>
+                </si:real>
+              </dcc:quantity>
+              <dcc:quantity>
+                <dcc:name>
+                  <dcc:content lang="en">Class 1.0</dcc:content>
+                </dcc:name>
+                <si:real>
+                  <si:label>accuracyClass3</si:label>
+                  <si:value>1.0</si:value>
+                  <si:unit>\percent</si:unit>
+                </si:real>
+              </dcc:quantity>
+            </dcc:list>
+          </dcc:data>
+        </dcc:result>
+      </dcc:results>
+    </dcc:measurementResult>
+  </dcc:measurementResults>
+</dcc:digitalCalibrationCertificate>

data/lib/dcc/server/storage/entry.rb

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

data/lib/dcc/server/storage/memory.rb

@@ -20,7 +20,8 @@ module Dcc
         # @return [Dcc::Server::Storage::Entry]
         def put(xml)
           id = ::Digest::SHA256.hexdigest(xml)
-          entry = Entry.new(id: id, xml: xml, expires_at: Time.now + ttl_seconds)
+          entry = Entry.new(id: id, xml: xml,
+                            expires_at: Time.now + ttl_seconds)
           @store[id] = entry
           entry
         end
@@ -54,4 +55,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/server/storage.rb

@@ -10,4 +10,4 @@ module Dcc
       autoload :Entry, "dcc/server/storage/entry"
     end
   end
-end
+end

data/lib/dcc/server.rb

@@ -30,4 +30,4 @@ module Dcc
             "sinatra is required for the REST API"
     end
   end
-end
+end

data/lib/dcc/si/base/complex.rb

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

data/lib/dcc/si/base/complex_list_xml_list.rb

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

data/lib/dcc/si/base/constant.rb

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

data/lib/dcc/si/base/coverage_interval.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Dcc
+  module Si
+    module Base
+      # `si:coverageIntervalType` — coverage interval stated directly on a real
+      # quantity, the sibling of `expandedUnc` in the same xs:choice. The v1
+      # form; v2 keeps it as a deprecated alternative.
+      module CoverageInterval
+        # rubocop:disable Metrics/MethodLength -- one lutaml mapping
+        # block, written the same way as every sibling D-SI module.
+        def self.included(klass)
+          klass.class_eval do
+            attribute :standard_unc, :string
+            attribute :interval_min, :string
+            attribute :interval_max, :string
+            attribute :coverage_probability, :string
+            attribute :distribution, :string
+
+            xml do
+              namespace ::Dcc::Namespace::Si
+              element "coverageInterval"
+              ordered
+              map_element "standardUnc", to: :standard_unc
+              map_element "intervalMin", to: :interval_min
+              map_element "intervalMax", to: :interval_max
+              map_element "coverageProbability", to: :coverage_probability
+              map_element "distribution", to: :distribution
+            end
+          end
+        end
+        # rubocop:enable Metrics/MethodLength
+      end
+    end
+  end
+end

data/lib/dcc/si/base/coverage_interval_mu.rb

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

data/lib/dcc/si/base/expanded_mu.rb

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