RubyGems - asciimath2unitsml - Versions diffs - 0.3.1 → 0.3.2 - Mend

asciimath2unitsml 0.3.1 → 0.3.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 (7) hide show

checksums.yaml +4 -4
data/lib/asciimath2unitsml/conv.rb +59 -47
data/lib/asciimath2unitsml/parse.rb +44 -73
data/lib/asciimath2unitsml/validate.rb +57 -0
data/lib/asciimath2unitsml/version.rb +1 -1
data/spec/conv_spec.rb +29 -29
metadata +3 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eabcf099e41ebc168ea5904e903893af61c95667e0f778fdf17e39e18fd867a
-  data.tar.gz: 6316d4d968b656249cd69b255e8c68f9f0c7307055fe55d205902c9409d21a9b
+  metadata.gz: f51b82e234fddaf66252f77a276a3acf68dae4356502a3c900253f5d4d4dffcf
+  data.tar.gz: 59dd18f009952329c1c07af2132ec06123c06dd3caea4ee7f22f17c0f4ec1cbc
 SHA512:
-  metadata.gz: 4450d314da42fa0941730c668090c7d3bef43ccd8da4a9ad7e5b29a008dcb8abbf9935732229f988a58cbe624ec10eba52e2400efddb7b09a71b6fe51d9ee579
-  data.tar.gz: 66e66fee285dc9788006a58b98e0e3660b8e829aa29c601eb45a3d2ad263da31582df9267a2a93053f24d0ff89503092395b0ec1ff3ffe8d99ec6161b05a260c
+  metadata.gz: 9a925e3db85d3086d676c07c101609e87674d620394f5fa0a536ab3652f3aa9c0cc6a74507d79264e0154bf51ea4121d47b7275a94212bc934b822b0392a9970
+  data.tar.gz: 59d98ebd629a20e8f03dc32a1870474e5808b9d38f51a87feec5eae9f0746535bed9dcf38b1faf3939319bb3989b1d926088e8d834388e48f045070e3749312a

data/lib/asciimath2unitsml/conv.rb CHANGED Viewed

@@ -7,6 +7,7 @@ require_relative "string"
 require_relative "parse"
 require_relative "render"
 require_relative "unit"
+require_relative "validate"
 module Asciimath2UnitsML
   MATHML_NS = "http://www.w3.org/1998/Math/MathML".freeze
@@ -14,56 +15,57 @@ module Asciimath2UnitsML
   class Conv
     def initialize(options = {})
-      @dimensions_id = read_yaml("../unitsdb/dimensions.yaml").
-        each_with_object({}) do |(k, v), m|
+      @dimensions_id = read_yaml("../unitsdb/dimensions.yaml")
+        .each_with_object({}) do |(k, v), m|
         m[k.to_s] = UnitsDB::Dimension.new(k, v)
       end
-      @prefixes_id = read_yaml("../unitsdb/prefixes.yaml").
-        each_with_object({}) do |(k, v), m|
+      @prefixes_id = read_yaml("../unitsdb/prefixes.yaml")
+        .each_with_object({}) do |(k, v), m|
         m[k] = UnitsDB::Prefix.new(k, v)
       end
       @prefixes = flip_name_and_symbol(@prefixes_id)
-      @quantities = read_yaml("../unitsdb/quantities.yaml").
-        each_with_object({}) do |(k, v), m|
+      @quantities = read_yaml("../unitsdb/quantities.yaml")
+        .each_with_object({}) do |(k, v), m|
         m[k.to_s] = UnitsDB::Quantity.new(k, v)
       end
-      @units_id = read_yaml("../unitsdb/units.yaml").
-        each_with_object({}) do |(k, v), m|
+      @units_id = read_yaml("../unitsdb/units.yaml")
+        .each_with_object({}) do |(k, v), m|
         m[k.to_s] = UnitsDB::Unit.new(k.to_s, v)
       end
       @units = flip_name_and_symbols(@units_id)
-      @symbols = @units.each_with_object({}) do |(k, v), m|
+      @symbols = @units.each_with_object({}) do |(_k, v), m|
         v.symbolids.each { |x| m[x] = v.symbols_hash[x] }
       end
       @parser = parser
-      @multiplier = multiplier(options[:multiplier] || "\u00b7")
+      @multiplier = multiplier(options[:multiplier] || "\u22c5")
     end
-    def float_to_display(f)
-      ret = f.to_f.round(1).to_s.sub(/\.0$/, "")
+    def float_to_display(float)
+      float.to_f.round(1).to_s.sub(/\.0$/, "")
     end
     def prefix(units)
-      units.map { |u| u[:prefix] }.reject { |u| u.nil? }.uniq.map do |p|
+      units.map { |u| u[:prefix] }.reject(&:nil?).uniq.map do |p|
         <<~END
-        <Prefix xmlns='#{UNITSML_NS}' prefixBase='#{@prefixes[p].base}'
-                prefixPower='#{@prefixes[p].power}' xml:id='#{@prefixes[p].id}'>
-          <PrefixName xml:lang="en">#{@prefixes[p].name}</PrefixName>
-          <PrefixSymbol type="ASCII">#{@prefixes[p].ascii}</PrefixSymbol>
-          <PrefixSymbol type="unicode">#{@prefixes[p].unicode}</PrefixSymbol>
-          <PrefixSymbol type="LaTeX">#{@prefixes[p].latex}</PrefixSymbol>
-          <PrefixSymbol type="HTML">#{htmlent @prefixes[p].html}</PrefixSymbol>
-        </Prefix>
+          <Prefix xmlns='#{UNITSML_NS}' prefixBase='#{@prefixes[p].base}'
+                  prefixPower='#{@prefixes[p].power}' xml:id='#{@prefixes[p].id}'>
+            <PrefixName xml:lang="en">#{@prefixes[p].name}</PrefixName>
+            <PrefixSymbol type="ASCII">#{@prefixes[p].ascii}</PrefixSymbol>
+            <PrefixSymbol type="unicode">#{@prefixes[p].unicode}</PrefixSymbol>
+            <PrefixSymbol type="LaTeX">#{@prefixes[p].latex}</PrefixSymbol>
+            <PrefixSymbol type="HTML">#{htmlent @prefixes[p].html}</PrefixSymbol>
+          </Prefix>
         END
       end.join("\n")
     end
     def dimension_components(dims)
       return if dims.nil? || dims.empty?
       <<~END
-      <Dimension xmlns='#{UNITSML_NS}' xml:id="#{dim_id(dims)}">
-      #{dims.map { |u| dimension1(u) }.join("\n") }
-      </Dimension>
+        <Dimension xmlns='#{UNITSML_NS}' xml:id="#{dim_id(dims)}">
+        #{dims.map { |u| dimension1(u) }.join("\n")}
+        </Dimension>
       END
     end
@@ -87,27 +89,29 @@ module Asciimath2UnitsML
       return if norm.any? do |u|
         u[:unit] == "unknown" || u[:prefix] == "unknown" || u[:unit].nil?
       end
       norm.map do |u|
         { dimension: U2D[u[:unit]][:dimension],
           unit: u[:unit],
           exponent: u[:exponent] || 1,
-          symbol: U2D[u[:unit]][:symbol] }
+          symbol: U2D[u[:unit]][:symbol] }
       end.sort { |a, b| U2D[a[:unit]][:order] <=> U2D[b[:unit]][:order] }
     end
     def dimension1(u)
-      %(<#{u[:dimension]} symbol="#{u[:symbol]}"
+      %(<#{u[:dimension]} symbol="#{u[:symbol]}"
       powerNumerator="#{float_to_display(u[:exponent])}"/>)
     end
     def dim_id(dims)
       return nil if dims.nil? || dims.empty?
       dimhash = dims.each_with_object({}) { |h, m| m[h[:dimension]] = h }
-      dimsvector = %w(Length Mass Time ElectricCurrent ThermodynamicTemperature
+      dimsvector = %w(Length Mass Time ElectricCurrent ThermodynamicTemperature
                       AmountOfSubstance LuminousIntensity PlaneAngle)
         .map { |h| dimhash.dig(h, :exponent) }.join(":")
-      id = @dimensions_id&.values&.select { |d| d.vector == dimsvector }&.
-        first&.id and return id.to_s
+      id = @dimensions_id&.values&.select { |d| d.vector == dimsvector }
+        &.first&.id and return id.to_s
       "D_" + dims.map do |d|
         U2D[d[:unit]][:symbol] +
           (d[:exponent] == 1 ? "" : float_to_display(d[:exponent]))
@@ -119,15 +123,17 @@ module Asciimath2UnitsML
     end
     def gather_units(units)
-      units.sort { |a, b| a[:unit] <=> b[:unit] }.each_with_object([]) do |k, m|
+      units.sort_by { |a| a[:unit] }.each_with_object([]) do |k, m|
         if m.empty? || m[-1][:unit] != k[:unit] then m << k
         else
           m[-1] = {
             prefix: combine_prefixes(
-              @prefixes[m[-1][:prefix]], @prefixes[k[:prefix]]),
+              @prefixes[m[-1][:prefix]], @prefixes[k[:prefix]]
+            ),
             unit: m[-1][:unit],
             exponent: (k[:exponent]&.to_f || 1) +
-            (m[-1][:exponent]&.to_f || 1) }
+              (m[-1][:exponent]&.to_f || 1),
+          }
         end
       end
     end
@@ -142,9 +148,12 @@ module Asciimath2UnitsML
         { prefix: u[:prefix], unit: "unknown", exponent: u[:exponent] }
       else
         @units[u[:unit]].si_derived_bases.each_with_object([]) do |k, m|
-          prefix = !k[:prefix].nil? && !k[:prefix].empty? ?
-            combine_prefixes(@prefixes_id[k[:prefix]], @prefixes[u[:prefix]]) :
-            u[:prefix]
+          prefix = if !k[:prefix].nil? && !k[:prefix].empty?
+                     combine_prefixes(@prefixes_id[k[:prefix]],
+                                      @prefixes[u[:prefix]])
+                   else
+                     u[:prefix]
+                   end
           m << { prefix: prefix,
                  unit: @units_id[k[:id]].symbolid,
                  exponent: (k[:power]&.to_i || 1) * (u[:exponent]&.to_f || 1) }
@@ -157,6 +166,7 @@ module Asciimath2UnitsML
       return p1.symbolid if p2.nil?
       return p2.symbolid if p1.nil?
       return "unknown" if p1.base != p2.base
       @prefixes.each do |_, p|
         return p.symbolid if p.base == p1.base && p.power == p1.power + p2.power
       end
@@ -174,13 +184,14 @@ module Asciimath2UnitsML
     def quantity(normtext, quantity)
       return unless @units[normtext] && @units[normtext].quantities.size == 1 ||
         @quantities[quantity]
       id = quantity || @units[normtext].quantities.first
       @units[normtext]&.dimension and
         dim = %( dimensionURL="##{@units[normtext].dimension}")
       <<~END
-      <Quantity xmlns='#{UNITSML_NS}' xml:id="#{id}"#{dim} quantityType="base">
-      #{quantityname(id)}
-      </Quantity>
+        <Quantity xmlns='#{UNITSML_NS}' xml:id="#{id}"#{dim} quantityType="base">
+        #{quantityname(id)}
+        </Quantity>
       END
     end
@@ -193,23 +204,24 @@ module Asciimath2UnitsML
     end
     def dimension(normtext)
-      return unless @units[normtext]&.dimension
+      return unless @units[normtext]&.dimension
       dims = dimid2dimensions(@units[normtext]&.dimension)
       <<~END
-      <Dimension xmlns='#{UNITSML_NS}' xml:id="#{@units[normtext]&.dimension}">
-      #{dims.map { |u| dimension1(u) }.join("\n") }
-      </Dimension>
+        <Dimension xmlns='#{UNITSML_NS}' xml:id="#{@units[normtext]&.dimension}">
+        #{dims.map { |u| dimension1(u) }.join("\n")}
+        </Dimension>
       END
     end
     def unitsml(units, origtext, normtext, quantity, name)
       dims = units2dimensions(units)
       <<~END
-      #{unit(units, origtext, normtext, dims, name)}
-      #{prefix(units)}
-      #{dimension(normtext)}
-      #{dimension_components(dims)}
-      #{quantity(normtext, quantity)}
+        #{unit(units, origtext, normtext, dims, name)}
+        #{prefix(units)}
+        #{dimension(normtext)}
+        #{dimension_components(dims)}
+        #{quantity(normtext, quantity)}
       END
     end
   end

data/lib/asciimath2unitsml/parse.rb CHANGED Viewed

@@ -3,71 +3,29 @@ module Asciimath2UnitsML
     include Rsec::Helpers
     def read_yaml(path)
-      validate_yaml(symbolize_keys(YAML.load_file(File.join(File.join(File.dirname(__FILE__), path)))), path)
+      validate_yaml(symbolize_keys(YAML
+        .load_file(File.join(File.join(File.dirname(__FILE__), path)))), path)
     end
     def flip_name_and_symbol(hash)
-      hash.each_with_object({}) do |(k, v), m|
+      hash.each_with_object({}) do |(_k, v), m|
         next if v.name.nil? || v.name.empty?
         m[v.symbolid] = v
       end
     end
     def flip_name_and_symbols(hash)
-      hash.each_with_object({}) do |(k, v), m|
+      hash.each_with_object({}) do |(_k, v), m|
         next if v.name.nil? || v.name.empty?
-        v.symbolids.each { |s| m[s] = v }
-      end
-    end
-    def validate_yaml(hash, path)
-      return hash if path == "../unitsdb/quantities.yaml"
-      return hash if path == "../unitsdb/dimensions.yaml"
-      hash.each_with_object({}) do |(k, v), m|
-        path == "../unitsdb/units.yaml" and validate_unit(v)
-        m = validate_symbols(m, v)
-        v[:unit_symbols]&.each { |s| validate_unit_symbol_cardinality(s, k) }
-      end
-      hash
-    end
-    def validate_unit(v)
-      if v[:quantity_reference]
-        v[:quantity_reference].is_a?(Array) or
-          raise StandardError.new "No quantity_reference array provided for unit: #{v}"
-      end
-      if v[:unit_name]
-        v[:unit_name].is_a?(Array) or raise StandardError.new "No unit_name array provided for unit: #{v}"
-      end
-    end
-    def validate_symbols(m, v)
-      symbol = symbol_key(v)
-      !symbol.nil? or raise StandardError.new "No symbol provided for unit: #{v}"
-      Array(symbol)&.each do |s|
-        m[s] && s != "1" and
-          raise StandardError.new "symbol #{s} is not unique in #{v}: already used for #{m[s]}"
-        m[s] = v
+        v.symbolids.each { |s| m[s] = v }
       end
-      m
-    end
-    def validate_unit_symbol_cardinality(us, k)
-      return true if us.nil?
-      !us[:id].nil? && !us[:ascii].nil? && !us[:html].nil? && !us[:mathml].nil? && !us[:latex].nil? &&
-        !us[:unicode].nil? and return true
-      raise StandardError.new "malformed unit_symbol for #{k}: #{us}"
-    end
-    def symbol_key(v)
-      symbol = v[:unit_symbols]&.each_with_object([]) { |s, m| m << (s["id"] || s[:id]) } ||
-        v.dig(:symbol, :ascii) || v[:symbol] #|| v[:short]
-      symbol = [symbol] if !symbol.nil? && v[:unit_symbols] && !symbol.is_a?(Array)
-      symbol
     end
     def symbolize_keys(hash)
       return hash if hash.is_a? String
       hash.inject({}) do |result, (key, value)|
         new_key = case key
                   when String then key.to_sym
@@ -97,10 +55,10 @@ module Asciimath2UnitsML
         seq("sqrt(", unit1, ")") { |x| { prefix: nil, unit: x[1], display_exponent: "0.5" } } |
         seq("sqrt(", prefix1, unit1, ")") { |x| { prefix: x[1], unit: x[2], display_exponent: "0.5" } } |
         seq("sqrt(", prefix2, unit1, ")") { |x| { prefix: x[1], unit: x[2], display_exponent: "0.5" } } |
-        seq(unit1, exponent._? & (multiplier | ")".r)) { |x| { prefix: nil, unit: x[0], display_exponent: (x[1][0] )} } |
-        seq(unit1, exponent._?).eof { |x| { prefix: nil, unit: x[0], display_exponent: (x[1][0] )} } |
-        seq(prefix1, unit1, exponent._? ) { |x| { prefix: x[0], unit: x[1], display_exponent: (x[2][0] ) } } |
-        seq(prefix2, unit1, exponent._? ) { |x| { prefix: x[0], unit: x[1], display_exponent: (x[2][0] ) } } |
+        seq(unit1, exponent._? & (multiplier | ")".r)) { |x| { prefix: nil, unit: x[0], display_exponent: (x[1][0]) } } |
+        seq(unit1, exponent._?).eof { |x| { prefix: nil, unit: x[0], display_exponent: (x[1][0]) } } |
+        seq(prefix1, unit1, exponent._? ) { |x| { prefix: x[0], unit: x[1], display_exponent: (x[2][0]) } } |
+        seq(prefix2, unit1, exponent._? ) { |x| { prefix: x[0], unit: x[1], display_exponent: (x[2][0]) } } |
         "1".r.map { |_| { prefix: nil, unit: "1", display_exponent: nil } }
       units1 = "(".r >> lazy{units} << ")" | unit
       units = seq(prefix2, "-") { |x| [{ prefix: x[0], unit: nil, display_exponent: nil }] } |
@@ -115,6 +73,7 @@ module Asciimath2UnitsML
       if !units || Rsec::INVALID[units]
         raise Rsec::SyntaxError.new "error parsing UnitsML expression", x, 1, 0
       end
       Rsec::Fail.reset
       postprocess(units, text)
     end
@@ -134,11 +93,12 @@ module Asciimath2UnitsML
     def postprocess1(units)
       inverse = false
-      units.each_with_object([]) do |u, m|
+      units.each_with_object([]) do |u, m|
         if u[:multiplier]
-          inverse = !inverse if (u[:multiplier] == "/")
+          inverse = !inverse if u[:multiplier] == "/"
         else
-          u[:exponent] = inverse ? "-#{u[:display_exponent] || '1'}" : u[:display_exponent]
+          u[:exponent] =
+            inverse ? "-#{u[:display_exponent] || '1'}" : u[:display_exponent]
           u[:exponent] = u[:exponent]&.sub(/^--+/, "")
         end
         m << u
@@ -155,11 +115,13 @@ module Asciimath2UnitsML
       xml.is_a? String and xml = Nokogiri::XML(xml)
       xml.xpath(".//m:mtext", "m" => MATHML_NS).each do |x|
         next unless %r{^unitsml\(.+\)$}.match(x.text)
         text = x.text.sub(%r{^unitsml\((.+)\)$}m, "\\1")
         units, origtext, normtext, quantity, name, symbol, multiplier = parse(text)
         rendering = symbol ? embeddedmathml(asciimath2mathml(symbol)) :
           mathmlsymbol(units, false, multiplier)
-        x.replace("#{delimspace(rendering, x)}<mrow xref='#{unit_id(origtext)}'>#{rendering}</mrow>\n"\
+        x.replace("#{delimspace(rendering, x)}"\
+                  "<mrow xref='#{unit_id(origtext)}'>#{rendering}</mrow>\n"\
                   "#{unitsml(units, origtext, normtext, quantity, name)}")
       end
       dedup_ids(xml)
@@ -167,19 +129,25 @@ module Asciimath2UnitsML
     # if previous sibling's last descendent non-whitespace is MathML and mn or mi, no space
     def delimspace(rendering, elem)
-      prec_text_elem = elem.xpath("./preceding-sibling::*[namespace-uri() = '#{MATHML_NS}']/"\
-                                  "descendant::text()[normalize-space()!=''][last()]/parent::*").last
-      return "" if prec_text_elem.nil? || !%w(mn mi).include?(prec_text_elem&.name)
-      text = HTMLEntities.new.encode(Nokogiri::XML("<mrow>#{rendering}</mrow>").text.strip)
+      prec_text_elem =
+        elem.xpath("./preceding-sibling::*[namespace-uri() = '#{MATHML_NS}']/"\
+                   "descendant::text()[normalize-space()!=''][last()]/parent::*").last
+      return "" if prec_text_elem.nil? ||
+        !%w(mn mi).include?(prec_text_elem&.name)
+      text = HTMLEntities.new.encode(Nokogiri::XML("<mrow>#{rendering}</mrow>")
+        .text.strip)
       /\p{L}|\p{N}/.match(text) ?
         "<mo rspace='thickmathspace'>&#x2062;</mo>" : "<mo>&#x2062;</mo>"
     end
     def dedup_ids(xml)
       %w(Unit Dimension Prefix Quantity).each do |t|
-        xml.xpath(".//m:#{t}/@xml:id", "m" => UNITSML_NS).map { |a| a.text }.uniq.each do |v|
+        xml.xpath(".//m:#{t}/@xml:id", "m" => UNITSML_NS).map(&:text)
+          .uniq.each do |v|
           xml.xpath(".//*[@xml:id = '#{v}']").each_with_index do |n, i|
-            next if i == 0
+            next if i.zero?
             n.remove
           end
         end
@@ -189,26 +157,28 @@ module Asciimath2UnitsML
     def asciimath2mathml(expression)
       AsciiMath::MathMLBuilder.new(:msword => true).append_expression(
-        AsciiMath.parse(HTMLEntities.new.decode(expression)).ast).to_s.
-      gsub(/<math>/, "<math xmlns='#{MATHML_NS}'>")
+        AsciiMath.parse(HTMLEntities.new.decode(expression)).ast).to_s
+        .gsub(/<math>/, "<math xmlns='#{MATHML_NS}'>")
     end
     def embeddedmathml(mathml)
       x = Nokogiri::XML(mathml)
-      x.xpath(".//m:mi", "m" => MATHML_NS).each { |mi| mi["mathvariant"] = "normal" }
+      x.xpath(".//m:mi", "m" => MATHML_NS)
+        .each { |mi| mi["mathvariant"] = "normal" }
       x.children.to_xml
     end
     def ambig_units
-      u = @units_id.each_with_object({}) do |(k, v), m|
+      u = @units_id.each_with_object({}) do |(_k, v), m|
         v.symbolids.each do |x|
           next if %r{[*/^]}.match(x)
           next unless v.symbols_hash[x][:html] != x
           m[v.symbols_hash[x][:html]] ||= []
           m[v.symbols_hash[x][:html]] << x
         end
       end
-      u.keys.each { |k| u[k] = u[k].unshift(k) if @symbols.dig(k, :html) == k }
+      u.each_key { |k| u[k] = u[k].unshift(k) if @symbols.dig(k, :html) == k }
       render_ambig_units(u)
     end
@@ -217,16 +187,17 @@ module Asciimath2UnitsML
       u.each { |_, v| maxcols = v.size if maxcols < v.size }
       puts %([cols="#{maxcols + 1}*"]\n|===\n|Symbol | Unit + ID #{"| " * (maxcols - 1)}\n)
       puts "\n\n"
-      u.keys.sort_by { |a| [-u[a].size, a.gsub(%r{\&[^;]+;}, "").gsub(/[^A-Za-z]/, "").downcase] }.each do |k|
+      u.keys.sort_by { |a| [-u[a].size, a.gsub(%r{\&[^;]+;}, "")
+        .gsub(/[^A-Za-z]/, "").downcase] }.each do |k|
         print "| #{html2adoc(k)} "
-        u[k].sort_by { |v1| v1.size }.each { |v1| print "| #{@units[v1].name}: `#{v1}` " }
-        puts "#{"| " * (maxcols - u[k].size) }\n"
+        u[k].sort_by(&:size).each { |v1| print "| #{@units[v1].name}: `#{v1}` " }
+        puts "#{'| ' * (maxcols - u[k].size) }\n"
       end
       puts "|===\n"
     end
-    def html2adoc(k)
-      k.gsub(%r{<i>}, "__").gsub(%r{</i>}, "__")
+    def html2adoc(elem)
+      elem.gsub(%r{<i>}, "__").gsub(%r{</i>}, "__")
         .gsub(%r{<sup>}, "^").gsub(%r{</sup>}, "^")
         .gsub(%r{<sub>}, "~").gsub(%r{</sub>}, "~")
     end

data/lib/asciimath2unitsml/validate.rb ADDED Viewed

@@ -0,0 +1,57 @@
+module Asciimath2UnitsML
+  class Conv
+    def validate_yaml(hash, path)
+      return hash if path == "../unitsdb/quantities.yaml"
+      return hash if path == "../unitsdb/dimensions.yaml"
+      hash.each_with_object({}) do |(k, v), m|
+        path == "../unitsdb/units.yaml" and validate_unit(v)
+        m = validate_symbols(m, v)
+        v[:unit_symbols]&.each { |s| validate_unit_symbol_cardinality(s, k) }
+      end
+      hash
+    end
+    def validate_unit(v)
+      if v[:quantity_reference]
+        v[:quantity_reference].is_a?(Array) or
+          raise StandardError.new "No quantity_reference array provided for unit: #{v}"
+      end
+      if v[:unit_name]
+        v[:unit_name].is_a?(Array) or
+          raise StandardError.new "No unit_name array provided for unit: #{v}"
+      end
+    end
+    def validate_symbols(m, v)
+      symbol = symbol_key(v)
+      !symbol.nil? or
+        raise StandardError.new "No symbol provided for unit: #{v}"
+      Array(symbol)&.each do |s|
+        m[s] && s != "1" and
+          raise StandardError.new "symbol #{s} is not unique in #{v}: "\
+          "already used for #{m[s]}"
+        m[s] = v
+      end
+      m
+    end
+    def validate_unit_symbol_cardinality(us, k)
+      return true if us.nil?
+      !us[:id].nil? && !us[:ascii].nil? && !us[:html].nil? &&
+        !us[:mathml].nil? && !us[:latex].nil? &&
+        !us[:unicode].nil? and return true
+      raise StandardError.new "malformed unit_symbol for #{k}: #{us}"
+    end
+    def symbol_key(v)
+      symbol = v[:unit_symbols]&.each_with_object([]) do |s, m|
+        m << (s["id"] || s[:id])
+      end || v.dig(:symbol, :ascii) || v[:symbol] #|| v[:short]
+      !symbol.nil? && v[:unit_symbols] && !symbol.is_a?(Array) and
+        symbol = [symbol]
+      symbol
+    end
+  end
+end

data/lib/asciimath2unitsml/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Asciimath2UnitsML
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

data/spec/conv_spec.rb CHANGED Viewed

@@ -11,7 +11,7 @@ RSpec.describe Asciimath2UnitsML do
          <mo rspace='thickmathspace'>&#x2062;</mo>
          <mrow xref='U_mm.s-2'>
            <mi mathvariant='normal'>mm</mi>
-           <mo>&#xB7;</mo>
+           <mo>&#x22C5;</mo>
            <msup>
              <mrow>
                <mi mathvariant='normal'>s</mi>
@@ -26,14 +26,14 @@ RSpec.describe Asciimath2UnitsML do
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>mm*s^-2</UnitName>
            <UnitSymbol type='HTML'>
-             mm&#xB7;s
+             mm&#x22C5;s
              <sup>&#x2212;2</sup>
            </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
                <mrow>
                  <mi mathvariant='normal'>mm</mi>
-                 <mo>&#xB7;</mo>
+                 <mo>&#x22C5;</mo>
                  <msup>
                    <mrow>
                      <mi mathvariant='normal'>s</mi>
@@ -418,7 +418,7 @@ OUTPUT
          <mo rspace='thickmathspace'>&#x2062;</mo>
          <mrow xref='U_kg.s-2'>
            <mi mathvariant='normal'>kg</mi>
-           <mo>&#xB7;</mo>
+           <mo>&#x22C5;</mo>
            <msup>
              <mrow>
                <mi mathvariant='normal'>s</mi>
@@ -433,14 +433,14 @@ OUTPUT
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>kg*s^-2</UnitName>
            <UnitSymbol type='HTML'>
-             kg&#xB7;s
+             kg&#x22C5;s
              <sup>&#x2212;2</sup>
            </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
                <mrow>
                  <mi mathvariant='normal'>kg</mi>
-                 <mo>&#xB7;</mo>
+                 <mo>&#x22C5;</mo>
                  <msup>
                    <mrow>
                      <mi mathvariant='normal'>s</mi>
@@ -474,7 +474,7 @@ OUTPUT
          <mo rspace='thickmathspace'>&#x2062;</mo>
          <mrow xref='U_kg.s-2'>
            <mi mathvariant='normal'>kg</mi>
-           <mo>&#xB7;</mo>
+           <mo>&#x22C5;</mo>
            <msup>
              <mrow>
                <mi mathvariant='normal'>s</mi>
@@ -500,23 +500,23 @@ OUTPUT
            <mi mathvariant='normal'>K</mi>
            <mo>/</mo>
            <mi mathvariant='normal'>kg</mi>
-           <mo>&#xB7;</mo>
+           <mo>&#x22C5;</mo>
            <mi mathvariant='normal'>m</mi>
          </mrow>
          <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_K.kg-1.m-1' dimensionURL='#D_L-1M-1Theta'>
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>K*kg^-1*m^-1</UnitName>
            <UnitSymbol type='HTML'>
-             K&#xB7;kg
+             K&#x22C5;kg
              <sup>&#x2212;1</sup>
-             &#xB7;m
+             &#x22C5;m
              <sup>&#x2212;1</sup>
            </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
                <mrow>
                  <mi mathvariant='normal'>K</mi>
-                 <mo>&#xB7;</mo>
+                 <mo>&#x22C5;</mo>
                  <msup>
                    <mrow>
                      <mi mathvariant='normal'>kg</mi>
@@ -526,7 +526,7 @@ OUTPUT
                      <mn>1</mn>
                    </mrow>
                  </msup>
-                 <mo>&#xB7;</mo>
+                 <mo>&#x22C5;</mo>
                  <msup>
                    <mrow>
                      <mi mathvariant='normal'>m</mi>
@@ -726,7 +726,7 @@ INPUT
          <mo rspace='thickmathspace'>&#x2062;</mo>
          <mrow xref='U_A.C3'>
            <mi mathvariant='normal'>A</mi>
-           <mo>&#xB7;</mo>
+           <mo>&#x22C5;</mo>
            <msup>
              <mrow>
                <mi mathvariant='normal'>C</mi>
@@ -740,14 +740,14 @@ INPUT
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>A*C^3</UnitName>
            <UnitSymbol type='HTML'>
-             A&#xB7;C
+             A&#x22C5;C
              <sup>3</sup>
            </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
                <mrow>
                  <mi mathvariant='normal'>A</mi>
-                 <mo>&#xB7;</mo>
+                 <mo>&#x22C5;</mo>
                  <msup>
                    <mrow>
                      <mi mathvariant='normal'>C</mi>
@@ -791,23 +791,23 @@ INPUT
   <mi mathvariant='normal'>J</mi>
   <mo>/</mo>
   <mi mathvariant='normal'>kg</mi>
-  <mo>&#xB7;</mo>
+  <mo>&#x22C5;</mo>
   <mi mathvariant='normal'>K</mi>
 </mrow>
 <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_NISTu13.u27p10_3e-1/1.u5e-1/1' dimensionURL='#D_L2M0T-2Theta-1'>
   <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
   <UnitName xml:lang='en'>joule per kilogram kelvin</UnitName>
   <UnitSymbol type='HTML'>
-    J&#xB7;kg
+    J&#x22C5;kg
     <sup>&#x2212;1</sup>
-    &#xB7;K
+    &#x22C5;K
     <sup>&#x2212;1</sup>
   </UnitSymbol>
   <UnitSymbol type='MathML'>
     <math xmlns='http://www.w3.org/1998/Math/MathML'>
       <mrow>
         <mi mathvariant='normal'>J</mi>
-        <mo>&#xB7;</mo>
+        <mo>&#x22C5;</mo>
         <msup>
           <mrow>
             <mi mathvariant='normal'>kg</mi>
@@ -817,7 +817,7 @@ INPUT
             <mn>1</mn>
           </mrow>
         </msup>
-        <mo>&#xB7;</mo>
+        <mo>&#x22C5;</mo>
         <msup>
           <mrow>
             <mi mathvariant='normal'>K</mi>
@@ -1131,7 +1131,7 @@ INPUT
          <mo rspace='thickmathspace'>&#x2062;</mo>
          <mrow xref='U_mW.cm-2'>
            <mi mathvariant='normal'>mW</mi>
-           <mo>&#xB7;</mo>
+           <mo>&#x22C5;</mo>
            <msup>
              <mrow>
                <mi mathvariant='normal'>cm</mi>
@@ -1146,14 +1146,14 @@ INPUT
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>mW*cm^-2</UnitName>
            <UnitSymbol type='HTML'>
-             mW&#xB7;cm
+             mW&#x22C5;cm
              <sup>&#x2212;2</sup>
            </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
                <mrow>
                  <mi mathvariant='normal'>mW</mi>
-                 <mo>&#xB7;</mo>
+                 <mo>&#x22C5;</mo>
                  <msup>
                    <mrow>
                      <mi mathvariant='normal'>cm</mi>
@@ -1254,7 +1254,7 @@ INPUT
            <UnitSymbol type='HTML'>
              cal
              <sub>th</sub>
-             &#xB7;cm
+             &#x22C5;cm
              <sup>&#x2212;2</sup>
            </UnitSymbol>
            <UnitSymbol type='MathML'>
@@ -1268,7 +1268,7 @@ INPUT
                      <mi mathvariant='normal'>th</mi>
                    </mrow>
                  </msub>
-                 <mo>&#xB7;</mo>
+                 <mo>&#x22C5;</mo>
                  <msup>
                    <mrow>
                      <mi mathvariant='normal'>cm</mi>
@@ -1348,14 +1348,14 @@ INPUT
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>cm*s^-2</UnitName>
            <UnitSymbol type='HTML'>
-             cm&#xB7;s
+             cm&#x22C5;s
              <sup>&#x2212;2</sup>
            </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
                <mrow>
                  <mi mathvariant='normal'>cm</mi>
-                 <mo>&#xB7;</mo>
+                 <mo>&#x22C5;</mo>
                  <msup>
                    <mrow>
                      <mi mathvariant='normal'>s</mi>
@@ -1412,14 +1412,14 @@ INPUT
     <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
     <UnitName xml:lang='en'>cm*s^-2</UnitName>
     <UnitSymbol type='HTML'>
-      cm&#xB7;s
+      cm&#x22C5;s
       <sup>&#x2212;2</sup>
     </UnitSymbol>
     <UnitSymbol type='MathML'>
       <math xmlns='http://www.w3.org/1998/Math/MathML'>
         <mrow>
           <mi mathvariant='normal'>cm</mi>
-          <mo>&#xB7;</mo>
+          <mo>&#x22C5;</mo>
           <msup>
             <mrow>
               <mi mathvariant='normal'>s</mi>

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciimath2unitsml
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -245,6 +245,7 @@ files:
 - lib/asciimath2unitsml/render.rb
 - lib/asciimath2unitsml/string.rb
 - lib/asciimath2unitsml/unit.rb
+- lib/asciimath2unitsml/validate.rb
 - lib/asciimath2unitsml/version.rb
 - lib/unitsdb/dimensions.yaml
 - lib/unitsdb/prefixes.yaml