suma 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0cee8119660d33e2592a44875f218ff7cad624c0c5ff89430c5f97eda5f593e
-  data.tar.gz: 9fdc83bc1383b931d0907d9f31e4d94986a7922b55ef4f82ae437b4a52833f08
+  metadata.gz: 7d5ebe81c947831dfcd9c94b3eeea2a34f33d29c548a59a55347b35adecaecc7
+  data.tar.gz: '085a461362248532759fe4d47ce5e0e7ff510147a97537c17e039878ae2e503a'
 SHA512:
-  metadata.gz: d2e87931a5396a1b42245c0d3156345e539b6d1f11bb82b6fcc9537603cec0f1d084e7636705d5eae87b180bc1618a77330e616b714ed1b94ae25f910a7209a6
-  data.tar.gz: 80eebf4ce42b572fb812a8729d6a71e9a96ed08d7d2d2c04b9b9884d721adf70075a6c2ccc6d400bdbc94573edc44f273baec9c9adcb7517134a6473cbabfdf4
+  metadata.gz: df8f83de715f1dfe7bff547a539717841f0595f02c003caa69a2b09f24e50c02d9a7c1372dce6f7cfe4055e0c05ecd023b8b3033b966dd4e1016f4768bbf5b0c
+  data.tar.gz: 323215a01e582ad8d223bf76916454ca8ee23dd8d2a8f4bde78c1f57631b50da65cf05d83b6c94e9f94052fed943dfed73bfd05434a94f70414e1054652bc722

data/lib/suma/schema_attachment.rb

@@ -68,13 +68,14 @@ module Suma
       File.join(@output_path, "schema_#{@schema.id}.yaml")
     end
 
-    def to_config
+    def to_config(path: nil)
       # return @config unless @config
       @config = SchemaConfig::Config.new
       @config.schemas << SchemaConfig::Schema.new(
         id: @schema.id,
-        path: @schema.path
+        path: @schema.path,
       )
+      path and @config.path = path
 
       @config
     end
@@ -83,16 +84,16 @@ module Suma
       relative_path = Pathname.new(filename_config).relative_path_from(Dir.pwd)
       Utils.log "Save schema config: #{relative_path}"
 
+      # Still overwrite even if the file exists
       # return if File.exist?(filename_config)
       FileUtils.mkdir_p(File.dirname(filename_config))
 
-      File.open(filename_config, "w") do |file|
-        file.write(to_config.to_yaml)
-      end
+      to_config.save_to_path(filename_config)
     end
 
     # Compile Metanorma adoc per EXPRESS schema
     def compile
+      # TODO: Clean artifacts after compiling
       # I am commenting out because I'm playing with the schemas-only status
       # return self if File.exist?(output_xml_path)
 
@@ -104,7 +105,7 @@ module Suma
       Metanorma::Compile.new.compile(
         filename_adoc,
         agree_to_terms: true,
-        install_fonts: false
+        install_fonts: false,
       )
       Utils.log "Compiling schema (id: #{id}, type: #{self.class}) => #{relative_path}... done!"
 
@@ -124,7 +125,7 @@ module Suma
         filename_adoc,
         filename_adoc("presentation.xml"),
         filename_adoc("adoc.lutaml.log.txt"),
-        filename_adoc("err.html")
+        filename_adoc("err.html"),
       ].each do |filename|
         FileUtils.rm_rf(filename)
       end

data/lib/suma/schema_collection.rb

@@ -78,8 +78,6 @@ module Suma
         entry.save_exp
       end
 
-      # DISABLING FOLLOWING CODE AS MISCONCEIVED. THE SCHEMA DOCUMENTS
-      # BELONG IN THE MAIN COLLECTION NOT HERE
       docs.each_pair do |schema_id, entry|
         entry.compile
       end

data/lib/suma/schema_config/config.rb

@@ -9,6 +9,7 @@ module Suma
     class Config < Shale::Mapper
       attribute :schemas, Schema, collection: true
       attribute :path, Shale::Type::String
+      attr_accessor :output_path
 
       def initialize(**args)
         @path = path_relative_to_absolute(path) if path
@@ -39,6 +40,7 @@ module Suma
         @path = path_relative_to_absolute(new_path)
         schemas.each do |schema|
           schema.path = path_relative_to_absolute(schema.path)
+          schema.container_path = File.expand_path(@path)
         end
       end
 
@@ -48,17 +50,25 @@ module Suma
         end
       end
 
-      # TODO: I can't get the relative path working. The schemas-*.yaml file is
-      # meant to contain the "path" key, which is a relative path to its
-      # location, then sets the base path to each schema path, which is supposed
-      # to be relative to "path" key. Somehow, the @path variable is always
-      # missing in to_yaml...
       def schemas_to_yaml(model, doc)
-        # puts "^"*30
-        # pp self
-        # pp @path
         doc["schemas"] = model.schemas.sort_by(&:id).to_h do |schema|
-          [schema.id, { "path" => path_absolute_to_relative(schema.path) }]
+          # We are outputting the schemas collection file to the directory where
+          # the collection config is at (assumed to be Dir.pwd), not to the
+          # directory we sourced the manifest from, e.g.
+          # documents/iso-10303-41/schemas.yaml.
+
+          # So the schema.container_path = @config.path is not
+          # in fact needed, as the files are already absolute. This notion of
+          # using @path to create relative paths was misconceived
+          [
+            schema.id,
+            {
+              "path" => path_absolute_to_relative(
+                schema.path,
+                model.output_path || Dir.pwd,
+              ),
+            },
+          ]
         end
       end
 
@@ -68,20 +78,18 @@ module Suma
 
         # Or based on current working directory?
         return relative_path unless @path
+        # ... but if this calculates path, we end up expanding it anyway
 
         Pathname.new(File.dirname(@path)).join(eval_path).expand_path.to_s
       end
 
-      def path_absolute_to_relative(absolute_path)
-        # puts "path_absolute_to_relative 1 #{absolute_path}"
-        # pp self
-        # pp path
-        # pp @hello
-        return absolute_path unless @path
+      def path_absolute_to_relative(absolute_path, container_path)
+        container_path ||= @path
+        return absolute_path unless container_path
 
-        relative_path = Pathname.new(absolute_path).relative_path_from(Pathname.new(@path).dirname).to_s
-        # puts "path_absolute_to_relative x #{relative_path}"
-        relative_path
+        p = Pathname.new(container_path)
+        container = p.directory? ? p.to_s : p.dirname
+        Pathname.new(absolute_path).relative_path_from(container).to_s
       end
 
       def update_path(new_path)
@@ -98,8 +106,8 @@ module Suma
           next if schema_path.absolute?
 
           schema_path = (Pathname.new(old_base_path) + schema_path).cleanpath
-          new_relative_schema_path = schema_path.relative_path_from(new_base_path)
-          schema.path = new_relative_schema_path
+          # This is the new relative schema_path
+          schema.path = schema_path.relative_path_from(new_base_path)
         end
 
         @path = new_path
@@ -107,7 +115,7 @@ module Suma
 
       def concat(another_config)
         unless another_config.is_a?(self.class)
-          raise StandardError, "Can only concatenate a non SchemaConfig::Config object."
+          raise StandardError, "Can only concat a SchemaConfig::Config object."
         end
 
         # We need to update the relative paths when paths exist
@@ -120,13 +128,15 @@ module Suma
       end
 
       def save_to_path(filename)
-        new_config = dup
-        new_config.path = filename
-        new_config.update_base_path(File.dirname(filename))
+        new_config = dup.tap do |c|
+          c.path = filename
+          c.update_path(File.dirname(filename))
+          c.output_path = filename
+        end
 
         File.open(filename, "w") do |f|
           Utils.log "Writing #{filename}..."
-          f.write(to_yaml)
+          f.write(new_config.to_yaml)
           Utils.log "Done."
         end
       end

data/lib/suma/schema_config/schema.rb

@@ -8,6 +8,12 @@ module Suma
       attribute :id, Shale::Type::String
       attribute :path, Shale::Type::String
       # attribute :schemas_only, Shale::Type::Boolean
+
+      # container_path is a copy of Suma::SchemaConfig::Config.path,
+      # used to resolve the path of each schema within
+      # Suma::SchemaConfig::Config.schemas,
+      # when Suma::SchemaConfig::Config.schemas is recursively flattened
+      attr_accessor :container_path
     end
   end
 end

data/lib/suma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Suma
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suma
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir