mml 1.0.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f5cead9c67648d4832c53955d29c71ed5ce9effc4d949ec4fde1ef029e1c08
-  data.tar.gz: 2223572c63e4cd432ce8f92e6e9174fac687f92b5a18d9f701cc501b8b3843b6
+  metadata.gz: 4edc2cd98bf5ea40cd990bc2f7de88334fda8964d0d50b5c7a3347624276dca6
+  data.tar.gz: aaec60ab3f027aa98e7f1bc8690551714414f463802cd981c6f724da8c4c8e9a
 SHA512:
-  metadata.gz: 2ac0a7546e651f323eaad7e1a76899309bb0e8f1856de2b8f180d0d7b16666cbfddf89990d6256fc23ec796603e09ec902c4947e87ae3e646aa61ea42d867de0
-  data.tar.gz: e3915cfc2aaae307091e797c2db31584047cf38bd26d8b205752fc82270cfeb4d7d528ee53db86b343e01cc8ec2787bb3de10ba6f5d6e8bac6988de0eb5fcc45
+  metadata.gz: d6db4bcf4ae1dd66116a5e6e5a90915f2e03ccf205840752fcf682f693e0078a46a38a89f5fa7178101d2fa0400c4638d3afda8561ecc6cdd7ec04f75b5b7b6f
+  data.tar.gz: 412834bc7a1872505e480d35c01a58c35cde48eeac5525239d6da2d0622e67597a2735ada95baf0f9fa77c4155c330e8597b98b960282e364d3399a8f5de37d3

data/lib/mml/configuration.rb

@@ -52,6 +52,11 @@ module Mml
       self.config.merge!(config)
     end
 
+    def custom_models=(models_hash)
+      # { Mi => CustomMiClass, Mo => CustomMoClass }
+      models_hash.each { |klass, model| klass.model(model) }
+    end
+
     def adapter
       Lutaml::Model::Config.xml_adapter
     end

data/lib/mml/maction.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Maction < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:maction)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :actiontype, :string

data/lib/mml/maligngroup.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Maligngroup < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:maligngroup)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :groupalign, :string

data/lib/mml/malignmark.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Malignmark < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:malignmark)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :edge, :string

data/lib/mml/math_with_namespace.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class MathWithNamespace < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:math)
-
     Mml::Configuration::SUPPORTED_TAGS.each do |tag|
       attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
     end

data/lib/mml/math_with_nil_namespace.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class MathWithNilNamespace < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:math)
-
     Mml::Configuration::SUPPORTED_TAGS.each do |tag|
       attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
     end

data/lib/mml/menclose.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Menclose < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:menclose)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :notation, :string

data/lib/mml/merror.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Merror < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:merror)
-
     attribute :mathbackground, :string
     attribute :mathcolor, :string
     Mml::Configuration::SUPPORTED_TAGS.each do |tag|

data/lib/mml/mfenced.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mfenced < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mfenced)
-
     attribute :mathbackground, :string
     attribute :separators, :string
     attribute :mathcolor, :string

data/lib/mml/mfrac.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mfrac < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mfrac)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :linethickness, :string

data/lib/mml/mfraction.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mfraction < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mfraction)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :linethickness, :string

data/lib/mml/mglyph.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mglyph < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mglyph)
-
     attribute :alt, :string
     attribute :src, :string
     attribute :width, :string

data/lib/mml/mi.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mi < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mi)
-
     attribute :dir, :string
     attribute :value, :string
     attribute :color, :string

data/lib/mml/mlabeledtr.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mlabeledtr < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mlabeledtr)
-
     attribute :mathbackground, :string
     attribute :columnalign, :string
     attribute :groupalign, :string

data/lib/mml/mlongdiv.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mlongdiv < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mlongdiv)
-
     attribute :mathbackground, :string
     attribute :longdivstyle, :string
     attribute :mathcolor, :string

data/lib/mml/mmultiscripts.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mmultiscripts < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mmultiscripts)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :subscriptshift, :string

data/lib/mml/mn.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mn < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mn)
-
     attribute :value, :string
     attribute :mathcolor, :string
     attribute :mathbackground, :string

data/lib/mml/mo.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mo < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mo)
-
     attribute :value, :string
     attribute :mathcolor, :string
     attribute :mathbackground, :string

data/lib/mml/mover.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mover < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mover)
-
     attribute :mathbackground, :string
     attribute :mathcolor, :string
     attribute :accent, :string

data/lib/mml/mpadded.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mpadded < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mpadded)
-
     attribute :mathbackground, :string
     attribute :mathcolor, :string
     attribute :voffset, :string

data/lib/mml/mphantom.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mphantom < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mphantom)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     Mml::Configuration::SUPPORTED_TAGS.each do |tag|

data/lib/mml/mprescripts.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mprescripts < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mprescripts)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
 

data/lib/mml/mroot.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mroot < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mroot)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     Mml::Configuration::SUPPORTED_TAGS.each do |tag|

data/lib/mml/mrow.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mrow < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mrow)
-
     attribute :mathbackground, :string
     attribute :mathcolor, :string
     attribute :content, :string

data/lib/mml/ms.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Ms < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:ms)
-
     attribute :mathbackground, :string
     attribute :mathvariant, :string
     attribute :fontfamily, :string
@@ -19,7 +17,7 @@ module Mml
     attribute :value, :string
     attribute :dir, :string
     Mml::Configuration::SUPPORTED_TAGS.each do |tag|
-      attribute :"#{tag}_value", Mml.const_get(tag.capitalize)
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
     end
 
     xml do

data/lib/mml/mscarries.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mscarries < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mscarries)
-
     attribute :scriptsizemultiplier, :integer
     attribute :mathbackground, :string
     attribute :mathcolor, :string

data/lib/mml/mscarry.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mscarry < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mscarry)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :location, :string

data/lib/mml/msgroup.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Msgroup < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:msgroup)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :position, :integer

data/lib/mml/msline.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Msline < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:msline)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :position, :integer

data/lib/mml/mspace.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mspace < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mspace)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :mathvariant, :string

data/lib/mml/msqrt.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Msqrt < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:msqrt)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     Mml::Configuration::SUPPORTED_TAGS.each do |tag|

data/lib/mml/msrow.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Msrow < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:msrow)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :position, :integer

data/lib/mml/mstack.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mstack < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mstack)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :align, :string

data/lib/mml/mstyle.rb

@@ -3,8 +3,6 @@
 module Mml
   # rubocop:disable Metrics/ClassLength
   class Mstyle < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mstyle)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :scriptlevel, :integer

data/lib/mml/msub.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Msub < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:msub)
-
     attribute :mathbackground, :string
     attribute :subscriptshift, :string
     attribute :mathcolor, :string

data/lib/mml/msubsup.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Msubsup < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:msubsup)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :subscriptshift, :string

data/lib/mml/msup.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Msup < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:msup)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :superscriptshift, :string

data/lib/mml/mtable.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mtable < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mtable)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :align, :string

data/lib/mml/mtd.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mtd < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mtd)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :rowalign, :string

data/lib/mml/mtext.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mtext < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mtext)
-
     attribute :value, :string
     attribute :mathcolor, :string
     attribute :mathbackground, :string

data/lib/mml/mtr.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Mtr < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:mtr)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :rowalign, :string

data/lib/mml/munder.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Munder < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:munder)
-
     attribute :mathbackground, :string
     attribute :accentunder, :string
     attribute :mathcolor, :string

data/lib/mml/munderover.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Munderover < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:munderover)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :accent, :string

data/lib/mml/none.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class None < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:none)
-
     attribute :mathcolor, :string
     attribute :mathbackground, :string
 

data/lib/mml/semantics.rb

@@ -2,8 +2,6 @@
 
 module Mml
   class Semantics < Lutaml::Model::Serializable
-    model Mml::Configuration.class_for(:semantics)
-
     attribute :annotation, Mml::Mi, collection: true
     Mml::Configuration::SUPPORTED_TAGS.each do |tag|
       attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true

data/lib/mml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mml
-  VERSION = "1.0.2"
+  VERSION = "2.0.1"
 end

data/lib/mml.rb

@@ -2,8 +2,40 @@
 
 require "zeitwerk"
 require "lutaml/model"
-require_relative "mml/mml"
+
+DEFAULT_ADAPTER = if RUBY_ENGINE == "opal"
+                    require "lutaml/model/xml_adapter/oga_adapter"
+                    :oga
+                  else
+                    require "lutaml/model/xml_adapter/ox_adapter"
+                    :ox
+                  end
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
-loader.ignore("#{__dir__}/lib/mml.rb")
 loader.setup
+
+module Mml
+  class Error < StandardError; end
+
+  module_function
+
+  def config
+    Configuration.config
+  end
+
+  def parse(input, namespace_exist: true)
+    Configuration.adapter = DEFAULT_ADAPTER unless Configuration.adapter
+
+    if namespace_exist
+      Mml::MathWithNamespace.from_xml(input)
+    else
+      Mml::MathWithNilNamespace.from_xml(input)
+    end
+  end
+end
+
+begin
+  loader.eager_load(force: true)
+rescue Zeitwerk::NameError => e
+  flunk e.message
+end

data/mml.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lutaml-model", "~> 0.5"
+  spec.add_runtime_dependency "lutaml-model"
   spec.add_runtime_dependency "zeitwerk"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mml
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-28 00:00:00.000000000 Z
+date: 2025-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,6 @@ files:
 - lib/mml/mi.rb
 - lib/mml/mlabeledtr.rb
 - lib/mml/mlongdiv.rb
-- lib/mml/mml.rb
 - lib/mml/mmultiscripts.rb
 - lib/mml/mn.rb
 - lib/mml/mo.rb

data/lib/mml/mml.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-DEFAULT_ADAPTER = if RUBY_ENGINE == "opal"
-                    require "lutaml/model/xml_adapter/oga_adapter"
-                    :oga
-                  else
-                    require "lutaml/model/xml_adapter/ox_adapter"
-                    :ox
-                  end
-
-module Mml
-  class Error < StandardError; end
-
-  module_function
-
-  def config
-    Configuration.config
-  end
-
-  def parse(input, namespace_exist: true)
-    Configuration.adapter = DEFAULT_ADAPTER unless Configuration.adapter
-
-    if namespace_exist
-      Mml::MathWithNamespace.from_xml(input)
-    else
-      Mml::MathWithNilNamespace.from_xml(input)
-    end
-  end
-end