expressir 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6332097442bcc1944b232cb35d7087a77d53b6e5c4c774dfd8858b5e7e844d12
-  data.tar.gz: ba77289decd02d53fd3af744b2285f4af560b080042024dedffba71a377768cc
+  metadata.gz: fbb7fb563aa44a7d916ef48ccd2b5e865ced0776ce36e5c238fddaf3c2dd61ac
+  data.tar.gz: 487913925a727a1e20fa4651ffc3a3af669f3ba094655bb232c39dde6b92b4e2
 SHA512:
-  metadata.gz: 8570065d318a194afada69883530b4352695c5338dbddec69c3c63859a2352ba0a6c6eaf28dddc3025cdc18ea5e079e1a0cc3d3a35cc87161774912570e70f08
-  data.tar.gz: 7af0380673d43c089b61f7845a3a4edaf3c824e1533f9703c1e2108fcf339f388fb25e449e34a109168328aedbf5cbddf54023b0b6d919298ba336011cb03ced
+  metadata.gz: 979411f7682a574f9743ea7129bbf826d9c11657b97c2a9a95e9e9d066d530b99f95ffc228366f09fc8f86db3ec7596d4870bdab33de55aca094ef6ebef3d7ff
+  data.tar.gz: dfd514fdfc7fd31dfddb4886545d2b763b1c53bea7b2eeed9a95b88274953f5996c5f606b180f5a783e5bb32e24a043903101315bc9de0b8d231bf89ac2f38fc

data/lib/expressir/express/express_remarks_decorator.rb

@@ -0,0 +1,76 @@
+module Expressir
+  module Express
+    class ExpressRemarksDecorator
+      RELATIVE_PREFIX_MACRO_REGEXP = /^(link|image|video|audio|include)(:+)?(?![^\/:]+:\/\/|[A-Z]:\/|\/)([^:\[]+)(\[.*\])?$/.freeze
+
+      attr_reader :remark, :options
+
+      def self.call(remark, options)
+        new(remark, options).call
+      end
+
+      def initialize(remark, options)
+        @remark = remark
+        @options = options
+      end
+
+      def call
+        result = remark
+        if options["leveloffset"]
+          result = process_remark_offsets(result, options["leveloffset"].to_i)
+        end
+        if options["relative_path_prefix"]
+          result = update_relative_paths(result,
+                                         options["relative_path_prefix"])
+        end
+        result
+      end
+
+      private
+
+      def update_relative_paths(string, path_prefix)
+        string
+          .split("\n")
+          .map do |line|
+            if line.match?(RELATIVE_PREFIX_MACRO_REGEXP)
+              prefix_relative_paths(line, path_prefix)
+            else
+              line
+            end
+          end
+          .join("\n")
+      end
+
+      def prefix_relative_paths(line, path_prefix)
+        line.gsub(RELATIVE_PREFIX_MACRO_REGEXP) do |_match|
+          prefixed_path = File.join(path_prefix, $3.strip)
+          # When we are dealing with a relative path of a template:
+          # ../path/to/file we need to transform it into
+          # the absolute one because `image::` macro wont understand it other way
+          prefixed_path = File.absolute_path(prefixed_path) if prefixed_path.start_with?("../")
+          full_path = File.expand_path(prefixed_path)
+          "#{$1}#{$2}#{full_path}#{$4}"
+        end
+      end
+
+      def process_remark_offsets(string, offset)
+        string
+          .split("\n")
+          .map do |line|
+            if line.match?(/^=/)
+              set_string_offsets(line, offset)
+            else
+              line
+            end
+          end
+          .join("\n")
+      end
+
+      def set_string_offsets(string, offset)
+        return "#{'=' * offset}#{string}" if offset.positive?
+
+        string.gsub(/^={#{offset * -1}}/, "")
+      end
+    end
+  end
+end

data/lib/expressir/liquid/declarations/schema_drop.rb

@@ -6,9 +6,11 @@ module Expressir
       class SchemaDrop < ::Expressir::Liquid::DeclarationDrop
         include ::Expressir::Liquid::IdentifierDrop
 
-        def initialize(model)
+        def initialize(model, selected_schemas: nil, options: {}) # rubocop:disable Lint/MissingSuper
           @model = model
-          initialize_identifier(@model)
+          @selected_schemas = selected_schemas
+          @options = options
+          initialize_identifier(@model, @options)
           super
         end
 
@@ -16,6 +18,40 @@ module Expressir
           @model.file
         end
 
+        def file_basename
+          File.basename(@model.file, ".exp")
+        end
+
+        def selected
+          @selected_schemas&.include?(@model.id) ||
+            @selected_schemas&.include?(file_basename)
+        end
+
+        def relative_path_prefix
+          return nil if @options.nil? || @options["document"].nil?
+
+          document = @options["document"]
+          file_path = File.dirname(@model.file)
+          docfile_directory = File.dirname(
+            document.attributes["docfile"] || ".",
+          )
+          document
+            .path_resolver
+            .system_path(file_path, docfile_directory)
+        end
+
+        def remarks
+          return [] unless @model.remarks
+
+          options = @options || {}
+          options["relative_path_prefix"] = relative_path_prefix
+
+          @model.remarks.map do |remark|
+            ::Expressir::Express::ExpressRemarksDecorator
+              .call(remark, options)
+          end
+        end
+
         def version
           ::Expressir::Liquid::Declarations::SchemaVersionDrop.new(
             @model.version,

data/lib/expressir/liquid/identifier_drop.rb

@@ -5,8 +5,9 @@ require_relative "declarations/remark_item_drop"
 module Expressir
   module Liquid
     module IdentifierDrop
-      def initialize_identifier(model)
+      def initialize_identifier(model, options = {})
         @model = model
+        @options = options
       end
 
       def id

data/lib/expressir/liquid/model_element_drop.rb

@@ -3,8 +3,10 @@
 module Expressir
   module Liquid
     class ModelElementDrop < ::Liquid::Drop
-      def initialize(model) # rubocop:disable Lint/MissingSuper
+      def initialize(model, selected_schemas: nil, options: {}) # rubocop:disable Lint/MissingSuper
         @model = model
+        @selected_schemas = selected_schemas
+        @options = options
       end
 
       def _class

data/lib/expressir/liquid/repository_drop.rb

@@ -5,8 +5,10 @@ require_relative "declarations/schema_drop"
 module Expressir
   module Liquid
     class RepositoryDrop < ::Expressir::Liquid::ModelElementDrop
-      def initialize(model)
+      def initialize(model, selected_schemas: nil, options: {}) # rubocop:disable Lint/MissingSuper
         @model = model
+        @selected_schemas = selected_schemas
+        @options = options
         super
       end
 
@@ -14,7 +16,11 @@ module Expressir
         return [] unless @model.schemas
 
         @model.schemas.map do |item|
-          ::Expressir::Liquid::Declarations::SchemaDrop.new(item)
+          ::Expressir::Liquid::Declarations::SchemaDrop.new(
+            item,
+            selected_schemas: @selected_schemas,
+            options: @options,
+          )
         end
       end
     end

data/lib/expressir/model/model_element.rb

@@ -151,10 +151,10 @@ module Expressir
       end
 
       # @return [Liquid::Drop]
-      def to_liquid
+      def to_liquid(selected_schemas: nil, options: nil)
         klass_name = "#{self.class.name.gsub('::Model::', '::Liquid::')}Drop"
         klass = Object.const_get(klass_name)
-        klass.new(self)
+        klass.new(self, selected_schemas: selected_schemas, options: options)
       end
 
       def to_s(no_remarks: false, formatter: nil)

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.1.4".freeze
+  VERSION = "2.1.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -86,6 +86,7 @@ files:
 - lib/expressir/cli.rb
 - lib/expressir/config.rb
 - lib/expressir/express/cache.rb
+- lib/expressir/express/express_remarks_decorator.rb
 - lib/expressir/express/formatter.rb
 - lib/expressir/express/hyperlink_formatter.rb
 - lib/expressir/express/model_visitor.rb