edoxen 0.3.0 → 0.5.0

data/lib/edoxen/person.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Edoxen
+  # Identity + role + affiliation + contact. Used for meeting officers
+  # (chair, secretary, local contact) and host-ref contacts.
+  class Person < Lutaml::Model::Serializable
+    attribute :name, :string
+    attribute :role, :string
+    attribute :affiliation, :string
+    attribute :email, :string
+    attribute :phone, :string
+    attribute :orcid, :string
+  end
+end

data/lib/edoxen/reference.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Edoxen
+  # Generic document reference (used by AgendaItem.references). `kind`
+  # is a free-form discriminator (e.g., "standard", "document",
+  # "ballot", "resolution"); the schema leaves it open deliberately so
+  # new reference kinds need no schema change.
+  class Reference < Lutaml::Model::Serializable
+    attribute :ref, :string
+    attribute :kind, :string
+    attribute :title, :string
+  end
+end

data/lib/edoxen/resolution.rb

@@ -4,6 +4,11 @@ module Edoxen
   # A formal Resolution. Language-agnostic admin fields live here; every
   # translatable field is wrapped inside `localizations[]` (one entry per
   # available language; at least one is required by the schema).
+  #
+  # Wire names follow lutaml-model's default convention: each declared
+  # attribute serializes to its snake_case name on the wire. Override
+  # with an explicit `key_value do; map "wire", to: :attr; end` block
+  # only when the wire name differs.
   class Resolution < Lutaml::Model::Serializable
     attribute :identifier, StructuredIdentifier, collection: true
     attribute :type, :string, values: Enums::RESOLUTION_TYPE
@@ -17,18 +22,22 @@ module Edoxen
     attribute :urls, Url, collection: true
     attribute :localizations, Localization, collection: true
 
-    key_value do
-      map "identifier", to: :identifier
-      map "type", to: :type
-      map "doi", to: :doi
-      map "urn", to: :urn
-      map "agenda_item", to: :agenda_item
-      map "dates", to: :dates
-      map "categories", to: :categories
-      map "meeting", to: :meeting
-      map "relations", to: :relations
-      map "urls", to: :urls
-      map "localizations", to: :localizations
+    # Lookup by ISO 639-3 language code. Returns nil when no exact match
+    # exists and `fallback:` is false (the default); returns the first
+    # localization otherwise. Keeps the language-preference policy in
+    # one place so callers stop reimplementing `find { |l| ... }`.
+    def in_language(code, fallback: false)
+      match = localizations&.find { |loc| loc.language_code == code.to_s }
+      return match if match
+
+      fallback ? localizations&.first : nil
+    end
+
+    # The canonical rendering — English when available, else the first
+    # declared localization. Mirrors the glossarist LocalizedConcept
+    # "preferred language" notion.
+    def primary_localization
+      in_language("eng", fallback: true)
     end
   end
 end

data/lib/edoxen/resolution_collection.rb

@@ -6,10 +6,5 @@ module Edoxen
   class ResolutionCollection < Lutaml::Model::Serializable
     attribute :metadata, ResolutionMetadata
     attribute :resolutions, Resolution, collection: true
-
-    key_value do
-      map "metadata", to: :metadata
-      map "resolutions", to: :resolutions
-    end
   end
 end

data/lib/edoxen/resolution_date.rb

@@ -7,10 +7,5 @@ module Edoxen
   class ResolutionDate < Lutaml::Model::Serializable
     attribute :date, :date
     attribute :type, :string, values: Enums::RESOLUTION_DATE_TYPE
-
-    key_value do
-      map "date", to: :date
-      map "type", to: :type
-    end
   end
 end

data/lib/edoxen/resolution_metadata.rb

@@ -13,14 +13,10 @@ module Edoxen
     attribute :city, :string
     attribute :country_code, :string
 
-    key_value do
-      map "title", to: :title
-      map "title_localized", to: :title_localized
-      map "date", to: :date
-      map "source", to: :source
-      map "source_urls", to: :source_urls
-      map "city", to: :city
-      map "country_code", to: :country_code
-    end
+    # URN back-reference to the Meeting that produced this collection.
+    # Join key for the Meeting ↔ ResolutionCollection link. Optional —
+    # collections without a parent meeting (e.g., ad-hoc resolution
+    # sets) simply omit it.
+    attribute :meeting_urn, :string
   end
 end

data/lib/edoxen/resolution_relation.rb

@@ -7,11 +7,5 @@ module Edoxen
     attribute :source, StructuredIdentifier
     attribute :destination, StructuredIdentifier
     attribute :type, :string, values: Enums::RESOLUTION_RELATION_TYPE
-
-    key_value do
-      map "source", to: :source
-      map "destination", to: :destination
-      map "type", to: :type
-    end
   end
 end

data/lib/edoxen/schedule_item.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Edoxen
+  # One entry in a meeting timetable. Structural fields (date, time,
+  # room) are language-agnostic; descriptive fields (event,
+  # description) live here as plain strings in v1 — see
+  # TODO.meeting-agenda/10-future-enhancements.md P2.1 for per-item
+  # localization.
+  class ScheduleItem < Lutaml::Model::Serializable
+    attribute :date, :date
+    attribute :time, :string
+    attribute :event, :string
+    attribute :description, :string
+    attribute :room, :string
+  end
+end

data/lib/edoxen/schema_validator.rb

@@ -21,46 +21,28 @@ module Edoxen
   # hard-coded path shapes) so adding new collection fields never requires
   # touching this class.
   class SchemaValidator
-    class ValidationError < StandardError
-      attr_reader :file, :line, :column, :pointer, :message_text
-
-      def initialize(file:, line:, column:, pointer:, message_text:)
-        @file = file
-        @line = line
-        @column = column
-        @pointer = pointer
-        @message_text = message_text
-        super(format_line(file, line, column, message_text, pointer))
-      end
-
-      def to_clickable_format
-        format_line(@file, @line, @column, @message_text, @pointer)
-      end
-
-      private
-
-      def format_line(file, line, column, message_text, pointer)
-        suffix = pointer.to_s.empty? ? "" : " at `#{pointer}`"
-        "#{file}:#{line}:#{column}: #{message_text}#{suffix}"
-      end
-    end
+    # Back-compat alias. The canonical type is Edoxen::ValidationError;
+    # this constant lets existing callers keep writing
+    # `SchemaValidator::ValidationError` after the unification.
+    ValidationError = Edoxen::ValidationError
 
     def initialize(schema_path = default_schema_path)
       @schema_path = schema_path
       @schemer = load_schemer(schema_path)
     end
 
-    # Validate a YAML file. Returns an array of ValidationError (empty = ok).
+    # Validate a YAML file. Returns an array of Edoxen::ValidationError
+    # (empty = ok).
     def validate_file(file_path)
       validate_content(File.read(file_path), file_path)
     rescue Errno::ENOENT
       [ValidationError.new(
         file: file_path, line: 1, column: 1,
-        pointer: "", message_text: "File not found"
+        message_text: "File not found", source: Edoxen::ValidationError::SOURCE_SCHEMA
       )]
     end
 
-    # Validate a YAML string. Returns an array of ValidationError.
+    # Validate a YAML string. Returns an array of Edoxen::ValidationError.
     def validate_content(content, file_path)
       data = normalize_dates(YAML.safe_load(content, permitted_classes: [Date, Time]))
       line_map = LineMap.build(content)
@@ -71,13 +53,15 @@ module Edoxen
         line, column = LineMap.locate(pointer, line_map)
         ValidationError.new(
           file: file_path, line: line, column: column,
-          pointer: pointer, message_text: message
+          message_text: message, pointer: pointer,
+          source: Edoxen::ValidationError::SOURCE_SCHEMA
         )
       end
     rescue Psych::SyntaxError => e
       [ValidationError.new(
         file: file_path, line: e.line || 1, column: e.column || 1,
-        pointer: "", message_text: "YAML syntax error: #{e.problem}"
+        message_text: "YAML syntax error: #{e.problem}",
+        source: Edoxen::ValidationError::SOURCE_SYNTAX
       )]
     end
 

data/lib/edoxen/source_url.rb

@@ -2,17 +2,15 @@
 
 module Edoxen
   # Per-language canonical source URL (e.g. one PDF per language).
-  # Carries the URL ref, its format, and the ISO 639-3 language_code the URL
-  # is the canonical source for.
+  # Carries the URL ref, its format, the ISO 639-3 language_code the URL
+  # is the canonical source for, and an optional `kind` discriminator
+  # (agenda_pdf, minutes_pdf, resolutions_pdf, ...) used by the Meeting
+  # model. Existing Resolution fixtures without `kind` still parse —
+  # the field is optional.
   class SourceUrl < Lutaml::Model::Serializable
     attribute :ref, :string
     attribute :format, :string
     attribute :language_code, :string
-
-    key_value do
-      map "ref", to: :ref
-      map "format", to: :format
-      map "language_code", to: :language_code
-    end
+    attribute :kind, :string, values: Enums::SOURCE_URL_KIND
   end
 end

data/lib/edoxen/structured_identifier.rb

@@ -8,10 +8,5 @@ module Edoxen
   class StructuredIdentifier < Lutaml::Model::Serializable
     attribute :prefix, :string
     attribute :number, :string
-
-    key_value do
-      map "prefix", to: :prefix
-      map "number", to: :number
-    end
   end
 end

data/lib/edoxen/url.rb

@@ -6,11 +6,5 @@ module Edoxen
     attribute :kind, :string, values: Enums::URL_KIND
     attribute :ref, :string
     attribute :format, :string
-
-    key_value do
-      map "kind", to: :kind
-      map "ref", to: :ref
-      map "format", to: :format
-    end
   end
 end

data/lib/edoxen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Edoxen
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

data/lib/edoxen.rb

@@ -21,6 +21,7 @@ module Edoxen
   # (Resolution <-> Localization, ResolutionMetadata <-> Localization, etc.).
   autoload :VERSION, "edoxen/version"
   autoload :Error, "edoxen/error"
+  autoload :ValidationError, "edoxen/error"
   autoload :Enums, "edoxen/enums"
 
   # Information-model classes (one per file, one concept per class).
@@ -39,6 +40,22 @@ module Edoxen
   autoload :ResolutionMetadata, "edoxen/resolution_metadata"
   autoload :ResolutionCollection, "edoxen/resolution_collection"
 
+  # Meeting / Agenda side. Mirrors edoxen-model/models/meeting*.lutaml.
+  autoload :DateRange, "edoxen/date_range"
+  autoload :Location, "edoxen/location"
+  autoload :Person, "edoxen/person"
+  autoload :HostRef, "edoxen/host_ref"
+  autoload :ScheduleItem, "edoxen/schedule_item"
+  autoload :Deadline, "edoxen/deadline"
+  autoload :Reference, "edoxen/reference"
+  autoload :AgendaItem, "edoxen/agenda_item"
+  autoload :Agenda, "edoxen/agenda"
+  autoload :MeetingRelation, "edoxen/meeting_relation"
+  autoload :MeetingLocalization, "edoxen/meeting_localization"
+  autoload :Meeting, "edoxen/meeting"
+  autoload :MeetingCollectionMetadata, "edoxen/meeting_collection_metadata"
+  autoload :MeetingCollection, "edoxen/meeting_collection"
+
   # Services.
   autoload :SchemaValidator, "edoxen/schema_validator"
   autoload :Cli, "edoxen/cli"

data/schema/edoxen.yaml

@@ -207,6 +207,10 @@ $defs:
       language_code:
         type: string
         pattern: "^[a-z]{3}$"
+      kind:
+        type: string
+        description: "Optional discriminator (agenda_pdf, minutes_pdf, ...)."
+        enum: [agenda_pdf, minutes_pdf, resolutions_pdf, report_pdf, register_url, landing_page]
 
   # ====================================================================
   # Top-level structures.
@@ -289,6 +293,9 @@ $defs:
       country_code:
         type: string
         description: "ISO 3166-1 alpha-2 country code (2-letter, e.g. DE, FR, JP) of the host country."
+      meeting_urn:
+        type: string
+        description: "URN back-reference to the Meeting that produced this collection."
 
   # ====================================================================
   # Enums. Each is referenced by its $ref name above. The schema