edoxen 0.1.1 → 0.1.2

data/schema/edoxen.yaml

@@ -2,22 +2,26 @@
 ---
 $schema: "http://json-schema.org/draft-07/schema#"
 $id: "https://github.com/metanorma/edoxen/schema/edoxen.yaml"
-title: "Edoxen Resolution Collection Schema"
-description: "Schema for validating Edoxen resolution collection YAML files"
+title: "Edoxen Resolution Set Schema"
+description: "Schema for validating Edoxen resolution set YAML files"
 type: object
 
 properties:
   metadata:
     type: object
-    description: "Metadata about the resolution collection"
+    description: "Metadata about the resolution set"
     properties:
       title:
         type: string
-        description: "Title of the resolution collection"
-      date:
+        description: "Title of the resolution set"
+      identifier:
         type: string
-        format: date
-        description: "Date of the meeting or collection (YYYY-MM-DD)"
+        description: "Identifier for the resolution set (e.g., '2019-01')"
+      dates:
+        type: array
+        description: "Array of dates related to the set"
+        items:
+          $ref: "#/$defs/ComplexDate"
       source:
         type: string
         description: "Source organization or secretariat"
@@ -27,6 +31,22 @@ properties:
       chair:
         type: string
         description: "Meeting chair"
+      attendees:
+        type: array
+        items:
+          type: string
+        description: "List of attendees"
+      apologies:
+        type: array
+        items:
+          type: string
+        description: "List of apologies"
+      urls:
+        type: array
+        items:
+          $ref: "#/$defs/Url"
+        description: "Array of URLs related to the resolution set"
+
     additionalProperties: false
 
   resolutions:
@@ -62,9 +82,11 @@ $defs:
           - "declaration"
         description: "Type of resolution"
 
-      category:
-        type: string
-        description: "Resolution category"
+      categories:
+        type: array
+        items:
+          type: string
+        description: "Resolution categories"
 
       subject:
         type: string
@@ -73,15 +95,22 @@ $defs:
       dates:
         type: array
         items:
-          type: string
-          format: date
-        description: "Array of relevant dates"
+          $ref: "#/$defs/ComplexDate"
+        description: "Array of relevant dates with start/end structure"
+
+      message:
+        type: string
+        description: "Resolution message"
+
+      considering:
+        type: string
+        description: "Considering clause"
 
       considerations:
         type: array
         items:
           $ref: "#/$defs/Consideration"
-        description: "Considerations leading to the resolution"
+        description: "Array of considerations leading to the resolution"
 
       approvals:
         type: array
@@ -95,18 +124,69 @@ $defs:
           $ref: "#/$defs/Action"
         description: "Actions taken in the resolution"
 
+      urls:
+        type: array
+        items:
+          $ref: "#/$defs/Url"
+        description: "Array of URLs related to the resolution"
+
       meeting:
         $ref: "#/$defs/MeetingIdentifier"
         description: "Meeting information"
 
-      relationships:
+      relations:
         type: array
         items:
-          $ref: "#/$defs/ResolutionRelationship"
-        description: "Relationships to other resolutions"
+          $ref: "#/$defs/ResolutionRelations"
+        description: "Relations to other resolutions"
 
+    additionalProperties: false
     required:
-      - title
+      - subject
+      - identifier
+      - actions
+
+  ComplexDate:
+    type: object
+    description: "Date with start and end"
+    properties:
+      start:
+        type: string
+        format: date
+        description: "Start date or single date if no end date"
+      end:
+        type: string
+        format: date
+        description: "End date (optional)"
+      kind:
+        type: string
+        enum:
+          - "enactment"
+          - "ballot"
+          - "effective"
+          - "decision"
+          - "meeting"
+        description: "Kind of date (e.g., enactment, ballot, effective)"
+    required:
+    - kind
+    additionalProperties: false
+
+  Url:
+    type: object
+    description: "URL with kind and reference"
+    properties:
+      kind:
+        type: string
+        enum:
+          - "access"
+          - "report"
+        description: "Kind of URL (e.g., access, report)"
+      ref:
+        type: string
+        description: "Reference URL"
+      format:
+        type: string
+        description: "Format of the URL (e.g., 'html', 'pdf')"
     additionalProperties: false
 
   Consideration:
@@ -116,20 +196,23 @@ $defs:
       type:
         type: string
         enum:
-          - "having"
-          - "noting"
-          - "recognizing"
           - "acknowledging"
+          - "following"
+          - "basing"
           - "considering"
+          - "identifying"
+          - "according"
+          - "noting"
           - "recalling"
-          - "welcoming"
-          - "appreciating"
+          - "recognises"
+          - "recognising"
+          - "recognizing"
         description: "Type of consideration"
 
-      date_effective:
-        type: string
-        format: date
-        description: "Effective date of the consideration"
+      dates:
+        type: array
+        items:
+          $ref: "#/$defs/ComplexDate"
 
       message:
         type: string
@@ -139,6 +222,9 @@ $defs:
         type: string
         description: "Subject of the consideration"
 
+    required:
+    - type
+    - message
     additionalProperties: false
 
   Approval:
@@ -169,36 +255,76 @@ $defs:
   Action:
     type: object
     description: "An action taken in a resolution"
+    required:
+      - type
+      - message
     properties:
       type:
         type: string
         enum:
+          - "accepts"
+          - "acknowledges"
+          - "adoption"
           - "adopts"
-          - "thanks"
+          - "agrees"
+          - "allocates"
+          - "appoints"
+          - "appreciates"
+          - "appreciation"
           - "approves"
+          - "asks"
+          - "assigns"
+          - "chairs"
+          - "communicating"
+          - "confirms"
+          - "considers"
+          - "consults"
+          - "creates"
           - "decides"
-          - "declares"
-          - "resolves"
-          - "requests"
-          - "recommends"
+          - "defines"
+          - "delegates"
+          - "delivering"
+          - "directs"
+          - "disbands"
+          - "drafting"
+          - "elects"
+          - "empowers"
           - "encourages"
-          - "welcomes"
-          - "notes"
-          - "confirms"
-          - "reaffirms"
-          - "withdraws"
-          - "abrogates"
+          - "endorses"
+          - "estabilishes"
           - "establishes"
-          - "appoints"
+          - "gathering"
+          - "identifies"
+          - "instructs"
+          - "investigates"
           - "nominates"
-          - "extends"
-          - "initiates"
+          - "notes"
+          - "notifies"
+          - "recognises"
+          - "recognizes"
+          - "reminds"
+          - "recommends"
+          - "registers"
+          - "regrets"
+          - "request"
+          - "replaces"
+          - "requests"
+          - "resolves"
+          - "restates"
+          - "scopes"
+          - "secures"
+          - "sends"
+          - "supports"
+          - "thanks"
+          - "welcomes"
+          - "withdraws"
         description: "Type of action"
 
-      date_effective:
-        type: string
-        format: date
-        description: "Effective date of the action"
+      dates:
+        type: array
+        items:
+          $ref: "#/$defs/ComplexDate"
+        description: "Dates of the action"
 
       message:
         type: string
@@ -208,6 +334,14 @@ $defs:
         type: string
         description: "Subject of the action"
 
+      degree:
+        type: string
+        description: "Degree of the action"
+        enum:
+          - "unanimous"
+          - "majority"
+          - "minority"
+
     additionalProperties: false
 
   MeetingIdentifier:
@@ -218,10 +352,11 @@ $defs:
         type: string
         description: "Meeting venue"
 
-      date:
-        type: string
-        format: date
-        description: "Meeting date"
+      dates:
+        type: array
+        description: "Meeting dates"
+        items:
+          $ref: "#/$defs/ComplexDate"
 
       identifier:
         type: string
@@ -229,9 +364,9 @@ $defs:
 
     additionalProperties: false
 
-  ResolutionRelationship:
+  ResolutionRelations:
     type: object
-    description: "Relationship between resolutions"
+    description: "Relation between resolutions"
     properties:
       type:
         type: string
@@ -241,7 +376,7 @@ $defs:
           - "references"
           - "replaces"
           - "updates"
-        description: "Type of relationship"
+        description: "Type of relation"
 
       target:
         type: string
@@ -249,7 +384,7 @@ $defs:
 
       description:
         type: string
-        description: "Description of the relationship"
+        description: "Description of the relation"
 
     additionalProperties: false
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: edoxen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-18 00:00:00.000000000 Z
+date: 2025-07-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json_schemer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
@@ -24,16 +38,30 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-description: 'Edoxen provides a Ruby library for working with resolution models, allowing
-  users to create, manipulate, and serialize resolution data in a structured format.
-  It is built on top of the lutaml-model serialization framework, which provides a
-  flexible and extensible way to define data models and serialize them to YAML or
-  JSON formats.
-
-  '
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: |
+  Edoxen provides a Ruby library for working with resolution models, allowing
+  users to create, manipulate, and serialize resolution data in a structured
+  format. It is built on top of the lutaml-model serialization framework,
+  which provides a flexible and extensible way to define data models and
+  serialize them to YAML or JSON formats.
 email:
 - open.source@ribose.com
-executables: []
+executables:
+- edoxen
 extensions: []
 extra_rdoc_files: []
 files:
@@ -45,18 +73,21 @@ files:
 - README.adoc
 - Rakefile
 - edoxen.gemspec
+- exe/edoxen
 - lib/edoxen.rb
 - lib/edoxen/action.rb
 - lib/edoxen/approval.rb
+- lib/edoxen/cli.rb
 - lib/edoxen/consideration.rb
 - lib/edoxen/meeting.rb
-- lib/edoxen/meeting_identfier.rb
+- lib/edoxen/meeting_identifier.rb
+- lib/edoxen/metadata.rb
 - lib/edoxen/resolution.rb
-- lib/edoxen/resolution_collection.rb
 - lib/edoxen/resolution_date.rb
-- lib/edoxen/resolution_relationship.rb
-- lib/edoxen/structured_identifier.rb
-- lib/edoxen/subject_body.rb
+- lib/edoxen/resolution_relation.rb
+- lib/edoxen/resolution_set.rb
+- lib/edoxen/schema_validator.rb
+- lib/edoxen/url.rb
 - lib/edoxen/version.rb
 - schema/edoxen.yaml
 - sig/edoxen.rbs

data/lib/edoxen/resolution_collection.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "lutaml/model"
-
-module Edoxen
-  class ResolutionCollection < Lutaml::Model::Serializable
-    attribute :metadata, :hash
-    attribute :resolutions, Resolution, collection: true
-
-    key_value do
-      map "metadata", to: :metadata
-      map "resolutions", to: :resolutions
-    end
-
-    # Example of a ResolutionCollection
-    # metadata:
-    #   title: Resolutions of the 38th plenary meeting of ISO/TC 154
-    #   date: 2019-10-17
-    #   source: ISO/TC 154 Secretariat
-    # resolutions:
-    #   - category: Resolutions related to JWG 1
-    #     dates: 2019/10/17
-    #     ...
-  end
-end

data/lib/edoxen/structured_identifier.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-# StructuredIdentifier {
-#   number:
-#   prefix:
-# }
-
-require "lutaml/model"
-
-module Edoxen
-  class StructuredIdentifier < Lutaml::Model::Serializable
-    attribute :number, :string
-    attribute :prefix, :string
-
-    key_value do
-      map "number", to: :number
-      map "prefix", to: :prefix
-    end
-  end
-end

data/lib/edoxen/subject_body.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-# SubjectBody {
-#   name
-#   address
-#   etc.
-# }
-require "lutaml/model"
-
-module Edoxen
-  class SubjectBody < Lutaml::Model::Serializable
-    attribute :name, :string
-    attribute :address, :string
-
-    key_value do
-      map "name", to: :name
-      map "address", to: :address
-    end
-  end
-end