rng 0.1.2 → 0.3.4

data/lib/rng/list.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Rng
   class List < Lutaml::Model::Serializable
     attribute :id, :string
@@ -24,33 +22,35 @@ module Rng
     attribute :notAllowed, NotAllowed, collection: true, initialize_empty: true
 
     xml do
-      root "list", ordered: true
-      namespace "http://relaxng.org/ns/structure/1.0"
+      element 'list'
+      ordered
+
+      namespace ::Rng::Namespaces::RngNamespace
 
-      map_attribute "id", to: :id
-      map_attribute "ns", to: :ns, value_map: {
+      map_attribute 'id', to: :id
+      map_attribute 'ns', to: :ns, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "datatypeLibrary", to: :datatypeLibrary, value_map: {
+      map_attribute 'datatypeLibrary', to: :datatypeLibrary, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_element "element", to: :element
-      map_element "attribute", to: :attribute
-      map_element "ref", to: :ref
-      map_element "choice", to: :choice
-      map_element "group", to: :group
-      map_element "interleave", to: :interleave
-      map_element "mixed", to: :mixed
-      map_element "optional", to: :optional
-      map_element "zeroOrMore", to: :zeroOrMore
-      map_element "oneOrMore", to: :oneOrMore
-      map_element "text", to: :text
-      map_element "empty", to: :empty
-      map_element "value", to: :value
-      map_element "data", to: :data
-      map_element "notAllowed", to: :notAllowed
+      map_element 'element', to: :element
+      map_element 'attribute', to: :attribute
+      map_element 'ref', to: :ref
+      map_element 'choice', to: :choice
+      map_element 'group', to: :group
+      map_element 'interleave', to: :interleave
+      map_element 'mixed', to: :mixed
+      map_element 'optional', to: :optional
+      map_element 'zeroOrMore', to: :zeroOrMore
+      map_element 'oneOrMore', to: :oneOrMore
+      map_element 'text', to: :text
+      map_element 'empty', to: :empty
+      map_element 'value', to: :value
+      map_element 'data', to: :data
+      map_element 'notAllowed', to: :notAllowed
     end
   end
 end

data/lib/rng/mixed.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Rng
   class Mixed < Lutaml::Model::Serializable
     attribute :id, :string
@@ -25,34 +23,36 @@ module Rng
     attribute :notAllowed, NotAllowed, collection: true, initialize_empty: true
 
     xml do
-      root "mixed", ordered: true
-      namespace "http://relaxng.org/ns/structure/1.0"
+      element 'mixed'
+      ordered
+
+      namespace ::Rng::Namespaces::RngNamespace
 
-      map_attribute "id", to: :id
-      map_attribute "ns", to: :ns, value_map: {
+      map_attribute 'id', to: :id
+      map_attribute 'ns', to: :ns, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "datatypeLibrary", to: :datatypeLibrary, value_map: {
+      map_attribute 'datatypeLibrary', to: :datatypeLibrary, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_element "element", to: :element
-      map_element "attribute", to: :attribute
-      map_element "ref", to: :ref
-      map_element "choice", to: :choice
-      map_element "group", to: :group
-      map_element "interleave", to: :interleave
-      map_element "mixed", to: :mixed
-      map_element "optional", to: :optional
-      map_element "zeroOrMore", to: :zeroOrMore
-      map_element "oneOrMore", to: :oneOrMore
-      map_element "text", to: :text
-      map_element "empty", to: :empty
-      map_element "value", to: :value
-      map_element "data", to: :data
-      map_element "list", to: :list
-      map_element "notAllowed", to: :notAllowed
+      map_element 'element', to: :element
+      map_element 'attribute', to: :attribute
+      map_element 'ref', to: :ref
+      map_element 'choice', to: :choice
+      map_element 'group', to: :group
+      map_element 'interleave', to: :interleave
+      map_element 'mixed', to: :mixed
+      map_element 'optional', to: :optional
+      map_element 'zeroOrMore', to: :zeroOrMore
+      map_element 'oneOrMore', to: :oneOrMore
+      map_element 'text', to: :text
+      map_element 'empty', to: :empty
+      map_element 'value', to: :value
+      map_element 'data', to: :data
+      map_element 'list', to: :list
+      map_element 'notAllowed', to: :notAllowed
     end
   end
 end

data/lib/rng/name.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Rng
   class Name < Lutaml::Model::Serializable
     attribute :id, :string
@@ -10,15 +8,16 @@ module Rng
     attribute :value, :string
 
     xml do
-      root "name", ordered: true
-      namespace "http://relaxng.org/ns/structure/1.0"
+      element 'name'
+
+      namespace ::Rng::Namespaces::RngNamespace
 
-      map_attribute "id", to: :id
-      map_attribute "ns", to: :ns, value_map: {
+      map_attribute 'id', to: :id
+      map_attribute 'ns', to: :ns, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "datatypeLibrary", to: :datatypeLibrary, value_map: {
+      map_attribute 'datatypeLibrary', to: :datatypeLibrary, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }

data/lib/rng/namespace_declaration.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Rng
+  # Represents a namespace declaration in RNC
+  #
+  # Supports both default and prefixed namespace declarations:
+  # - default namespace = "uri"
+  # - default namespace prefix = "uri"
+  # - namespace prefix = "uri"
+  #
+  # @example Default namespace
+  #   decl = NamespaceDeclaration.new(uri: "http://example.com", is_default: true)
+  #   decl.default? #=> true
+  #
+  # @example Prefixed namespace
+  #   decl = NamespaceDeclaration.new(prefix: "eg", uri: "http://example.com")
+  #   decl.prefixed? #=> true
+  #
+  class NamespaceDeclaration
+    attr_reader :prefix, :uri, :is_default
+
+    # Initialize a namespace declaration
+    #
+    # @param prefix [String, nil] Namespace prefix (nil for unprefixed default)
+    # @param uri [String] Namespace URI
+    # @param is_default [Boolean] Whether this is the default namespace
+    def initialize(uri:, prefix: nil, is_default: false)
+      @prefix = prefix
+      @uri = uri
+      @is_default = is_default
+    end
+
+    # Check if this is the default namespace
+    #
+    # @return [Boolean]
+    def default?
+      @is_default
+    end
+
+    # Check if this namespace has a prefix
+    #
+    # @return [Boolean]
+    def prefixed?
+      !@prefix.nil?
+    end
+  end
+end

data/lib/rng/namespaces.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Rng
+  module Namespaces
+    class RngNamespace < Lutaml::Xml::Namespace
+      uri 'http://relaxng.org/ns/structure/1.0'
+      prefix_default 'rng'
+    end
+
+    class AnnotationNamespace < Lutaml::Xml::Namespace
+      uri 'http://relaxng.org/ns/compatibility/annotations/1.0'
+      prefix_default 'a'
+    end
+  end
+end

data/lib/rng/not_allowed.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Rng
   class NotAllowed < Lutaml::Model::Serializable
     attribute :id, :string
@@ -9,15 +7,17 @@ module Rng
     attribute :datatypeLibrary, :string
 
     xml do
-      root "notAllowed", ordered: true
-      namespace "http://relaxng.org/ns/structure/1.0"
+      element 'notAllowed'
+      ordered
+
+      namespace ::Rng::Namespaces::RngNamespace
 
-      map_attribute "id", to: :id
-      map_attribute "ns", to: :ns, value_map: {
+      map_attribute 'id', to: :id
+      map_attribute 'ns', to: :ns, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "datatypeLibrary", to: :datatypeLibrary
+      map_attribute 'datatypeLibrary', to: :datatypeLibrary
     end
   end
 end

data/lib/rng/ns_name.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Rng
   class NsName < Lutaml::Model::Serializable
     attribute :id, :string
@@ -11,21 +9,23 @@ module Rng
     attribute :except, Except
 
     xml do
-      root "nsName", ordered: true
-      namespace "http://relaxng.org/ns/structure/1.0"
+      element 'nsName'
+      ordered
+
+      namespace ::Rng::Namespaces::RngNamespace
 
-      map_attribute "id", to: :id
-      map_attribute "ns", to: :ns, value_map: {
+      map_attribute 'id', to: :id
+      map_attribute 'ns', to: :ns, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "datatypeLibrary", to: :datatypeLibrary, value_map: {
+      map_attribute 'datatypeLibrary', to: :datatypeLibrary, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "name", to: :name
+      map_attribute 'name', to: :name
 
-      map_element "except", to: :except
+      map_element 'except', to: :except
     end
   end
 end

data/lib/rng/one_or_more.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Rng
   class OneOrMore < Lutaml::Model::Serializable
     attribute :id, :string
@@ -25,34 +23,36 @@ module Rng
     attribute :notAllowed, NotAllowed, collection: true, initialize_empty: true
 
     xml do
-      root "oneOrMore", ordered: true
-      namespace "http://relaxng.org/ns/structure/1.0"
+      element 'oneOrMore'
+      ordered
+
+      namespace ::Rng::Namespaces::RngNamespace
 
-      map_attribute "id", to: :id
-      map_attribute "ns", to: :ns, value_map: {
+      map_attribute 'id', to: :id
+      map_attribute 'ns', to: :ns, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "datatypeLibrary", to: :datatypeLibrary, value_map: {
+      map_attribute 'datatypeLibrary', to: :datatypeLibrary, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_element "element", to: :element
-      map_element "attribute", to: :attribute
-      map_element "ref", to: :ref
-      map_element "choice", to: :choice
-      map_element "group", to: :group
-      map_element "interleave", to: :interleave
-      map_element "mixed", to: :mixed
-      map_element "optional", to: :optional
-      map_element "zeroOrMore", to: :zeroOrMore
-      map_element "oneOrMore", to: :oneOrMore
-      map_element "text", to: :text
-      map_element "empty", to: :empty
-      map_element "value", to: :value
-      map_element "data", to: :data
-      map_element "list", to: :list
-      map_element "notAllowed", to: :notAllowed
+      map_element 'element', to: :element
+      map_element 'attribute', to: :attribute
+      map_element 'ref', to: :ref
+      map_element 'choice', to: :choice
+      map_element 'group', to: :group
+      map_element 'interleave', to: :interleave
+      map_element 'mixed', to: :mixed
+      map_element 'optional', to: :optional
+      map_element 'zeroOrMore', to: :zeroOrMore
+      map_element 'oneOrMore', to: :oneOrMore
+      map_element 'text', to: :text
+      map_element 'empty', to: :empty
+      map_element 'value', to: :value
+      map_element 'data', to: :data
+      map_element 'list', to: :list
+      map_element 'notAllowed', to: :notAllowed
     end
   end
 end

data/lib/rng/optional.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Rng
   class Optional < Lutaml::Model::Serializable
     attribute :id, :string
@@ -25,34 +23,36 @@ module Rng
     attribute :notAllowed, NotAllowed, collection: true, initialize_empty: true
 
     xml do
-      root "optional", ordered: true
-      namespace "http://relaxng.org/ns/structure/1.0"
+      element 'optional'
+      ordered
+
+      namespace ::Rng::Namespaces::RngNamespace
 
-      map_attribute "id", to: :id
-      map_attribute "ns", to: :ns, value_map: {
+      map_attribute 'id', to: :id
+      map_attribute 'ns', to: :ns, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "datatypeLibrary", to: :datatypeLibrary, value_map: {
+      map_attribute 'datatypeLibrary', to: :datatypeLibrary, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_element "element", to: :element
-      map_element "attribute", to: :attribute
-      map_element "ref", to: :ref
-      map_element "choice", to: :choice
-      map_element "group", to: :group
-      map_element "interleave", to: :interleave
-      map_element "mixed", to: :mixed
-      map_element "optional", to: :optional
-      map_element "zeroOrMore", to: :zeroOrMore
-      map_element "oneOrMore", to: :oneOrMore
-      map_element "text", to: :text
-      map_element "empty", to: :empty
-      map_element "value", to: :value
-      map_element "data", to: :data
-      map_element "list", to: :list
-      map_element "notAllowed", to: :notAllowed
+      map_element 'element', to: :element
+      map_element 'attribute', to: :attribute
+      map_element 'ref', to: :ref
+      map_element 'choice', to: :choice
+      map_element 'group', to: :group
+      map_element 'interleave', to: :interleave
+      map_element 'mixed', to: :mixed
+      map_element 'optional', to: :optional
+      map_element 'zeroOrMore', to: :zeroOrMore
+      map_element 'oneOrMore', to: :oneOrMore
+      map_element 'text', to: :text
+      map_element 'empty', to: :empty
+      map_element 'value', to: :value
+      map_element 'data', to: :data
+      map_element 'list', to: :list
+      map_element 'notAllowed', to: :notAllowed
     end
   end
 end

data/lib/rng/param.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Rng
   class Param < Lutaml::Model::Serializable
     attribute :id, :string
@@ -11,19 +9,20 @@ module Rng
     attribute :value, :string
 
     xml do
-      root "param", ordered: true
-      namespace "http://relaxng.org/ns/structure/1.0"
+      element 'param'
+
+      namespace ::Rng::Namespaces::RngNamespace
 
-      map_attribute "id", to: :id
-      map_attribute "ns", to: :ns, value_map: {
+      map_attribute 'id', to: :id
+      map_attribute 'ns', to: :ns, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "datatypeLibrary", to: :datatypeLibrary, value_map: {
+      map_attribute 'datatypeLibrary', to: :datatypeLibrary, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "name", to: :name
+      map_attribute 'name', to: :name
       map_content to: :value
     end
   end

data/lib/rng/parent_ref.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Rng
   class ParentRef < Lutaml::Model::Serializable
     attribute :id, :string
@@ -10,19 +8,21 @@ module Rng
     attribute :name, :string
 
     xml do
-      root "parentRef", ordered: true
-      namespace "http://relaxng.org/ns/structure/1.0"
+      element 'parentRef'
+      ordered
+
+      namespace ::Rng::Namespaces::RngNamespace
 
-      map_attribute "id", to: :id
-      map_attribute "ns", to: :ns, value_map: {
+      map_attribute 'id', to: :id
+      map_attribute 'ns', to: :ns, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "datatypeLibrary", to: :datatypeLibrary, value_map: {
+      map_attribute 'datatypeLibrary', to: :datatypeLibrary, value_map: {
         from: { empty: :empty, omitted: :omitted, nil: :nil },
         to: { empty: :empty, omitted: :omitted, nil: :nil }
       }
-      map_attribute "name", to: :name
+      map_attribute 'name', to: :name
     end
   end
 end