beachio-hammer 0.1.0.pre2 → 0.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 341e9e0b4490d2d81d9bde191b50a864433452053f9045abf61ce6bf4ef8b8b4
-  data.tar.gz: 68c2e73b72fef89934937920211fdb35ccdb224d6e02c4ccf75b993e43aa1d9e
+  metadata.gz: 3470eba02cbe963f2f12e5b4d9cc94c2cb7d2b770ada0e7ca90de6c3a57e74a8
+  data.tar.gz: 336084edab3f5528a9dc6171b8b5fb363e1e6d05ab456d10fb15905583752b2e
 SHA512:
-  metadata.gz: 6ddf7826fd3a196ab07e5678a3735d3f9aeb236174f6c3deba61fc3c0594174eae7314ded5585aeb8a84c95de6bf35c741f71746106ff61920fe677166dae312
-  data.tar.gz: 8c13c6e4cbc8c6c36453bdc0c3d0f393182d42e3521d310bf6771ffbdc4ce91e507dda1709521f61ca8caa9cf35537015db220a654374c659fc0b0ff6ef37435
+  metadata.gz: 2dd5e1d16f62a38b7bde783e30313ef54d10c17dd001abbcd1a9ddf374f1255dac772f7f312a0312c28d44da1c8d781dd312d1b915ebe4af95f7a7a22bebd41d
+  data.tar.gz: 49089ebfa731d5c58a7f5d91634cf726eb44c320c7dc84782fcf374b4ef9a4eec97745533cb962c8c3ef2f6fbbf7be575b170f8b63c32fa9a548dc55b1bf4970

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    beachio-hammer (0.1.0.pre2)
+    beachio-hammer (0.1.0.pre4)
       json (~> 2.7)
 
 GEM

data/PUBLISH.md

@@ -38,7 +38,17 @@ gem build beachio-hammer.gemspec
 gem push beachio-hammer-*.gem
 ```
 
-Prerelease pin for executor team: **`beachio-hammer` `0.1.0.pre2`**
+Prerelease pin for executor team: **`beachio-hammer` `0.1.0.pre4`**
+
+### 0.1.0.pre4 changes (filename digit corruption)
+
+- Fix `@path` URL encoding: stop using `tr("%20", " ")` which mangled filenames containing `2` (e.g. `forge-2.jpg` → `forge-%20.jpg`)
+
+### 0.1.0.pre3 changes (nested @path resolution)
+
+- Resolve `@path` using full path segments (not basename only)
+- Resolve directory paths via `index.html` lookup
+- Always emit context-aware relative URLs (Swift parity)
 
 ### 0.1.0.pre2 changes (Beachio / Linux fixes)
 
@@ -52,7 +62,7 @@ Prerelease pin for executor team: **`beachio-hammer` `0.1.0.pre2`**
 Pin the published gem version in the executor Dockerfile:
 
 ```dockerfile
-RUN gem install beachio-hammer -v 0.1.0.pre2
+RUN gem install beachio-hammer -v 0.1.0.pre4
 ```
 
 Build step in the agent:

data/lib/hammer/tag_parser.rb

@@ -349,34 +349,57 @@ module Hammer
           ref = get_variable(ref[1..]) || ref
         end
 
-        if ref == "/"
-          generate_context_aware_path(".")
-        else
-          preserve_slash = ref.end_with?("/")
-          filename = preserve_slash ? ref.chomp("/") : ref
-          paths, error = find_file(File.basename(filename))
-          raise TagError, error if error
-
-          if paths.empty?
-            @delegate&.warning(@current_file_path, "File not found: #{ref}")
-            ref
-          else
-            path = paths.first
-            path = "#{path}/" if preserve_slash
-            generate_context_aware_path(path).gsub("%20", " ").gsub(" ", "%20")
-          end
-        end
+        resolve_path_reference(ref)
       end
     end
 
+    def resolve_path_reference(ref)
+      if ref == "/"
+        return root_relative_path
+      end
+
+      preserve_slash = ref.end_with?("/")
+      search_path = preserve_slash ? ref.chomp("/") : ref
+      paths, error = find_file(search_path)
+      raise TagError, error if error
+
+      if preserve_slash && paths.empty?
+        index_path = "#{search_path}/index.html"
+        index_paths, index_error = find_file(index_path)
+        raise TagError, index_error if index_error
+
+        paths = [search_path] unless index_paths.empty?
+      end
+
+      relative_path = paths.first || search_path
+      relative_path = relative_path.gsub(" ", "%20")
+      relative_path = "#{relative_path}/" if preserve_slash && !relative_path.end_with?("/")
+
+      @delegate&.warning(@current_file_path, "File not found: #{ref}") if paths.empty?
+
+      generate_context_aware_path(relative_path, preserve_trailing_slash: preserve_slash)
+    end
+
+    def root_relative_path
+      return "./" unless @current_file_path
+
+      current_dir = current_directory_components
+      return "./" if current_dir.empty?
+
+      "#{"../" * current_dir.length}"
+    end
+
     def find_file(filename)
       found = []
+      direct_path = File.join(@source_directory, filename)
+      found << filename if File.file?(direct_path)
+
       dirs = %w[assets/img assets/images assets/media images img media]
       dirs.each do |dir|
         path = "#{dir}/#{filename}"
         found << path if File.file?(File.join(@source_directory, path))
       end
-      found << filename if File.file?(File.join(@source_directory, filename))
+      found.uniq!
 
       if found.empty? || found.length > 1
         Dir.glob(File.join(@source_directory, "**", "*")).each do |f|
@@ -384,7 +407,9 @@ module Hammer
           rel = f.delete_prefix("#{@source_directory}/")
           next if skip_scan_path?(rel)
 
-          found << rel if File.basename(f) == filename && !found.include?(rel)
+          if rel == filename || File.basename(f) == filename
+            found << rel unless found.include?(rel)
+          end
         end
       end
 
@@ -394,26 +419,37 @@ module Hammer
       [found, nil]
     end
 
-    def generate_context_aware_path(file_path)
+    def current_directory_components
+      @current_file_path.split("/")[0...-1].reject { |part| part == "." || part.empty? }
+    end
+
+    def generate_context_aware_path(file_path, preserve_trailing_slash: file_path.end_with?("/"))
       return "./#{file_path}" unless @current_file_path
 
-      path_for_processing = file_path.end_with?("/") ? file_path.chomp("/") : file_path
-      current_dir = File.dirname(@current_file_path).split("/").reject { |p| p == "." }
+      path_for_processing = preserve_trailing_slash ? file_path.chomp("/") : file_path
+      current_dir = current_directory_components
       target_parts = path_for_processing.split("/")
       common = 0
       common += 1 while common < current_dir.length && common < target_parts.length && current_dir[common] == target_parts[common]
 
-      levels_up = current_dir.length - common
-      remaining = target_parts[common..]
-      parts = ([".."] * levels_up) + remaining
-
-      if parts.empty?
-        "./#{target_parts.last}"
-      elsif levels_up.zero? && remaining.length == 1
-        "./#{remaining[0]}"
+      if current_dir == target_parts
+        result = "./"
       else
-        parts.join("/")
-      end.tap { |r| r << "/" if file_path.end_with?("/") && !r.end_with?("/") }
+        levels_up = current_dir.length - common
+        remaining = target_parts[common..]
+        parts = ([".."] * levels_up) + remaining
+
+        result = if parts.empty?
+                   "./#{target_parts.last}"
+                 elsif levels_up.zero? && remaining.length == 1
+                   "./#{remaining[0]}"
+                 else
+                   parts.join("/")
+                 end
+      end
+
+      result << "/" if preserve_trailing_slash && !result.end_with?("/")
+      result
     end
 
     def process_navigation_helpers(content)

data/lib/hammer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hammer
-  VERSION = "0.1.0.pre2"
+  VERSION = "0.1.0.pre4"
 end

data/spec/path_resolution_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Hammer::TagParser do
+  let(:source_directory) { File.expand_path("../../Test Projects/classic-fixture", __dir__) }
+  let(:parser) { described_class.new(source_directory: source_directory) }
+
+  it "resolves nested @path references relative to the output page" do
+    parser.current_file_path = "work/mixfit/index.html"
+    content = '<a href="<!-- @path products/gleo/ -->">'
+
+    result = parser.send(:parse, content)
+
+    expect(result).to include('href="../../products/gleo/"')
+  end
+
+  it "resolves root @path references from nested pages" do
+    parser.current_file_path = "work/mixfit/index.html"
+    content = '<a href="<!-- @path / -->">'
+
+    result = parser.send(:parse, content)
+
+    expect(result).to include('href="../../"')
+  end
+
+  it "does not corrupt digits in image filenames when resolving @path" do
+    parser.current_file_path = "products/forge/index.html"
+    content = '<img src="<!-- @path assets/images/products/forge-2.jpg -->" />'
+
+    result = parser.send(:parse, content)
+
+    expect(result).to include('src="../../assets/images/products/forge-2.jpg"')
+    expect(result).not_to include("forge-%20.jpg")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beachio-hammer
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre2
+  version: 0.1.0.pre4
 platform: ruby
 authors:
 - Beach.io
@@ -80,6 +80,7 @@ files:
 - spec/encoding_spec.rb
 - spec/parity/classic_spec.rb
 - spec/parity/content_spec.rb
+- spec/path_resolution_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/beachio/hammer-swift
 licenses: