expressir 2.1.17 → 2.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277a743bb27aa72bee152d4c503292790212510a8d8b9d6fbd05b195408a5f8c
-  data.tar.gz: 97b97c970b4a965aeed7ee237b5fcebeda4f26e7d86b163c02b692affbd76082
+  metadata.gz: d20d882f0b9e6b30860d41294671b6c235cff0cc024521276ca9ca3283e1f79a
+  data.tar.gz: 8625cc4fa425c9d02c73e056b8ee9ee8aa69eaab566452b44e1a1ae137faacf6
 SHA512:
-  metadata.gz: 4ae77121b551d8105486602383ee9b3b0596dd83ad3890b2c799182a9e6947488466a9a453205eb5b3791597e00a66f6754cd56946e5025c27f6a845eb756276
-  data.tar.gz: 8f611d2ce48adc92acee4eaa9af7b048baf92dfef08a265780e93f98d3b273a271b97a0f13b7492bb977075e98a863590f391c407a7a1ad1a707a3b24c40d24e
+  metadata.gz: 88dc6630b82e7b7c01f49df868664caa34d54e5d21d2af4d786094f7c880b7f39bbd7295f084e1e3558f9705a7798364740dfdc40086241b7d20e36419ae75b9
+  data.tar.gz: 0f87bcc8eda3e6b321202f64b9bcfc5a357c8b3ee4c1f0dc481a7610e9680f2af50a0b257838809d05888fda647f28be9583e1debfac557fa31c78b1b2c66fb2

data/expressir.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
 
+  spec.add_dependency "base64"
   spec.add_dependency "benchmark-ips"
   spec.add_dependency "csv"
   spec.add_dependency "liquid"

data/lib/expressir/express/parser.rb

@@ -67,7 +67,7 @@ module Expressir
         end
         rule(:aliasStmt) do
           (tALIAS >> variableId >> tFOR >> generalRef >> qualifier.repeat.as(:qualifier) >>
-           op_delim >> stmt.repeat(1).as(:stmt) >> tEND_ALIAS >> (op_delim.as(:op_delim2))).as(:aliasStmt)
+           op_delim >> stmt.repeat(1).as(:stmt) >> tEND_ALIAS >> op_delim.as(:op_delim2)).as(:aliasStmt)
         end
         rule(:anyKeyword) { KEYWORDS.map { |kw| send("t#{kw}") }.inject(:|) }
         rule(:arrayType) do
@@ -116,7 +116,7 @@ module Expressir
         rule(:element) { (expression >> (op_colon >> repetition).maybe).as(:element) }
         rule(:embeddedRemark) { (str("(*") >> (str("*)").absent? >> (embeddedRemark | any)).repeat >> str("*)")).as(:embeddedRemark) }
         rule(:encodedCharacter) { (octet >> octet >> octet >> octet) }
-        rule(:encodedStringLiteral) { cts((str('"') >> (encodedCharacter.repeat(1)) >> str('"')).as(:str)).as(:encodedStringLiteral) }
+        rule(:encodedStringLiteral) { cts((str('"') >> encodedCharacter.repeat(1) >> str('"')).as(:str)).as(:encodedStringLiteral) }
         rule(:entityBody) do
           (explicitAttr.repeat.as(:explicitAttr) >> deriveClause.maybe >> inverseClause.maybe >> uniqueClause.maybe >> whereClause.maybe).as(:entityBody)
         end
@@ -149,7 +149,7 @@ module Expressir
         rule(:functionHead) do
           (tFUNCTION >> functionId >>
            (op_leftparen >> (formalParameter >> (op_delim >> formalParameter).repeat).as(:listOf_formalParameter) >> op_rightparen).maybe >>
-           op_colon >> parameterType >> (op_delim.as(:op_delim2))).as(:functionHead)
+           op_colon >> parameterType >> op_delim.as(:op_delim2)).as(:functionHead)
         end
         rule(:functionId) { simpleId.as(:functionId) }
         rule(:functionRef) { functionId.as(:functionRef) }
@@ -181,7 +181,7 @@ module Expressir
         rule(:intervalItem) { simpleExpression.as(:intervalItem) }
         rule(:intervalLow) { simpleExpression.as(:intervalLow) }
         rule(:interval) do
-          (op_left_curly_brace >> intervalLow >> intervalOp >> intervalItem >> (intervalOp.as(:intervalOp2)) >>
+          (op_left_curly_brace >> intervalLow >> intervalOp >> intervalItem >> intervalOp.as(:intervalOp2) >>
            intervalHigh >> op_right_curly_brace).as(:interval)
         end
         rule(:intervalOp) { (op_less_equal | op_less_than).as(:intervalOp) }
@@ -256,7 +256,7 @@ module Expressir
         rule(:procedureHead) do
           (tPROCEDURE >> procedureId >>
            (op_leftparen >> (procedureHeadParameter >>
-                             (op_delim >> procedureHeadParameter).repeat).as(:listOf_procedureHeadParameter) >> op_rightparen).maybe >> (op_delim.as(:op_delim2))).as(:procedureHead)
+                             (op_delim >> procedureHeadParameter).repeat).as(:listOf_procedureHeadParameter) >> op_rightparen).maybe >> op_delim.as(:op_delim2)).as(:procedureHead)
         end
         rule(:procedureId) { simpleId.as(:procedureId) }
         rule(:procedureRef) { procedureId.as(:procedureRef) }
@@ -281,7 +281,7 @@ module Expressir
         end
         rule(:renameId) { (constantId | entityId | functionId | procedureId | typeId).as(:renameId) }
         rule(:repeatControl) { (incrementControl.maybe >> whileControl.maybe >> untilControl.maybe).as(:repeatControl) }
-        rule(:repeatStmt) { (tREPEAT >> repeatControl >> op_delim >> stmt.repeat(1).as(:stmt) >> tEND_REPEAT >> (op_delim.as(:op_delim2))).as(:repeatStmt) }
+        rule(:repeatStmt) { (tREPEAT >> repeatControl >> op_delim >> stmt.repeat(1).as(:stmt) >> tEND_REPEAT >> op_delim.as(:op_delim2)).as(:repeatStmt) }
         rule(:repetition) { numericExpression.as(:repetition) }
         rule(:resourceOrRename) { (resourceRef >> (tAS >> renameId).maybe).as(:resourceOrRename) }
         rule(:resourceRef) { (constantRef | entityRef | functionRef | procedureRef | typeRef).as(:resourceRef) }
@@ -301,7 +301,7 @@ module Expressir
            schemaBodyDeclaration.repeat.as(:schemaBodyDeclaration)).as(:schemaBody)
         end
         rule(:schemaDecl) do
-          (tSCHEMA >> schemaId >> schemaVersionId.maybe >> op_delim >> schemaBody >> tEND_SCHEMA >> (op_delim.as(:op_delim2))).as(:schemaDecl)
+          (tSCHEMA >> schemaId >> schemaVersionId.maybe >> op_delim >> schemaBody >> tEND_SCHEMA >> op_delim.as(:op_delim2)).as(:schemaDecl)
         end
         rule(:schemaId) { simpleId.as(:schemaId) }
         rule(:schemaRef) { schemaId.as(:schemaRef) }
@@ -353,7 +353,7 @@ module Expressir
           (tTOTAL_OVER >> op_leftparen >> (entityRef >> (op_comma >> entityRef).repeat).as(:listOf_entityRef) >> op_rightparen >> op_delim).as(:totalOver)
         end
         rule(:typeDecl) do
-          (tTYPE >> typeId >> op_equals >> underlyingType >> op_delim >> whereClause.maybe >> tEND_TYPE >> (op_delim.as(:op_delim2))).as(:typeDecl)
+          (tTYPE >> typeId >> op_equals >> underlyingType >> op_delim >> whereClause.maybe >> tEND_TYPE >> op_delim.as(:op_delim2)).as(:typeDecl)
         end
         rule(:typeId) { simpleId.as(:typeId) }
         rule(:typeLabelId) { simpleId.as(:typeLabelId) }
@@ -363,7 +363,7 @@ module Expressir
         rule(:unaryOp) { (op_plus | op_minus | tNOT).as(:unaryOp) }
         rule(:underlyingType) { (concreteTypes | constructedTypes).as(:underlyingType) }
         rule(:uniqueClause) do
-          (tUNIQUE >> (uniqueRule >> op_delim >> (uniqueRule >> (op_delim.as(:op_delim2))).repeat).as(:listOf_uniqueRule)).as(:uniqueClause)
+          (tUNIQUE >> (uniqueRule >> op_delim >> (uniqueRule >> op_delim.as(:op_delim2)).repeat).as(:listOf_uniqueRule)).as(:uniqueClause)
         end
         rule(:uniqueRule) do
           ((ruleLabelId >> op_colon).maybe >> (referencedAttribute >> (op_comma >> referencedAttribute).repeat).as(:listOf_referencedAttribute)).as(:uniqueRule)

data/lib/expressir/express/visitor.rb

@@ -88,7 +88,7 @@ module Expressir
           private_methods.grep(/^visit_/).map do |name|
             rulename = name.to_s.sub(/^visit_/, "").gsub(/_([a-z])/) { $1.upcase }
             [rulename.to_sym, name.to_sym]
-          end
+          end,
         ]
       end
 
@@ -104,7 +104,7 @@ module Expressir
               else
                 [k, to_ctx(v, k)]
               end
-            end
+            end,
           ]
           Ctx.new nodes, name
         when Array

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.1.17".freeze
+  VERSION = "2.1.18".freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.1.17
+  version: 2.1.18
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +159,6 @@ files:
 - lib/expressir/config.rb
 - lib/expressir/express/cache.rb
 - lib/expressir/express/error.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

data/lib/expressir/express/express_remarks_decorator.rb

@@ -1,54 +0,0 @@
-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["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
-    end
-  end
-end