omml 0.2.1 → 0.2.3

data/lib/omml/configuration/model_registry.rb

@@ -52,8 +52,12 @@ module Omml
       end
 
       def clear_cache(klass, register_id)
-        klass.instance_variable_set(:@register, register_id)
-        klass.clear_cache(register_id) if klass.respond_to?(:clear_cache)
+        if klass.is_a?(Class) && klass < Lutaml::Model::Serializable
+          klass.set_register_context(register_id)
+          klass.clear_cache(register_id)
+        elsif klass.include?(Omml::Models::Registerable)
+          klass.register = register_id
+        end
       end
     end
   end

data/lib/omml/configuration/type_resolver.rb

@@ -32,8 +32,6 @@ module Omml
       end
 
       def root_namespace_uri(root)
-        return unless root.respond_to?(:namespace)
-
         root.namespace&.uri
       end
 

data/lib/omml/configuration.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "configuration/adapter"
-require_relative "configuration/context_registry"
-require_relative "configuration/model_registry"
-require_relative "configuration/type_resolver"
-
 module Omml
   module Configuration
+    autoload :Adapter, "omml/configuration/adapter"
+    autoload :ContextRegistry, "omml/configuration/context_registry"
+    autoload :ModelRegistry, "omml/configuration/model_registry"
+    autoload :TypeResolver, "omml/configuration/type_resolver"
+
     extend Adapter
     extend ContextRegistry
     extend ModelRegistry

data/lib/omml/models/base.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Omml
+  module Models
+    class Base < Lutaml::Model::Serializable
+      def self.inherited(subclass)
+        super
+        Omml::Configuration.register_model(subclass)
+      end
+
+      def self.lutaml_default_register
+        Omml::Configuration.context_id
+      end
+    end
+  end
+end

data/lib/omml/models/ct_acc.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTAcc < Lutaml::Model::Serializable
+    class CTAcc < Base
       attribute :acc_pr, :ct_acc_pr, collection: 0..1
       attribute :e, :ct_o_math_arg
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTAcc)
   end
 end

data/lib/omml/models/ct_acc_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTAccPr < Lutaml::Model::Serializable
+    class CTAccPr < Base
       attribute :chr, :ct_char, collection: 0..1
       attribute :ctrl_pr, :ct_ctrl_pr, collection: 0..1
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTAccPr)
   end
 end

data/lib/omml/models/ct_anchor.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTAnchor < Lutaml::Model::Serializable
+    class CTAnchor < Base
       attribute :simple_pos, :ct_point2_d
       attribute :position_h, :ct_pos_h
       attribute :position_v, :ct_pos_v
@@ -54,7 +54,5 @@ module Omml
         map_attribute :allowOverlap, to: :allow_overlap
       end
     end
-
-    Omml::Configuration.register_model(CTAnchor)
   end
 end

data/lib/omml/models/ct_attr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTAttr < Lutaml::Model::Serializable
+    class CTAttr < Base
       attribute :uri, :st_string
       attribute :name, :st_string
       attribute :val, :st_string
@@ -17,7 +17,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTAttr)
   end
 end

data/lib/omml/models/ct_bar.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTBar < Lutaml::Model::Serializable
+    class CTBar < Base
       attribute :bar_pr, :ct_bar_pr, collection: 0..1
       attribute :e, :ct_o_math_arg
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTBar)
   end
 end

data/lib/omml/models/ct_bar_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTBarPr < Lutaml::Model::Serializable
+    class CTBarPr < Base
       attribute :pos, :ct_top_bot, collection: 0..1
       attribute :ctrl_pr, :ct_ctrl_pr, collection: 0..1
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTBarPr)
   end
 end

data/lib/omml/models/ct_bookmark.rb

@@ -13,7 +13,5 @@ module Omml
         map_attribute :name, to: :name
       end
     end
-
-    Omml::Configuration.register_model(CTBookmark)
   end
 end

data/lib/omml/models/ct_bookmark_range.rb

@@ -15,7 +15,5 @@ module Omml
         map_attribute :colLast, to: :col_last
       end
     end
-
-    Omml::Configuration.register_model(CTBookmarkRange)
   end
 end

data/lib/omml/models/ct_border.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTBorder < Lutaml::Model::Serializable
+    class CTBorder < Base
       attribute :val, :st_border
       attribute :color, :st_hex_color
       attribute :theme_color, :st_theme_color
@@ -29,7 +29,5 @@ module Omml
         map_attribute :frame, to: :frame
       end
     end
-
-    Omml::Configuration.register_model(CTBorder)
   end
 end

data/lib/omml/models/ct_border_box.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTBorderBox < Lutaml::Model::Serializable
+    class CTBorderBox < Base
       attribute :border_box_pr, :ct_border_box_pr, collection: 0..1
       attribute :e, :ct_o_math_arg
 
@@ -18,7 +18,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTBorderBox)
   end
 end

data/lib/omml/models/ct_border_box_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTBorderBoxPr < Lutaml::Model::Serializable
+    class CTBorderBoxPr < Base
       attribute :hide_top, :ct_on_off, collection: 0..1
       attribute :hide_bot, :ct_on_off, collection: 0..1
       attribute :hide_left, :ct_on_off, collection: 0..1
@@ -31,7 +31,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTBorderBoxPr)
   end
 end

data/lib/omml/models/ct_box.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTBox < Lutaml::Model::Serializable
+    class CTBox < Base
       attribute :box_pr, :ct_box_pr, collection: 0..1
       attribute :e, :ct_o_math_arg
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTBox)
   end
 end

data/lib/omml/models/ct_box_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTBoxPr < Lutaml::Model::Serializable
+    class CTBoxPr < Base
       attribute :op_emu, :ct_on_off, collection: 0..1
       attribute :no_break, :ct_on_off, collection: 0..1
       attribute :diff, :ct_on_off, collection: 0..1
@@ -25,7 +25,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTBoxPr)
   end
 end

data/lib/omml/models/ct_br.rb

@@ -2,20 +2,18 @@
 
 module Omml
   module Models
-    class CTBr < Lutaml::Model::Serializable
+    class CTBr < Base
       attribute :type, :st_br_type
       attribute :clear, :st_br_clear
 
       xml do
         element "CT_Br"
 
-        namespace Omml::Namespace
+        namespace Omml::WordprocessingNamespace
 
         map_attribute :type, to: :type
         map_attribute :clear, to: :clear
       end
     end
-
-    Omml::Configuration.register_model(CTBr)
   end
 end

data/lib/omml/models/ct_break_bin.rb

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

data/lib/omml/models/ct_break_bin_sub.rb

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

data/lib/omml/models/ct_calendar_type.rb

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

data/lib/omml/models/ct_char.rb

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

data/lib/omml/models/ct_color.rb

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

data/lib/omml/models/ct_control.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTControl < Lutaml::Model::Serializable
+    class CTControl < Base
       attribute :name, :st_string
       attribute :shapeid, :st_string
       attribute :id, :st_relationship_id
@@ -17,7 +17,5 @@ module Omml
         map_attribute :id, to: :id
       end
     end
-
-    Omml::Configuration.register_model(CTControl)
   end
 end

data/lib/omml/models/ct_ctrl_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTCtrlPr < Lutaml::Model::Serializable
+    class CTCtrlPr < Base
       import_model_attributes :eg_r_pr_math
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTCtrlPr)
   end
 end

data/lib/omml/models/ct_custom_xml_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTCustomXmlPr < Lutaml::Model::Serializable
+    class CTCustomXmlPr < Base
       attribute :placeholder, :ct_string, collection: 0..1
       attribute :attr, :ct_attr, collection: 0..Float::INFINITY
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTCustomXmlPr)
   end
 end

data/lib/omml/models/ct_custom_xml_run.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTCustomXmlRun < Lutaml::Model::Serializable
+    class CTCustomXmlRun < Base
       attribute :custom_xml_pr, :ct_custom_xml_pr, collection: 0..1
       import_model_attributes :eg_p_content
       attribute :uri, :st_string
@@ -21,7 +21,5 @@ module Omml
         map_attribute :element, to: :element
       end
     end
-
-    Omml::Configuration.register_model(CTCustomXmlRun)
   end
 end

data/lib/omml/models/ct_d.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTD < Lutaml::Model::Serializable
+    class CTD < Base
       attribute :d_pr, :ct_d_pr, collection: 0..1
       attribute :e, :ct_o_math_arg, collection: 1..Float::INFINITY
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTD)
   end
 end

data/lib/omml/models/ct_d_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTDPr < Lutaml::Model::Serializable
+    class CTDPr < Base
       import_model_attributes :eg_word_r_pr
       attribute :beg_chr, :ct_char, collection: 0..1
       attribute :sep_chr, :ct_char, collection: 0..1
@@ -28,7 +28,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTDPr)
   end
 end

data/lib/omml/models/ct_data_binding.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTDataBinding < Lutaml::Model::Serializable
+    class CTDataBinding < Base
       attribute :prefix_mappings, :st_string
       attribute :xpath, :st_string
       attribute :store_item_id, :st_string
@@ -17,7 +17,5 @@ module Omml
         map_attribute :storeItemID, to: :store_item_id
       end
     end
-
-    Omml::Configuration.register_model(CTDataBinding)
   end
 end

data/lib/omml/models/ct_decimal_number.rb

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

data/lib/omml/models/ct_drawing.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTDrawing < Lutaml::Model::Serializable
+    class CTDrawing < Base
       choice(min: 1, max: Float::INFINITY) do
         attribute :anchor, :ct_anchor, collection: 0..1
         attribute :inline, :ct_inline, collection: 0..1
@@ -17,7 +17,5 @@ module Omml
         map_element :inline, to: :inline
       end
     end
-
-    Omml::Configuration.register_model(CTDrawing)
   end
 end

data/lib/omml/models/ct_east_asian_layout.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTEastAsianLayout < Lutaml::Model::Serializable
+    class CTEastAsianLayout < Base
       attribute :id, :st_decimal_number
       attribute :combine, :st_on_off
       attribute :combine_brackets, :st_combine_brackets
@@ -21,7 +21,5 @@ module Omml
         map_attribute :vertCompress, to: :vert_compress
       end
     end
-
-    Omml::Configuration.register_model(CTEastAsianLayout)
   end
 end

data/lib/omml/models/ct_effect_extent.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTEffectExtent < Lutaml::Model::Serializable
+    class CTEffectExtent < Base
       attribute :l, :st_coordinate
       attribute :t, :st_coordinate
       attribute :r, :st_coordinate
@@ -19,7 +19,5 @@ module Omml
         map_attribute :b, to: :b
       end
     end
-
-    Omml::Configuration.register_model(CTEffectExtent)
   end
 end

data/lib/omml/models/ct_em.rb

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

data/lib/omml/models/ct_empty.rb

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

data/lib/omml/models/ct_eq_arr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTEqArr < Lutaml::Model::Serializable
+    class CTEqArr < Base
       attribute :eq_arr_pr, :ct_eq_arr_pr, collection: 0..1
       attribute :e, :ct_o_math_arg, collection: 1..Float::INFINITY
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTEqArr)
   end
 end

data/lib/omml/models/ct_eq_arr_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTEqArrPr < Lutaml::Model::Serializable
+    class CTEqArrPr < Base
       attribute :base_jc, :ct_y_align, collection: 0..1
       attribute :max_dist, :ct_on_off, collection: 0..1
       attribute :obj_dist, :ct_on_off, collection: 0..1
@@ -25,7 +25,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTEqArrPr)
   end
 end

data/lib/omml/models/ct_f.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTF < Lutaml::Model::Serializable
+    class CTF < Base
       attribute :f_pr, :ct_f_pr, collection: 0..1
       attribute :num, :ct_o_math_arg
       attribute :den, :ct_o_math_arg
@@ -19,7 +19,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTF)
   end
 end

data/lib/omml/models/ct_f_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTFPr < Lutaml::Model::Serializable
+    class CTFPr < Base
       attribute :type, :ct_f_type, collection: 0..1
       attribute :ctrl_pr, :ct_ctrl_pr, collection: 0..1
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTFPr)
   end
 end