omml 0.2.1 → 0.2.2

data/lib/omml/models/ct_twips_measure.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTTwipsMeasure < Lutaml::Model::Serializable
+    class CTTwipsMeasure < Base
       attribute :val, :st_twips_measure
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTTwipsMeasure)
   end
 end

data/lib/omml/models/ct_un_signed_integer.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTUnSignedInteger < Lutaml::Model::Serializable
+    class CTUnSignedInteger < Base
       attribute :val, :st_un_signed_integer
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTUnSignedInteger)
   end
 end

data/lib/omml/models/ct_underline.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTUnderline < Lutaml::Model::Serializable
+    class CTUnderline < Base
       attribute :val, :st_underline
       attribute :color, :st_hex_color
       attribute :theme_color, :st_theme_color
@@ -21,7 +21,5 @@ module Omml
         map_attribute :themeShade, to: :theme_shade
       end
     end
-
-    Omml::Configuration.register_model(CTUnderline)
   end
 end

data/lib/omml/models/ct_vertical_align_run.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTVerticalAlignRun < Lutaml::Model::Serializable
+    class CTVerticalAlignRun < Base
       attribute :val, :st_vertical_align_run
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTVerticalAlignRun)
   end
 end

data/lib/omml/models/ct_wordprocessing_on_off.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWordprocessingOnOff < Lutaml::Model::Serializable
+    class CTWordprocessingOnOff < Base
       attribute :val, :st_on_off, default: -> { "on" }
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTWordprocessingOnOff)
   end
 end

data/lib/omml/models/ct_wrap_none.rb

@@ -2,14 +2,12 @@
 
 module Omml
   module Models
-    class CTWrapNone < Lutaml::Model::Serializable
+    class CTWrapNone < Base
       xml do
         element "CT_WrapNone"
 
         namespace Omml::Namespace
       end
     end
-
-    Omml::Configuration.register_model(CTWrapNone)
   end
 end

data/lib/omml/models/ct_wrap_path.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapPath < Lutaml::Model::Serializable
+    class CTWrapPath < Base
       attribute :start, :ct_point2_d, collection: 1..1
       attribute :line_to, :ct_point2_d, collection: 2..Float::INFINITY
       attribute :edited, :boolean
@@ -19,7 +19,5 @@ module Omml
         map_attribute :edited, to: :edited
       end
     end
-
-    Omml::Configuration.register_model(CTWrapPath)
   end
 end

data/lib/omml/models/ct_wrap_square.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapSquare < Lutaml::Model::Serializable
+    class CTWrapSquare < Base
       attribute :effect_extent, :ct_effect_extent, collection: 0..1
       attribute :wrap_text, :st_wrap_text
       attribute :dist_t, :st_wrap_distance
@@ -25,7 +25,5 @@ module Omml
         map_attribute :distR, to: :dist_r
       end
     end
-
-    Omml::Configuration.register_model(CTWrapSquare)
   end
 end

data/lib/omml/models/ct_wrap_through.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapThrough < Lutaml::Model::Serializable
+    class CTWrapThrough < Base
       attribute :wrap_polygon, :ct_wrap_path, collection: 1..1
       attribute :wrap_text, :st_wrap_text
       attribute :dist_l, :st_wrap_distance
@@ -21,7 +21,5 @@ module Omml
         map_attribute :distR, to: :dist_r
       end
     end
-
-    Omml::Configuration.register_model(CTWrapThrough)
   end
 end

data/lib/omml/models/ct_wrap_tight.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapTight < Lutaml::Model::Serializable
+    class CTWrapTight < Base
       attribute :wrap_polygon, :ct_wrap_path, collection: 1..1
       attribute :wrap_text, :st_wrap_text
       attribute :dist_l, :st_wrap_distance
@@ -21,7 +21,5 @@ module Omml
         map_attribute :distR, to: :dist_r
       end
     end
-
-    Omml::Configuration.register_model(CTWrapTight)
   end
 end

data/lib/omml/models/ct_wrap_top_bottom.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapTopBottom < Lutaml::Model::Serializable
+    class CTWrapTopBottom < Base
       attribute :effect_extent, :ct_effect_extent, collection: 0..1
       attribute :dist_t, :st_wrap_distance
       attribute :dist_b, :st_wrap_distance
@@ -19,7 +19,5 @@ module Omml
         map_attribute :distB, to: :dist_b
       end
     end
-
-    Omml::Configuration.register_model(CTWrapTopBottom)
   end
 end

data/lib/omml/models/ct_x_align.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTXAlign < Lutaml::Model::Serializable
+    class CTXAlign < Base
       attribute :val, :st_x_align
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTXAlign)
   end
 end

data/lib/omml/models/ct_y_align.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTYAlign < Lutaml::Model::Serializable
+    class CTYAlign < Base
       attribute :val, :st_y_align
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTYAlign)
   end
 end

data/lib/omml/models/groups/eg_content_run_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGContentRunContent < Lutaml::Model::Serializable
+    class EGContentRunContent < Base
       choice(min: 1, max: 1) do
         attribute :custom_xml, :ct_custom_xml_run
         attribute :smart_tag, :ct_smart_tag_run
@@ -20,7 +20,5 @@ module Omml
         import_model_mappings :eg_run_level_elts
       end
     end
-
-    Omml::Configuration.register_model(EGContentRunContent)
   end
 end

data/lib/omml/models/groups/eg_math_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGMathContent < Lutaml::Model::Serializable
+    class EGMathContent < Base
       choice(min: 1, max: 1) do
         attribute :o_math_para, :ct_o_math_para
         attribute :o_math, :ct_o_math
@@ -14,7 +14,5 @@ module Omml
         map_element :oMath, to: :o_math, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGMathContent)
   end
 end

data/lib/omml/models/groups/eg_o_math_elements.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGOMathElements < Lutaml::Model::Serializable
+    class EGOMathElements < Base
       choice(min: 1, max: 1) do
         import_model_attributes :eg_o_math_math_elements
         import_model_attributes :eg_run_level_elts
@@ -14,7 +14,5 @@ module Omml
         import_model_mappings :eg_run_level_elts
       end
     end
-
-    Omml::Configuration.register_model(EGOMathElements)
   end
 end

data/lib/omml/models/groups/eg_o_math_math_elements.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGOMathMathElements < Lutaml::Model::Serializable
+    class EGOMathMathElements < Base
       choice(min: 1, max: 1) do
         attribute :acc, :ct_acc, collection: 0..Float::INFINITY
         attribute :bar, :ct_bar, collection: 0..Float::INFINITY
@@ -50,7 +50,5 @@ module Omml
         map_element :r, to: :r, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGOMathMathElements)
   end
 end

data/lib/omml/models/groups/eg_office_art_extension_list.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGOfficeArtExtensionList < Lutaml::Model::Serializable
+    class EGOfficeArtExtensionList < Base
       attribute :ext, :ct_office_art_extension, collection: 0..Float::INFINITY
 
       xml do
@@ -10,7 +10,5 @@ module Omml
         map_element :ext, to: :ext
       end
     end
-
-    Omml::Configuration.register_model(EGOfficeArtExtensionList)
   end
 end

data/lib/omml/models/groups/eg_p_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGPContent < Lutaml::Model::Serializable
+    class EGPContent < Base
       choice(min: 1, max: 1) do
         import_model_attributes :eg_content_run_content
         attribute :fld_simple, :ct_simple_field, collection: 0..Float::INFINITY
@@ -18,7 +18,5 @@ module Omml
         map_element :subDoc, to: :sub_doc, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGPContent)
   end
 end

data/lib/omml/models/groups/eg_r_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRPr < Lutaml::Model::Serializable
+    class EGRPr < Base
       attribute :r_pr, :ct_r_pr, collection: 0..1
 
       xml do
@@ -11,7 +11,5 @@ module Omml
         map_element :rPr, to: :r_pr
       end
     end
-
-    Omml::Configuration.register_model(EGRPr)
   end
 end

data/lib/omml/models/groups/eg_r_pr_base.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRPrBase < Lutaml::Model::Serializable
+    class EGRPrBase < Base
       attribute :r_style, :ct_string, collection: 0..1
       attribute :r_fonts, :ct_fonts, collection: 0..1
       attribute :b, :ct_wordprocessing_on_off, collection: 0..1
@@ -87,7 +87,5 @@ module Omml
         map_element :oMath, to: :o_math, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGRPrBase)
   end
 end

data/lib/omml/models/groups/eg_r_pr_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRPrContent < Lutaml::Model::Serializable
+    class EGRPrContent < Base
       import_model_attributes :eg_r_pr_base
       attribute :r_pr_change, :ct_r_pr_change, collection: 0..1
 
@@ -13,7 +13,5 @@ module Omml
         map_element :rPrChange, to: :r_pr_change
       end
     end
-
-    Omml::Configuration.register_model(EGRPrContent)
   end
 end

data/lib/omml/models/groups/eg_r_pr_math.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRPrMath < Lutaml::Model::Serializable
+    class EGRPrMath < Base
       choice(min: 1, max: 1) do
         import_model_attributes :eg_r_pr
         attribute :ins, :ct_r_pr_change
@@ -17,7 +17,5 @@ module Omml
         map_element :del, to: :del, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGRPrMath)
   end
 end

data/lib/omml/models/groups/eg_range_markup_elements.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRangeMarkupElements < Lutaml::Model::Serializable
+    class EGRangeMarkupElements < Base
       choice(min: 1, max: 1) do
         attribute :bookmark_start, :ct_bookmark
         attribute :bookmark_end, :ct_markup_range
@@ -54,7 +54,5 @@ module Omml
                     to: :custom_xml_move_to_range_end, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGRangeMarkupElements)
   end
 end

data/lib/omml/models/groups/eg_ruby_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRubyContent < Lutaml::Model::Serializable
+    class EGRubyContent < Base
       choice(min: 1, max: 1) do
         attribute :r, :ct_r
         import_model_attributes :eg_run_level_elts
@@ -14,7 +14,5 @@ module Omml
         import_model_mappings :eg_run_level_elts
       end
     end
-
-    Omml::Configuration.register_model(EGRubyContent)
   end
 end

data/lib/omml/models/groups/eg_run_inner_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRunInnerContent < Lutaml::Model::Serializable
+    class EGRunInnerContent < Base
       choice(min: 1, max: 1) do
         attribute :br, :string
         attribute :t, :ct_text
@@ -77,7 +77,5 @@ module Omml
         map_element :lastRenderedPageBreak, to: :last_rendered_page_break
       end
     end
-
-    Omml::Configuration.register_model(EGRunInnerContent)
   end
 end

data/lib/omml/models/groups/eg_run_level_elts.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRunLevelElts < Lutaml::Model::Serializable
+    class EGRunLevelElts < Base
       choice(min: 1, max: 1) do
         attribute :proof_err, :ct_proof_err, collection: 0..1
         attribute :perm_start, :ct_perm_start, collection: 0..1
@@ -28,7 +28,5 @@ module Omml
         import_model_mappings :eg_math_content
       end
     end
-
-    Omml::Configuration.register_model(EGRunLevelElts)
   end
 end

data/lib/omml/models/groups/eg_script_style.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGScriptStyle < Lutaml::Model::Serializable
+    class EGScriptStyle < Base
       attribute :scr, :ct_script, collection: 0..1
       attribute :sty, :ct_style, collection: 0..1
 
@@ -12,7 +12,5 @@ module Omml
         map_element :sty, to: :sty
       end
     end
-
-    Omml::Configuration.register_model(EGScriptStyle)
   end
 end

data/lib/omml/models/groups/eg_word_r_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGWordRPr < Lutaml::Model::Serializable
+    class EGWordRPr < Base
       attribute :word_r_pr, :ct_r_pr, collection: 0..1
 
       xml do
@@ -11,7 +11,5 @@ module Omml
         map_element :rPr, to: :word_r_pr
       end
     end
-
-    Omml::Configuration.register_model(EGWordRPr)
   end
 end

data/lib/omml/models/groups/eg_wrap_type.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGWrapType < Lutaml::Model::Serializable
+    class EGWrapType < Base
       choice(min: 1, max: 1) do
         attribute :wrap_none, :ct_wrap_none, collection: 1..1
         attribute :wrap_square, :ct_wrap_square, collection: 1..1
@@ -21,7 +21,5 @@ module Omml
                                        render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGWrapType)
   end
 end

data/lib/omml/models/groups.rb

@@ -1,19 +1 @@
 # frozen_string_literal: true
-
-require_relative "groups/eg_math_content"
-require_relative "groups/eg_o_math_math_elements"
-require_relative "groups/eg_office_art_extension_list"
-require_relative "groups/eg_r_pr"
-require_relative "groups/eg_r_pr_base"
-require_relative "groups/eg_range_markup_elements"
-require_relative "groups/eg_run_inner_content"
-require_relative "groups/eg_script_style"
-require_relative "groups/eg_word_r_pr"
-require_relative "groups/eg_wrap_type"
-require_relative "groups/eg_r_pr_content"
-require_relative "groups/eg_r_pr_math"
-require_relative "groups/eg_run_level_elts"
-require_relative "groups/eg_content_run_content"
-require_relative "groups/eg_o_math_elements"
-require_relative "groups/eg_p_content"
-require_relative "groups/eg_ruby_content"

data/lib/omml/models/o_math.rb

@@ -3,7 +3,7 @@
 module Omml
   module Models
     # Root element wrapper for the generated CTOMath content model.
-    class OMath < Lutaml::Model::Serializable
+    class OMath < Base
       import_model_attributes :eg_o_math_elements
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(OMath, id: :o_math)
   end
 end

data/lib/omml/models/o_math_para.rb

@@ -3,7 +3,7 @@
 module Omml
   module Models
     # Root element wrapper for the generated CTOMathPara content model.
-    class OMathPara < Lutaml::Model::Serializable
+    class OMathPara < Base
       attribute :o_math_para_pr, :ct_o_math_para_pr, collection: 0..1
       attribute :o_math, :ct_o_math, collection: 1..Float::INFINITY
       attribute :r, :ct_r, collection: 0..Float::INFINITY
@@ -19,7 +19,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(OMathPara, id: :o_math_para)
   end
 end

data/lib/omml/models/registerable.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Omml
+  module Models
+    # Mixed into simple-type classes that need to know their active register
+    # when resolving dependent types (e.g. `STAdjCoordinate` delegates to
+    # either `STCoordinate` or `STGeomGuideName` depending on the value).
+    #
+    # `Omml::Configuration.register_model` calls `register=` on classes that
+    # include this module, mirroring the role of upstream's
+    # `set_register_context` on `Lutaml::Model::Serializable`.
+    module Registerable
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        attr_accessor :register
+      end
+    end
+  end
+end

data/lib/omml/models/simple_types/enum_string.rb

@@ -3,6 +3,11 @@
 module Omml
   module Models
     class EnumString < Lutaml::Model::Type::String
+      def self.inherited(subclass)
+        super
+        Omml::Configuration.register_model(subclass)
+      end
+
       def self.cast(value, options = {})
         return if value.nil?
 

data/lib/omml/models/simple_types/hex_binary.rb

@@ -9,7 +9,6 @@ module Omml
         super(value, options.merge(pattern: /(?-mix:([0-9a-fA-F]{2})*)/))
       end
     end
-
     Omml::Configuration.register_model(HexBinary)
   end
 end

data/lib/omml/models/simple_types/st_adj_coordinate.rb

@@ -3,6 +3,8 @@
 module Omml
   module Models
     class STAdjCoordinate < Lutaml::Model::Type::Value
+      include Registerable
+
       def self.cast(value, options = {})
         return if value.nil?
 
@@ -18,7 +20,6 @@ module Omml
 
       private_class_method :cast_value
     end
-
     Omml::Configuration.register_model(STAdjCoordinate)
   end
 end

data/lib/omml/models/simple_types/st_align_h.rb

@@ -11,7 +11,5 @@ module Omml
         outside
       ].freeze
     end
-
-    Omml::Configuration.register_model(STAlignH)
   end
 end

data/lib/omml/models/simple_types/st_align_v.rb

@@ -11,7 +11,5 @@ module Omml
         outside
       ].freeze
     end
-
-    Omml::Configuration.register_model(STAlignV)
   end
 end

data/lib/omml/models/simple_types/st_border.rb

@@ -197,7 +197,5 @@ module Omml
         zigZagStitch
       ].freeze
     end
-
-    Omml::Configuration.register_model(STBorder)
   end
 end