unitsml 0.6.0 → 0.6.2

data/lib/unitsml/parse.rb

@@ -1,50 +1,61 @@
 # frozen_string_literal: true
 
-require 'parslet'
+require "parslet"
 
 module Unitsml
   class Parse < Parslet::Parser
     include IntermediateExpRules
 
-    rule(:sqrt)  { str('sqrt') }
-    rule(:power) { str('^') >> slashed_number_int_exp.as(:power_numerator) }
-    rule(:hyphen) { str('-') }
+    rule(:sqrt)  { str("sqrt") }
+    rule(:power) { str("^") >> slashed_number_int_exp.as(:power_numerator) }
+    rule(:hyphen) { str("-") }
     rule(:number) { hyphen.maybe >> match(/[0-9]/).repeat(1) }
     rule(:spaces) { match(/\s/).repeat(1) }
     rule(:spaces?) { spaces.maybe }
 
-    rule(:extender) { (forward_slashes | str('*')).as(:extender) }
-    rule(:sequence) { single_letter_prefixes >> units | double_letter_prefixes >> units | units }
+    rule(:extender) { (forward_slashes | str("*")).as(:extender) }
+    rule(:sequence) do
+      (single_letter_prefixes >> units) | (double_letter_prefixes >> units) | units
+    end
 
-    rule(:opening_paren)   { str('(') }
-    rule(:closing_paren)   { str(')') }
+    rule(:opening_paren)   { str("(") }
+    rule(:closing_paren)   { str(")") }
     rule(:unit_and_power)  { units >> power.maybe }
-    rule(:slashed_number)  { (number >> (forward_slashes >> number).maybe).as(:integer) }
-    rule(:forward_slashes) { str('//') | str('/') }
-    rule(:dimension_rules) { (sqrt_dimensions | powered_dimensions) >> extended_dimension_rules.maybe }
+    rule(:slashed_number)  do
+      (number >> (forward_slashes >> number).maybe).as(:integer)
+    end
+    rule(:forward_slashes) { str("//") | str("/") }
+    rule(:dimension_rules) do
+      (sqrt_dimensions | powered_dimensions) >> extended_dimension_rules.maybe
+    end
     rule(:powered_dimensions) { dimensions >> power.maybe }
 
     rule(:units) do
-      @@filtered_units ||= arr_to_expression(::Unitsml::Unitsdb.units.filtered, 'unit')
+      @@filtered_units ||= arr_to_expression(::Unitsml::Unitsdb.units.filtered,
+                                             "unit")
     end
 
     rule(:single_letter_prefixes) do
-      @@prefixes1 ||= arr_to_expression(::Unitsml::Unitsdb.prefixes_by_size(1), 'prefix')
+      @@prefixes1 ||= arr_to_expression(::Unitsml::Unitsdb.prefixes_by_size(1),
+                                        "prefix")
     end
 
     rule(:double_letter_prefixes) do
-      @@prefixes2 ||= arr_to_expression(::Unitsml::Unitsdb.prefixes_by_size(2), 'prefix')
+      @@prefixes2 ||= arr_to_expression(::Unitsml::Unitsdb.prefixes_by_size(2),
+                                        "prefix")
     end
 
     rule(:dimensions) do
-      @@dimensions ||= arr_to_expression(::Unitsml::Unitsdb.dimensions.parsables.keys, 'dimension')
+      @@dimensions ||= arr_to_expression(
+        ::Unitsml::Unitsdb.dimensions.parsables.keys, "dimension"
+      )
     end
 
     rule(:prefixes_units) do
       (sqrt_sequence >> extended_prefixed_units.maybe) |
-        (str('1').as(:unit) >> extended_prefixed_units.maybe) |
+        (str("1").as(:unit) >> extended_prefixed_units.maybe) |
         (unit_and_power >> extended_prefixed_units) |
-        unit_and_power >> (any.absent? | (extender | opening_paren | closing_paren | spaces).present?) |
+        (unit_and_power >> (any.absent? | (extender | opening_paren | closing_paren | spaces).present?)) |
         (double_letter_prefixes >> unit_and_power >> extended_prefixed_units) |
         (double_letter_prefixes >> unit_and_power) |
         (single_letter_prefixes >> unit_and_power >> extended_prefixed_units) |
@@ -54,8 +65,8 @@ module Unitsml
     rule(:expression) do
       prefixes_units_int_exp |
         dimension_rules_int_exp |
-        single_letter_prefixes >> hyphen |
-        double_letter_prefixes >> hyphen
+        (single_letter_prefixes >> hyphen) |
+        (double_letter_prefixes >> hyphen)
     end
 
     root :expression

data/lib/unitsml/parser.rb

@@ -8,7 +8,7 @@ module Unitsml
       @regexp = /(quantity|name|symbol|multiplier):\s*/
       @text = extract_equation(text)
       @orig_text = @text
-      @text = @text.gsub('−', '-')
+      @text = @text.gsub("−", "-")
       post_extras
     end
 
@@ -21,10 +21,10 @@ module Unitsml
         explicit_value: @extras_hash,
         root: true,
         orig_text: @orig_text,
-        norm_text: text
+        norm_text: text,
       )
       update_units_exponents(formula.value, false)
-      formula.value.first.only_instance = true if text.end_with?('-')
+      formula.value.first.only_instance = true if text.end_with?("-")
       formula
     end
 
@@ -33,7 +33,7 @@ module Unitsml
         if object.is_a?(Sqrt)
           object = object.value
           if object.respond_to?(:power_numerator)
-            object.power_numerator = Number.new('0.5')
+            object.power_numerator = Number.new("0.5")
           else
             update_units_exponents([object], inverse, true)
           end
@@ -41,12 +41,12 @@ module Unitsml
 
         case object
         when Unit
-          next object.power_numerator = Number.new('0.5') if sqrt
+          next object.power_numerator = Number.new("0.5") if sqrt
           next unless inverse
 
           inverse ? object.inverse_power_numerator : object.power_numerator
-        when Dimension then object.power_numerator = Number.new('0.5') if sqrt
-        when Extender then inverse = !inverse if ['/', '//'].any?(object.symbol)
+        when Dimension then object.power_numerator = Number.new("0.5") if sqrt
+        when Extender then inverse = !inverse if ["/", "//"].any?(object.symbol)
         when Formula then update_units_exponents(object.value, inverse)
         when Fenced then update_units_exponents([object.value], inverse, sqrt)
         end
@@ -57,7 +57,7 @@ module Unitsml
       return nil unless @regexp.match?(text)
 
       @extras_hash = {}
-      texts_array = text&.split(',')&.map(&:strip)
+      texts_array = text&.split(",")&.map(&:strip)
       @text = texts_array&.shift
       texts_array&.map { |text| parse_extras(text) }
     end
@@ -65,16 +65,16 @@ module Unitsml
     def parse_extras(text)
       return nil unless @regexp.match?(text)
 
-      key, _, value = text&.partition(':')
+      key, _, value = text&.partition(":")
       @extras_hash[key&.to_sym] ||= value&.strip
     end
 
     private
 
     def extract_equation(text)
-      return text unless text&.start_with?('unitsml(')
+      return text unless text&.start_with?("unitsml(")
 
-      text.delete_prefix('unitsml(').delete_suffix(')')
+      text.delete_prefix("unitsml(").delete_suffix(")")
     end
   end
 end

data/lib/unitsml/prefix.rb

@@ -20,11 +20,13 @@ module Unitsml
     end
 
     def id
-      @id ||= prefix_instance.identifiers.find { |prefix| prefix.type == 'nist' }&.id
+      @id ||= prefix_instance.identifiers.find do |prefix|
+        prefix.type == "nist"
+      end&.id
     end
 
     def name
-      @name ||= prefix_instance.names.find { |name| name.lang == 'en' }.value
+      @name ||= prefix_instance.names.find { |name| name.lang == "en" }.value
     end
 
     def prefix_symbols
@@ -34,8 +36,8 @@ module Unitsml
     def to_mathml(_)
       symbol = Utility.string_to_html_entity(
         Utility.html_entity_to_unicode(
-          prefix_symbols.html
-        )
+          prefix_symbols.html,
+        ),
       )
       return symbol unless only_instance
 

data/lib/unitsml/transform.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'parslet'
+require "parslet"
 module Unitsml
   class Transform < Parslet::Transform
     rule(sqrt: simple(:sqrt)) { Sqrt.new(sqrt) }
@@ -24,7 +24,7 @@ module Unitsml
     rule(first_int_exp_set: simple(:first_set),
          second_int_exp_set: simple(:second_set)) do
       Formula.new(
-        [Utility.set_to_fence(first_set), Utility.set_to_fence(second_set)]
+        [Utility.set_to_fence(first_set), Utility.set_to_fence(second_set)],
       )
     end
 
@@ -33,8 +33,8 @@ module Unitsml
       Formula.new(
         [
           first_set,
-          second_set
-        ]
+          second_set,
+        ],
       )
     end
 
@@ -43,8 +43,8 @@ module Unitsml
       Formula.new(
         [
           first_set,
-          Utility.set_to_fence(second_set)
-        ]
+          Utility.set_to_fence(second_set),
+        ],
       )
     end
 
@@ -76,8 +76,8 @@ module Unitsml
         [
           first_set,
           Extender.new(extender.to_s),
-          second_set
-        ]
+          second_set,
+        ],
       )
     end
 
@@ -88,8 +88,8 @@ module Unitsml
         [
           implicit_extended,
           Extender.new(extender.to_s),
-          sequence
-        ]
+          sequence,
+        ],
       )
     end
 
@@ -100,8 +100,8 @@ module Unitsml
         [
           int_exp,
           Extender.new(extender.to_s),
-          sequence
-        ]
+          sequence,
+        ],
       )
     end
 
@@ -112,8 +112,8 @@ module Unitsml
         [
           Unit.new(unit.to_s),
           Extender.new(extender.to_s),
-          sequence
-        ]
+          sequence,
+        ],
       )
     end
 
@@ -124,8 +124,8 @@ module Unitsml
         [
           Dimension.new(dimension.to_s),
           Extender.new(extender.to_s),
-          sequence
-        ]
+          sequence,
+        ],
       )
     end
 
@@ -135,7 +135,7 @@ module Unitsml
       Fenced.new(
         open_paren.to_s,
         int_exp,
-        close_paren.to_s
+        close_paren.to_s,
       )
     end
 
@@ -145,7 +145,7 @@ module Unitsml
       Fenced.new(
         open_paren.to_s,
         Number.new(integer.to_s),
-        close_paren.to_s
+        close_paren.to_s,
       )
     end
 
@@ -157,8 +157,8 @@ module Unitsml
         [
           Unit.new(unit.to_s, power_numerator),
           Extender.new(ext.to_s),
-          sequence
-        ]
+          sequence,
+        ],
       )
     end
 
@@ -170,8 +170,8 @@ module Unitsml
         [
           Dimension.new(dimension.to_s, power_numerator),
           Extender.new(ext.to_s),
-          sequence
-        ]
+          sequence,
+        ],
       )
     end
 
@@ -183,8 +183,8 @@ module Unitsml
         [
           Unit.new(unit.to_s, prefix: Prefix.new(prefix.to_s)),
           Extender.new(ext.to_s),
-          sequence
-        ]
+          sequence,
+        ],
       )
     end
 
@@ -197,8 +197,8 @@ module Unitsml
         [
           Unit.new(unit.to_s, power_numerator, prefix: Prefix.new(prefix.to_s)),
           Extender.new(ext.to_s),
-          sequence
-        ]
+          sequence,
+        ],
       )
     end
   end

data/lib/unitsml/unit.rb

@@ -4,7 +4,8 @@ module Unitsml
   class Unit
     attr_accessor :unit_name, :power_numerator, :prefix
 
-    SI_UNIT_SYSTEM = %w[si_base si_derived_special si_derived_non_special].freeze
+    SI_UNIT_SYSTEM = %w[si_base si_derived_special
+                        si_derived_non_special].freeze
 
     def initialize(unit_name,
                    power_numerator = nil,
@@ -41,7 +42,7 @@ module Unitsml
       if power_numerator
         value = msup_tag(
           { method_name: tag_name, value: value },
-          options
+          options,
         )
         tag_name = :msup
       end
@@ -77,7 +78,7 @@ module Unitsml
     end
 
     def enumerated_name
-      unit_instance.names.find { |name| name.lang == 'en' }&.value
+      unit_instance.names.find { |name| name.lang == "en" }&.value
     end
 
     def prefix_name
@@ -108,7 +109,7 @@ module Unitsml
       if power_numerator
         power_numerator.update_negative_sign
       else
-        @power_numerator = Number.new('-1')
+        @power_numerator = Number.new("-1")
       end
     end
 
@@ -118,7 +119,7 @@ module Unitsml
       return unless power_numerator
 
       exp = power_numerator.raw_value
-      "^#{exp}" if exp != '1'
+      "^#{exp}" if exp != "1"
     end
 
     def system_reference
@@ -132,7 +133,8 @@ module Unitsml
       [value, power_numerator.to_mathml(options)].flatten.each do |record|
         values = msup.public_send("#{record[:method_name]}_value") || []
         values += [record[:value]]
-        msup.element_order << Lutaml::Xml::Element.new('Element', record[:method_name].to_s)
+        msup.element_order << Lutaml::Xml::Element.new("Element",
+                                                       record[:method_name].to_s)
         msup.public_send("#{record[:method_name]}_value=", values)
       end
       msup

data/lib/unitsml/unitsdb/dimension.rb

@@ -9,46 +9,50 @@ module Unitsml
                   :vector
 
       def initialize(attrs)
-        super
         @parsables = {}
         @processed_keys = []
         @parsable = false
+        super
       end
 
       def length=(value)
-        quantities_common_code(:length, value)
+        quantities_common_code(:length, wrap_dimension_value(value))
       end
 
       def mass=(value)
-        quantities_common_code(:mass, value)
+        quantities_common_code(:mass, wrap_dimension_value(value))
       end
 
       def time=(value)
-        quantities_common_code(:time, value)
+        quantities_common_code(:time, wrap_dimension_value(value))
       end
 
       def thermodynamic_temperature=(value)
-        quantities_common_code(:thermodynamic_temperature, value)
+        quantities_common_code(:thermodynamic_temperature,
+                               wrap_dimension_value(value))
       end
 
       def amount_of_substance=(value)
-        quantities_common_code(:amount_of_substance, value)
+        quantities_common_code(:amount_of_substance,
+                               wrap_dimension_value(value))
       end
 
       def luminous_intensity=(value)
-        quantities_common_code(:luminous_intensity, value)
+        quantities_common_code(:luminous_intensity, wrap_dimension_value(value))
       end
 
       def plane_angle=(value)
-        quantities_common_code(:plane_angle, value)
+        quantities_common_code(:plane_angle, wrap_dimension_value(value))
       end
 
       def electric_current=(value)
-        quantities_common_code(:electric_current, value)
+        quantities_common_code(:electric_current, wrap_dimension_value(value))
       end
 
       def dim_symbols
-        processed_keys.map { |vec| public_send(vec)&.dim_symbols&.map(&:id) }.flatten.compact
+        processed_keys.map do |vec|
+          public_send(vec)&.dim_symbols&.map(&:id)
+        end.flatten.compact
       end
 
       def processed_symbol
@@ -58,11 +62,11 @@ module Unitsml
       def set_vector
         @set_vector ||= Utility::DIMS_VECTOR.map do |h|
           public_send(Utility.underscore(h))&.power
-        end.join(':')
+        end.join(":")
       end
 
       def id
-        identifiers.find { |id| id.type == 'nist' }&.id
+        identifiers.find { |id| id.type == "nist" }&.id
       end
 
       private
@@ -77,6 +81,14 @@ module Unitsml
         @parsable = true
         value.dim_symbols_ids(@parsables, id)
       end
+
+      def wrap_dimension_value(value)
+        return value if value.is_a?(DimensionQuantity)
+        return DimensionQuantity.new(value.to_hash) if value.is_a?(::Unitsdb::DimensionDetails)
+        return DimensionQuantity.new(value) if value.is_a?(Hash)
+
+        value
+      end
     end
   end
 end

data/lib/unitsml/unitsdb/dimensions.rb

@@ -3,6 +3,10 @@
 module Unitsml
   module Unitsdb
     class Dimensions < ::Unitsdb::Dimensions
+      def dimensions=(value)
+        super(value.map { |d| Dimension.new(d.to_hash) })
+      end
+
       def find_by_vector(vector)
         dimensions.each(&:set_vector)
         dimensions.find { |dim| dim.set_vector == vector }

data/lib/unitsml/unitsdb/prefix_reference.rb

@@ -16,7 +16,9 @@ module Unitsml
       end
 
       def prefix
-        @prefix ||= Unitsdb.prefixes.find_by_id(id)
+        @prefix ||= ::Unitsdb.database.prefixes.find do |p|
+          p.identifiers.any? { |i| i.id == id }
+        end
       end
     end
   end

data/lib/unitsml/unitsdb/si_derived_base.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Unitsml
+  module Unitsdb
+    class SiDerivedBase < ::Unitsdb::SiDerivedBase
+      def prefix_reference=(value)
+        return super if value.nil?
+        return super if value.is_a?(PrefixReference)
+
+        super(PrefixReference.new(value.to_hash))
+      end
+    end
+  end
+end

data/lib/unitsml/unitsdb/unit.rb

@@ -3,18 +3,26 @@
 module Unitsml
   module Unitsdb
     class Unit < ::Unitsdb::Unit
+      def si_derived_bases=(value)
+        return super if value.nil?
+
+        super(value.map do |s|
+          SiDerivedBase.new(s.to_hash)
+        end)
+      end
+
       def dimension_url
         quantity_id = quantity_references[0].id
-        quantity = Unitsdb.quantities.find_by_id(quantity_id)
+        quantity = Unitsml::Unitsdb.quantities.find_by_id(quantity_id)
         quantity.dimension_reference.id
       end
 
       def en_name
-        names.find { |name| name.lang == 'en' }&.value
+        names.find { |name| name.lang == "en" }&.value
       end
 
       def nist_id
-        identifiers.find { |id| id.type == 'nist' }&.id
+        identifiers.find { |id| id.type == "nist" }&.id
       end
     end
   end

data/lib/unitsml/unitsdb/units.rb

@@ -3,6 +3,10 @@
 module Unitsml
   module Unitsdb
     class Units < ::Unitsdb::Units
+      def units=(value)
+        super(value.map { |u| Unit.new(u.to_hash) })
+      end
+
       def find_by_id(u_id)
         find(u_id, :id, :identifiers)
       end

data/lib/unitsml/unitsdb.rb

@@ -10,44 +10,34 @@ module Unitsml
     autoload :Quantities, "#{__dir__}/unitsdb/quantities"
     autoload :PrefixReference, "#{__dir__}/unitsdb/prefix_reference"
     autoload :DimensionQuantity, "#{__dir__}/unitsdb/dimension_quantity"
+    autoload :SiDerivedBase, "#{__dir__}/unitsdb/si_derived_base"
 
     class << self
-      def load_file(file_name)
-        @@hash ||= {}
-        @@hash[file_name] ||= File.read(valid_path(file_name))
-      end
-
       def units
-        @@units_file ||= Unitsml.get_class_from_register(:unitsdb_units).from_yaml(load_file(:units))
+        Units.new(units: ::Unitsdb.database.units)
       end
 
       def prefixes
-        @@prefixes ||= Unitsml.get_class_from_register(:unitsdb_prefixes).from_yaml(load_file(:prefixes))
+        Prefixes.new(prefixes: ::Unitsdb.database.prefixes)
       end
 
       def dimensions
-        @@dim_file ||= Unitsml.get_class_from_register(:unitsdb_dimensions).from_yaml(load_file(:dimensions))
+        Dimensions.new(dimensions: ::Unitsdb.database.dimensions)
       end
 
       def quantities
-        @@quantities ||= Unitsml.get_class_from_register(:unitsdb_quantities).from_yaml(load_file(:quantities))
+        Quantities.new(quantities: ::Unitsdb.database.quantities)
       end
 
       def prefixes_array
-        @@prefixes_array ||= prefixes.ascii_symbols.sort_by(&:length)
+        @prefixes_array ||= prefixes.ascii_symbols.sort_by(&:length)
       end
 
       def prefixes_by_size(size)
-        @@sized_prefixes ||= {}
-        return @@sized_prefixes[size] if @@sized_prefixes.key?(size)
-
-        @@sized_prefixes[size] = prefixes_array.select { |p| p.size == size }
-      end
+        @sized_prefixes ||= {}
+        return @sized_prefixes[size] if @sized_prefixes.key?(size)
 
-      def valid_path(file_name)
-        File.expand_path(
-          File.join(__dir__, '..', '..', 'unitsdb', "#{file_name}.yaml")
-        )
+        @sized_prefixes[size] = prefixes_array.select { |p| p.size == size }
       end
     end
   end