unitsml 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a775437dde5a269c76fd4529f22f22eb41193345ef08cba32ac1e96cd5ebb74
-  data.tar.gz: 354441d98afb6f35ea037d8530faf7672a24002b16a0a78b5b8ac4cf9b11e650
+  metadata.gz: 5eec8700e144a7983623483da1e4093d961a717e0344f429ec03687257f1450f
+  data.tar.gz: 40b736d843d780c4b1366b11eb1441cbc53ba611f16507a33482b3f1c702ed7c
 SHA512:
-  metadata.gz: 49a85665c41be2e35c0e4ce380b92adb2d8243293a841efab83673f2cdf61e7c3d7d13f8ba4cad9d6a6ffab8c9dc68f54038fa079961c6fc3c9add266ad27849
-  data.tar.gz: 1a231c9ba814a87cdf88ae3fc64e5cf4a8d1d6362dc0411c9169b1e437f4ddddad037ab93651b5b3daec8c9e8d86d192370e7ae4e1b8595b5c3cb3588f00b3e8
+  metadata.gz: b14c95f4aaa4c223138212b82e082e42b5ae5d86689d4186d657f8b97dc9c8553b171c14cf08b386c930dae4ac2532400ecb286b9624a36c8e29a4fb8d8d6c10
+  data.tar.gz: cc1a2a790ae2084763eddda110f3fd7a3425d3cf8ae93c65649b7496e4f6fa6c4a52c856bee4bbc2e436ca09aff9a3ce852316ba7407dffea9949a763b4af0f6

data/Gemfile

@@ -3,4 +3,12 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in unitsml.gemspec
 gemspec
 
-gem "rake"
+gem "byebug"
+gem "equivalent-xml"
+gem "oga"
+gem "plurimath"
+gem "pry"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "simplecov"

data/lib/unitsml/error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Unitsml
+  class Error < StandardError
+  end
+end
+
+require_relative "errors/plurimath_load_error"

data/lib/unitsml/errors/plurimath_load_error.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Unitsml
+  module Errors
+    class PlurimathLoadError < Unitsml::Error
+      def to_s
+        <<~MESSAGE
+          [unitsml] Error: Failed to require 'plurimath'.
+          [unitsml] Please add 'plurimath' in your gemfile and run 'bundle install'
+          [unitsml] OR
+          [unitsml] run following command to install the gem:
+          [unitsml] gem install plurimath
+          [unitsml] If this is a bug, please report at our official issue tracker:
+          [unitsml] https://github.com/unitsml/unitsml-ruby/issues
+        MESSAGE
+      end
+    end
+  end
+end

data/lib/unitsml/formula.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "plurimath"
 require_relative "utility"
 module Unitsml
   class Formula
@@ -68,6 +67,7 @@ module Unitsml
     end
 
     def to_plurimath
+      ensure_plurimath_defined!
       return Plurimath::Math.parse(to_asciimath, :asciimath) if @orig_text.match?(/-$/)
 
       Plurimath::Math.parse(to_mathml, :mathml)
@@ -160,5 +160,13 @@ module Unitsml
         Utility.quantity(norm_text, explicit_value&.dig(:quantity)),
       ].join
     end
+
+    def ensure_plurimath_defined!
+      return if Object.const_defined?(:Plurimath)
+
+      require "plurimath"
+    rescue LoadError => e
+      raise Errors::PlurimathLoadError
+    end
   end
 end

data/lib/unitsml/parser.rb

@@ -8,6 +8,7 @@ module Unitsml
       @regexp = %r{(quantity|name|symbol|multiplier):\s*}
       @text = text&.match(/unitsml\((.*)\)/) ? Regexp.last_match[1] : text
       @orig_text = @text
+      @text = @text.gsub("−", "-")
       post_extras
     end
 

data/lib/unitsml/utility.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 require "ox"
+require "htmlentities"
 module Unitsml
   module Utility
+    Ox.default_options = { encoding: "UTF-8" }
 
     UNITSML_NS = "https://schema.unitsml.org/unitsml/1.0".freeze
     # Unit to dimension

data/lib/unitsml/version.rb

@@ -1,3 +1,3 @@
 module Unitsml
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/lib/unitsml.rb

@@ -1,3 +1,4 @@
+require "unitsml/error"
 require "unitsml/sqrt"
 require "unitsml/unit"
 require "unitsml/parse"

data/unitsml.gemspec

@@ -28,12 +28,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "unitsdb/**/*.yaml"]
 
   spec.add_dependency "htmlentities"
-  spec.add_dependency "plurimath", "~> 0.8.4"
-  spec.add_development_dependency "byebug"
-  spec.add_development_dependency "equivalent-xml"
-  spec.add_development_dependency "pry", "~> 0.12.2"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
-  spec.add_development_dependency "simplecov", "~> 0.15"
+  spec.add_dependency "ox"
+  spec.add_dependency "parslet"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitsml
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -25,27 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: plurimath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.4
-- !ruby/object:Gem::Dependency
-  name: byebug
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,89 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.54.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.54.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
 description: Gem-wrapper for working with unitsdb
 email:
 - open.source@ribose.com
@@ -158,6 +74,8 @@ files:
 - docs/navigation.adoc
 - lib/unitsml.rb
 - lib/unitsml/dimension.rb
+- lib/unitsml/error.rb
+- lib/unitsml/errors/plurimath_load_error.rb
 - lib/unitsml/extender.rb
 - lib/unitsml/formula.rb
 - lib/unitsml/parse.rb