bade 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a51d23b5cdbf2a6555552edd39164fc3b39b99f381cf454872cce827d5cae77
-  data.tar.gz: b7a98aaee99316d20f22d45c36430d8ba1c785e9d316615343bbb539e86c8891
+  metadata.gz: f0e26e77d2d1be1c0ef31a906d025a3f13417be44f0f7377e0228a2a38b25cc9
+  data.tar.gz: d9a9b30ef8235cef2f15491b739b61afacc8b4b015d22154434fb3debc6bbacb
 SHA512:
-  metadata.gz: 83a93a132f7b957b6d5cd18b4a83c955fa4cd5c68a68d057fa1fec9643ca1c4b2a965c56f7692a0ee3760fafb4732817697d44ca76d35fefdf421204565fe8c0
-  data.tar.gz: d59fc4be093b3a2f40f0999e3718f2a0f7bed68956860163cc6920b1cb2afb46459ef155af63fdb8496b9b772055e1d8ffdb956dba173347ab531bb7ca002705
+  metadata.gz: 80c968d59631db457a0e2ce7d81fb87da9a2ac66436bb64b4b78a099f3e30ff192fadc2a289b35eec1ea0af254975a936ca39bd1e59becf560a05246713b706e
+  data.tar.gz: 72f4888f35b356454dc49653c30a87fd79fb4e25c014414728e4eb3d7ec4f202b885b7c98371df517b841c5538ff2617367a73b698780ef0a762c3b722c25f09

data/lib/bade/generator.rb

@@ -14,6 +14,8 @@ module Bade
 
     DEFAULT_BLOCK_NAME = 'default_block'.freeze
 
+    REQUIRE_RELATIVE_REGEX = /require_relative\s+['"](.+)['"]/
+
     # @param [Document] document
     #
     # @return [String]
@@ -28,7 +30,7 @@ module Bade
     # @return [String] string to parse with Ruby
     #
     def generate_lambda_string(document, optimize: false)
-      @document = document
+      @documents = []
       @buff = []
       @indent = 0
       @code_indent = 0
@@ -52,9 +54,6 @@ module Bade
 
       buff_code 'end'
 
-
-      @document = nil
-
       @buff.join("\n")
     end
 
@@ -76,12 +75,16 @@ module Bade
     end
 
     def buff_code(text)
+      text = _fix_required_relative(text)
+
       @buff << "#{'  ' * @code_indent}#{text}"
     end
 
     # @param document [Bade::Document]
     #
     def visit_document(document)
+      @documents.append(document)
+
       document.sub_documents.each do |sub_document|
         visit_document(sub_document)
       end
@@ -97,6 +100,8 @@ module Bade
       visit_node(new_root)
 
       buff_code("# ----- end file #{document.file_path}") unless document.file_path.nil?
+
+      @documents.pop
     end
 
     # @param current_node [Node]
@@ -162,7 +167,7 @@ module Bade
       when :newline
         # no-op
       when :import
-        base_path = File.expand_path(current_node.value, File.dirname(@document.file_path))
+        base_path = File.expand_path(current_node.value, File.dirname(@documents.last.file_path))
         load_path = if base_path.end_with?('.rb') && File.exist?(base_path)
                       base_path
                     elsif File.exist?("#{base_path}.rb")
@@ -381,7 +386,7 @@ module Bade
                     when :code
                       value = node.value.strip
 
-                      %w[end else }].include?(value) || value.match(/^(when|elsif) /)
+                      %w[end else }].include?(value) || value.match(/^(when|elsif) /) || value.match(/^\./)
                     when :newline
                       true
                     else
@@ -422,6 +427,22 @@ module Bade
 
       location(filename: node.filename, lineno: node.lineno, label: label)
     end
+
+    # Fix require_relative paths to be relative to the main Bade file (instead of the current file)
+    #
+    # @param [String] text
+    # @return [String]
+    #
+    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
+
+        "require_relative '#{new_relative_path}'"
+      end
+    end
   end
 
   # backward compatibility

data/lib/bade/runtime/globals_tracker.rb

@@ -94,6 +94,7 @@ module Bade
           next true if location.nil?
 
           path = location.first
+          next false if path == false
           next false if $LOADED_FEATURES.include?(path)
 
           next true if constants_location_prefixes.nil?

data/lib/bade/runtime/render_binding.rb

@@ -99,7 +99,12 @@ module Bade
           eval(File.read(filename), __get_binding, filename)
           # rubocop:enable Security/Eval
         else
-          Kernel.require_relative(filename)
+          context_path = caller_locations(1, 1).first.path
+          puts "context_path: #{context_path}"
+
+          abs_path = File.expand_path(filename, File.dirname(context_path))
+
+          Kernel.require(abs_path)
         end
       end
 

data/lib/bade/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2023-10-15 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.3.10
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Minimalistic template engine for Ruby.