beachio-hammer 0.1.0.pre1 → 0.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fbc6c05d882741fa94434691763470a2a8ae5cec91713e0b0fb9e4e0cd25bca
-  data.tar.gz: 22394aa9fae0d7b44a53d511a94a7a02a052c6cab1af769f51601e4c55adf166
+  metadata.gz: 9ff203a27e8f29525a3120a073279ab2e8578f9d60a49a7f1c62c7ebf1a59253
+  data.tar.gz: e706eaee172b73d6abf8c14f7d936adb48144b2c4b2fc8ebdbf44fcfb9952f81
 SHA512:
-  metadata.gz: 8703bd2e45433905cdd2d503d70e7179d5aed28c35a6f2c32f1418dafd4267c80bd0cb6162531c18c61b0a426bd2f5a7f7d9d361a68f8caed04c414f375d9071
-  data.tar.gz: 62021958be80b18b3bd59059dc339399ca80650d1d9ea0e07d4f908093fb21f0ac8a95981d848f9495bd556ce3718e63e799186f21a28881d985c0f686d2b292
+  metadata.gz: 47a316f9de1c74ec4c16881c2663ab8aa172256264fe6e7aa66aa84d95f7d26a8082bdf521bc998bcb26f5e8bc621b8b05c6301034ead326e2dbb8271e292185
+  data.tar.gz: 3c5cbc689cb680d0e3adf630adfc2add3f13285aebdd2f6dae258ea83deff4a7364dfe609ac816e638dab2b732ab2cf63404b9effe1d5424afb8ac182e7e35d0

data/Gemfile.lock

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

data/PUBLISH.md

@@ -10,8 +10,21 @@ bundle exec rspec
 
 ## Capture golden Build/ trees (macOS Swift CLI)
 
+From repo root:
+
+```bash
+./gem/scripts/capture-goldens.sh
+```
+
+Or manually:
+
 ```bash
-./scripts/capture-goldens.sh
+xcodebuild -project Hammer-Swift.xcodeproj -scheme hammer-cli -configuration Release -derivedDataPath ./build-derived build
+./build-derived/Build/Products/Release/hammer build \
+  --project "Test Projects/classic-fixture" --mode export --clean --quiet
+./build-derived/Build/Products/Release/hammer build \
+  --project "Test Projects/content-generation-test" --mode export --clean --quiet
+git add -f "Test Projects/classic-fixture/Build" "Test Projects/content-generation-test/Build"
 ```
 
 ## Publish to RubyGems
@@ -25,10 +38,63 @@ gem build beachio-hammer.gemspec
 gem push beachio-hammer-*.gem
 ```
 
+Prerelease pin for executor team: **`beachio-hammer` `0.1.0.pre3`**
+
+### 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)
+
+- Force UTF-8 text reads (`Hammer.read_text`) — fixes `invalid byte sequence in US-ASCII` on Render
+- `require "date"` for content pipeline
+- `find_file` skips directories (Swift parity)
+- `resolve_output_path` returns empty when collection has no output pattern
+
 ## hammer-cloud integration
 
 Pin the published gem version in the executor Dockerfile:
 
 ```dockerfile
-RUN gem install beachio-hammer -v 0.1.0.pre1
+RUN gem install beachio-hammer -v 0.1.0.pre3
 ```
+
+Build step in the agent:
+
+```bash
+hammer build --project "$WORKSPACE" --mode export --format json --clean
+```
+
+### CLI contract
+
+| Flag | Default | Notes |
+|------|---------|-------|
+| `--project` | cwd (walk-up for markers) | Project root |
+| `--output` | `<project>/Build` | Output directory |
+| `--mode` | `export` | `normal`, `export`, `publish` |
+| `--format` | `human` | `json` for agent parsing |
+| `--clean` | off | Wipes Build/ before compile |
+
+**Exit codes:** `0` success, `1` build errors, `2` config error, `3` internal.
+
+**JSON stdout** (`--format json`):
+
+```json
+{
+  "status": "success",
+  "stats": { "filesProcessed", "errors", "warnings", "durationMs", "buildSize" },
+  "errors": [{ "file", "message" }],
+  "warnings": [{ "file", "message" }]
+}
+```
+
+### Parity fixtures
+
+| Fixture | Path | Files |
+|---------|------|-------|
+| Classic | `Test Projects/classic-fixture` | 9 |
+| Content | `Test Projects/content-generation-test` | 13 |
+
+CI: `.github/workflows/gem-parity.yml` — macOS re-exports goldens, Linux runs `bundle exec rspec`.

data/exe/hammer

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 require "beachio-hammer"
 
 exit Hammer::CLI.run(ARGV)

data/lib/beachio-hammer.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
+require "date"
+require "time"
+
 require_relative "hammer/version"
+require_relative "hammer/io"
 require_relative "hammer/errors"
 require_relative "hammer/ignore"
 require_relative "hammer/tag_parser"

data/lib/hammer/builder.rb

@@ -134,7 +134,7 @@ module Hammer
 
       case ext
       when ".html"
-        content = File.read(src)
+        content = Hammer.read_text(src)
         if !@content_collections.empty? && content.include?("@loop") && content.include?("collections.")
           content = Content::PageGenerator.pre_process_collection_loops(
             content,
@@ -148,7 +148,7 @@ module Hammer
         FileUtils.mkdir_p(File.dirname(dest))
         File.write(dest, processed)
       when ".css"
-        processed = css_parser.parse(File.read(src), relative_path: rel)
+        processed = css_parser.parse(Hammer.read_text(src), relative_path: rel)
         FileUtils.mkdir_p(File.dirname(dest))
         File.write(dest, processed)
       else

data/lib/hammer/content/config.rb

@@ -45,7 +45,7 @@ module Hammer
       end
 
       def self.load(path)
-        data = JSON.parse(File.read(path))
+        data = JSON.parse(Hammer.read_text(path))
         collections = data.fetch("collections", {}).transform_values { |c| CollectionConfig.from_hash(c) }
         new(collections: collections, site_url: data["siteUrl"])
       end

data/lib/hammer/content/document.rb

@@ -28,7 +28,7 @@ module Hammer
 
       def date
         val = metadata["date"]
-        return val if val.is_a?(Time) || val.is_a?(Date)
+        return val if val.is_a?(Time) || val.is_a?(::Date)
 
         self.class.parse_date(val.to_s) if val
       end
@@ -83,7 +83,7 @@ module Hammer
           value.map { |v| serialize_value(v) }
         when Hash
           value.transform_values { |v| serialize_value(v) }
-        when Time, Date
+        when Time, ::Date
           value.utc.iso8601(3)
         else
           value

data/lib/hammer/content/expression_evaluator.rb

@@ -97,7 +97,7 @@ module Hammer
         when String then value
         when TrueClass, FalseClass then value.to_s
         when Numeric then value.to_s
-        when Time, Date then value.to_s
+        when Time, ::Date then value.to_s
         when Document then value.slug
         else value.to_s
         end

data/lib/hammer/content/helpers.rb

@@ -33,7 +33,7 @@ module Hammer
         format = "medium" if format.empty? || format == "null"
 
         time = case date_val
-               when Time, Date then date_val.to_time
+               when Time, ::Date then date_val.to_time
                when String then Document.parse_date(date_val)
                else nil
                end

data/lib/hammer/content/page_generator.rb

@@ -59,6 +59,8 @@ module Hammer
 
       def resolve_output_path(doc, collection_config)
         pattern = collection_config.output_path_pattern
+        return "" if pattern.nil? || pattern.empty?
+
         slug_field = collection_config.slug&.dig("field") || "slug"
         slug = resolve_slug(doc, collection_config.slug)
         interpolate_output_path(pattern, slug, slug_field)
@@ -88,7 +90,7 @@ module Hammer
       end
 
       def generate_page(template_path, doc, output_path)
-        template = File.read(template_path)
+        template = Hammer.read_text(template_path)
         site = { "title" => "My Site" }
         context = TemplateContext.new(
           site: site,

data/lib/hammer/content/parser.rb

@@ -8,7 +8,7 @@ module Hammer
       end
 
       def parse_markdown_file(path)
-        content = File.read(path)
+        content = Hammer.read_text(path)
         metadata, body = extract_front_matter(content)
         html_body = parse_markdown_body(body)
         collection = extract_collection(path)
@@ -22,7 +22,7 @@ module Hammer
       end
 
       def parse_yaml_file(path)
-        metadata = parse_simple_yaml(File.read(path))
+        metadata = parse_simple_yaml(Hammer.read_text(path))
         Document.new(
           file_path: path,
           metadata: metadata,

data/lib/hammer/css_parser.rb

@@ -35,7 +35,7 @@ module Hammer
         end
 
         @processed_includes << include_path
-        included = File.read(File.join(@source_directory, include_path))
+        included = Hammer.read_text(File.join(@source_directory, include_path))
         result.sub!(match[0], "\n#{process_includes(included)}\n")
       end
 

data/lib/hammer/ignore.rb

@@ -13,7 +13,7 @@ module Hammer
       path = File.join(source_dir, ".hammer-ignore")
       return [] unless File.file?(path)
 
-      File.read(path, encoding: "UTF-8").each_line.map(&:strip).reject do |line|
+      Hammer.read_text(path).each_line.map(&:strip).reject do |line|
         line.empty? || line.start_with?("#")
       end
     end

data/lib/hammer/io.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Hammer
+  module_function
+
+  def read_text(path)
+    File.binread(path).force_encoding(Encoding::UTF_8)
+  end
+end

data/lib/hammer/sitemap_generator.rb

@@ -54,7 +54,7 @@ module Hammer
       path = File.join(@build_directory, "sitemap.xml")
       return [] unless File.file?(path)
 
-      File.read(path).scan(%r{<loc>([^<]+)</loc>}).flatten
+      Hammer.read_text(path).scan(%r{<loc>([^<]+)</loc>}).flatten
     end
 
     def generate_xml(pages)

data/lib/hammer/tag_parser.rb

@@ -25,7 +25,7 @@ module Hammer
 
     def process_file(relative_path, output_path_for_styling: nil)
       @current_file_path = output_path_for_styling || relative_path
-      content = File.read(File.join(@source_directory, relative_path))
+      content = Hammer.read_text(File.join(@source_directory, relative_path))
       process_file_content(content, relative_path, output_path_for_styling)
     end
 
@@ -167,7 +167,7 @@ module Hammer
         end
 
         @processed_includes << path
-        included = File.read(File.join(@source_directory, path))
+        included = Hammer.read_text(File.join(@source_directory, path))
         child = self.class.new(
           source_directory: @source_directory,
           parent_variables: @parent_variables.merge(@variables),
@@ -349,34 +349,58 @@ 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).tr(" ", "%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)
+        .tr("%20", " ")
+        .gsub(" ", "%20")
+    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.exist?(File.join(@source_directory, path))
+        found << path if File.file?(File.join(@source_directory, path))
       end
-      found << filename if File.exist?(File.join(@source_directory, filename))
+      found.uniq!
 
       if found.empty? || found.length > 1
         Dir.glob(File.join(@source_directory, "**", "*")).each do |f|
@@ -384,7 +408,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 +420,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.pre1"
+  VERSION = "0.1.0.pre3"
 end

data/spec/encoding_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "tmpdir"
+
+RSpec.describe "UTF-8 file reads under US-ASCII locale" do
+  it "reads smart quotes without raising" do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, "sample.html")
+      File.binwrite(path, "<p>It\u2019s working \u2014 really.</p>".encode("UTF-8"))
+
+      previous_external = Encoding.default_external
+      previous_internal = Encoding.default_internal
+      Encoding.default_external = Encoding::US_ASCII
+      Encoding.default_internal = Encoding::US_ASCII
+
+      expect { Hammer.read_text(path) }.not_to raise_error
+      expect(Hammer.read_text(path)).to include("really")
+
+      Encoding.default_external = previous_external
+      Encoding.default_internal = previous_internal
+    end
+  end
+end

data/spec/path_resolution_spec.rb

@@ -0,0 +1,26 @@
+# 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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beachio-hammer
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre1
+  version: 0.1.0.pre3
 platform: ruby
 authors:
 - Beach.io
@@ -67,6 +67,7 @@ files:
 - lib/hammer/css_parser.rb
 - lib/hammer/errors.rb
 - lib/hammer/ignore.rb
+- lib/hammer/io.rb
 - lib/hammer/output_formatter.rb
 - lib/hammer/project_resolver.rb
 - lib/hammer/sitemap_generator.rb
@@ -76,8 +77,10 @@ files:
 - scripts/test-classic.rb
 - scripts/test-content.rb
 - scripts/tree-diff.rb
+- 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: