bade 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0e26e77d2d1be1c0ef31a906d025a3f13417be44f0f7377e0228a2a38b25cc9
-  data.tar.gz: d9a9b30ef8235cef2f15491b739b61afacc8b4b015d22154434fb3debc6bbacb
+  metadata.gz: 634cad9ad0535b4b49969984f50f300837fef21b3d98558e0dfa0321bef70481
+  data.tar.gz: 242c463186adbb17102be57c0bf0071341e40f75b639135fced349d2a31f0210
 SHA512:
-  metadata.gz: 80c968d59631db457a0e2ce7d81fb87da9a2ac66436bb64b4b78a099f3e30ff192fadc2a289b35eec1ea0af254975a936ca39bd1e59becf560a05246713b706e
-  data.tar.gz: 72f4888f35b356454dc49653c30a87fd79fb4e25c014414728e4eb3d7ec4f202b885b7c98371df517b841c5538ff2617367a73b698780ef0a762c3b722c25f09
+  metadata.gz: 5d2c6b50741926cf20cdb4c1243cf95c75c445b6d4b0d3992b2f0d467133b2c33e0f058269840b51af94390fba3c7ac4e8b3ea17cff0be1ba088b410f97de3e6
+  data.tar.gz: a431f9a0f4c4d087c7e8038d9065c954b135418107de2b0b8796657427e1d550a5d1b72830641dc859027373bbb44d0c725194af93d76d30f65a6606c8abf937

data/lib/bade/generator.rb

@@ -14,7 +14,7 @@ module Bade
 
     DEFAULT_BLOCK_NAME = 'default_block'.freeze
 
-    REQUIRE_RELATIVE_REGEX = /require_relative\s+['"](.+)['"]/
+    REQUIRE_RELATIVE_REGEX = /require_relative\s+(['"])(.+)['"]/
 
     # @param [Document] document
     #
@@ -435,12 +435,19 @@ module Bade
     #
     def _fix_required_relative(text)
       text.gsub(REQUIRE_RELATIVE_REGEX) do
-        relative_path = Regexp.last_match[1]
-        abs_path = File.expand_path(relative_path, File.dirname(@documents.last.file_path))
-        document_abs_path = Pathname.new(File.expand_path(File.dirname(@documents.first.file_path)))
-        new_relative_path = Pathname.new(abs_path).relative_path_from(document_abs_path).to_s
+        quote = Regexp.last_match[1]
+        relative_path = Regexp.last_match[2]
 
-        "require_relative '#{new_relative_path}'"
+        should_not_process = quote === '"' && relative_path.include?('#{')
+
+        new_relative_path = relative_path
+        unless should_not_process
+          abs_path = File.expand_path(relative_path, File.dirname(@documents.last.file_path))
+          document_abs_path = Pathname.new(File.expand_path(File.dirname(@documents.first.file_path)))
+          new_relative_path = Pathname.new(abs_path).relative_path_from(document_abs_path).to_s
+        end
+
+        "require_relative #{quote}#{new_relative_path}#{quote}"
       end
     end
   end

data/lib/bade/runtime/render_binding.rb

@@ -100,7 +100,6 @@ module Bade
           # rubocop:enable Security/Eval
         else
           context_path = caller_locations(1, 1).first.path
-          puts "context_path: #{context_path}"
 
           abs_path = File.expand_path(filename, File.dirname(context_path))
 

data/lib/bade/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bade
-  VERSION = '0.3.6'.freeze
+  VERSION = '0.3.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Minimalistic template engine for Ruby.