bade 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a481b2a1a19745d8660df10476ca85cfa6687a47115cf7f964d40c63dd36327e
-  data.tar.gz: 5996a6dd699189cc5059619558524a65c892a751ffbedeb3fd09cdf41e7d8b18
+  metadata.gz: 73d88fecdae76de6653aa57c44576f3ce21bee35ac62eb242a8b57780e5a68af
+  data.tar.gz: 25d7ff84bb953fbd393c0fa2831f768a27e6d6487547c7551e750758170aefee
 SHA512:
-  metadata.gz: 0675d10d28933ee600d2530a3ae863cdfe53bae8632c6eb92e59e49a37fddc7eb3a6b62b6f492d88734597e988c0361d5f0b1f4b68d069e7e55789d061d55ed2
-  data.tar.gz: 149cb3709994965d70e3552b7f548b0c04d39610176379ed09b8ff21d6c2444d26546fceca0976c813cb86f997c174343cb418a480697551058b20dd7c1b2ede
+  metadata.gz: 7d03cef22b6ed6fcb6beeb8fbb19c5e0b0ff164f063083e78c7d5e92da5c7777c98b94e32fab62fc12a0bf3326c607e3d127901b18ec3ae502546d39052a5076
+  data.tar.gz: aa449b5351d9adb774b9ed101e1063cbe76bacf4ea82f2718a78547cbc69945ab640bc9c5d6c7044c9bb741eb519075416710aabfab6f197826ca2c28fc01f1d

data/Bade.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'psych', '>= 2.2', '< 5.0'
+  spec.add_dependency 'psych', '>= 2.2', '< 6.0'
 
-  spec.add_development_dependency 'fakefs', '~> 1.3'
+  spec.add_development_dependency 'fakefs', '>= 1.4', '< 3.0'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rubocop', '~> 1.14'
 end

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
@@ -19,7 +19,7 @@ dependencies:
         version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,27 @@ dependencies:
         version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +140,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.