scriptorium 0.6.1 → 0.7.2

data/test/banner_svg/unit.rb

@@ -28,7 +28,7 @@ class BannerSVGTest < Minitest::Test
 
   def teardown
     # Clean up any test files if needed
-    File.delete("config.txt") if File.exist?("config.txt")
+    File.delete("svg.txt") if File.exist?("svg.txt")
   end
 
   # Test handle_style method
@@ -124,7 +124,7 @@ class BannerSVGTest < Minitest::Test
 
   def test_016_handle_xy_unknown_which
     # Should raise an error for invalid "which" value
-    assert_raises(CannotHandleXYInvalidWhich) do
+    assert_raises(XYInvalidWhich) do
       @banner.handle_xy("unknown", "30%", "40%")
     end
   end
@@ -183,7 +183,7 @@ class BannerSVGTest < Minitest::Test
 
   def test_025_parse_header_svg_with_gradient
     # Create a temporary config file with gradient
-    File.write("config.txt", "back.linear red blue lr")
+    File.write("svg.txt", "back.linear red blue lr")
     
     @banner.parse_header_svg
     
@@ -192,12 +192,12 @@ class BannerSVGTest < Minitest::Test
     assert_equal "lr", @banner.instance_variable_get(:@gradient_direction)
     
     # Clean up
-    File.delete("config.txt") if File.exist?("config.txt")
+    File.delete("svg.txt") if File.exist?("svg.txt")
   end
 
   def test_026_parse_header_svg_without_gradient
     # Create a temporary config file without gradient
-    File.write("config.txt", "back.color #fff")
+    File.write("svg.txt", "back.color #fff")
     
     @banner.parse_header_svg
     
@@ -207,7 +207,7 @@ class BannerSVGTest < Minitest::Test
     assert_equal "#fff", @banner.instance_variable_get(:@background)
     
     # Clean up
-    File.delete("config.txt") if File.exist?("config.txt")
+    File.delete("svg.txt") if File.exist?("svg.txt")
   end
 
   # Test radial gradient functionality
@@ -225,7 +225,7 @@ class BannerSVGTest < Minitest::Test
 
   def test_029_parse_header_svg_with_radial_gradient
     # Create a temporary config file with radial gradient
-    File.write("config.txt", "back.radial red blue")
+    File.write("svg.txt", "back.radial red blue")
     
     @banner.parse_header_svg
     
@@ -233,12 +233,12 @@ class BannerSVGTest < Minitest::Test
     assert_equal "blue", @banner.instance_variable_get(:@radial_end_color)
     
     # Clean up
-    File.delete("config.txt") if File.exist?("config.txt")
+    File.delete("svg.txt") if File.exist?("svg.txt")
   end
 
   def test_030_radial_gradient_priority_over_linear
     # Create a temporary config file with both gradients
-    File.write("config.txt", "back.linear green yellow lr\nback.radial red blue")
+    File.write("svg.txt", "back.linear green yellow lr\nback.radial red blue")
     
     @banner.parse_header_svg
     
@@ -251,7 +251,7 @@ class BannerSVGTest < Minitest::Test
     assert_equal "yellow", @banner.instance_variable_get(:@gradient_end_color)
     
     # Clean up
-    File.delete("config.txt") if File.exist?("config.txt")
+    File.delete("svg.txt") if File.exist?("svg.txt")
   end
 
   # Test image background functionality
@@ -267,19 +267,19 @@ class BannerSVGTest < Minitest::Test
 
   def test_033_parse_header_svg_with_image_background
     # Create a temporary config file with image background
-    File.write("config.txt", "back.image background.jpg")
+    File.write("svg.txt", "back.image background.jpg")
     
     @banner.parse_header_svg
     
     assert_equal "background.jpg", @banner.instance_variable_get(:@image_background)
     
     # Clean up
-    File.delete("config.txt") if File.exist?("config.txt")
+    File.delete("svg.txt") if File.exist?("svg.txt")
   end
 
   def test_034_image_background_priority_over_all
     # Create a temporary config file with all background types
-    File.write("config.txt", "back.color #fff\nback.linear green yellow lr\nback.radial red blue\nback.image background.jpg")
+    File.write("svg.txt", "back.color #fff\nback.linear green yellow lr\nback.radial red blue\nback.image background.jpg")
     
     @banner.parse_header_svg
     
@@ -294,7 +294,7 @@ class BannerSVGTest < Minitest::Test
     assert_equal "blue", @banner.instance_variable_get(:@radial_end_color)
     
     # Clean up
-    File.delete("config.txt") if File.exist?("config.txt")
+    File.delete("svg.txt") if File.exist?("svg.txt")
   end
 
   # Test initialization
@@ -332,31 +332,31 @@ class BannerSVGTest < Minitest::Test
   end
 
   def test_037_read_commented_file_with_empty_file
-    File.write("config.txt", "")
-    result = @banner.read_commented_file("config.txt")
+    File.write("svg.txt", "")
+    result = @banner.read_commented_file("svg.txt")
     assert_equal [], result
   end
 
   def test_038_read_commented_file_with_comments_only
-    File.write("config.txt", "# This is a comment\n# Another comment\n  # Indented comment")
-    result = @banner.read_commented_file("config.txt")
+    File.write("svg.txt", "# This is a comment\n# Another comment\n  # Indented comment")
+    result = @banner.read_commented_file("svg.txt")
     assert_equal [], result
   end
 
   def test_039_read_commented_file_with_mixed_content
-    File.write("config.txt", "# Comment\nback.color #fff\n# Another comment\nback.linear red blue\n# End comment")
-    result = @banner.read_commented_file("config.txt")
+    File.write("svg.txt", "# Comment\nback.color #fff\n# Another comment\nback.linear red blue\n# End comment")
+    result = @banner.read_commented_file("svg.txt")
     assert_equal ["back.color #fff", "back.linear red blue"], result
   end
 
   def test_040_read_commented_file_with_trailing_comments
-    File.write("config.txt", "back.color #fff # This is a color\nback.linear red blue # Gradient")
-    result = @banner.read_commented_file("config.txt")
+    File.write("svg.txt", "back.color #fff # This is a color\nback.linear red blue # Gradient")
+    result = @banner.read_commented_file("svg.txt")
     assert_equal ["back.color #fff", "back.linear red blue"], result
   end
 
   def test_041_parse_header_svg_with_malformed_config_line
-    File.write("config.txt", "back.color\nback.linear\nback.radial")
+    File.write("svg.txt", "back.color\nback.linear\nback.radial")
     @banner.parse_header_svg
     # Should handle gracefully without raising exceptions
     # Malformed lines should be ignored, leaving default values
@@ -372,7 +372,7 @@ class BannerSVGTest < Minitest::Test
 
   def test_043_handle_aspect_with_invalid_numeric_values
     # Should raise an error for invalid numeric value
-    assert_raises(CannotHandleAspectInvalidValue) do
+    assert_raises(AspectInvalidValue) do
       @banner.handle_aspect("invalid")
     end
   end
@@ -455,13 +455,15 @@ class BannerSVGTest < Minitest::Test
   def test_052_svg_output_text_has_required_attributes
     svg_output = @banner.parse_header_svg
     
+
+    
     # Check text attributes
     # Note: assert_present is a nonstandard assertion from TestHelpers
     assert_present(svg_output, "text-anchor='start'")
     assert_present(svg_output, "fill='#374151'")
     assert_present(svg_output, 'font-family: Verdana')
-    assert_present(svg_output, 'font-size: 48px') # title
-    assert_present(svg_output, 'font-size: 24px') # subtitle
+    assert_present(svg_output, 'font-size: 48.0px') # title (base_font_size * 0.8)
+    assert_present(svg_output, 'font-size: 24.0px') # subtitle (base_font_size * 0.4)
   end
 
   def test_053_svg_output_with_linear_gradient
@@ -520,7 +522,7 @@ class BannerSVGTest < Minitest::Test
     @banner.handle_xy("subtitle", "15%", "25%")
     svg_output = @banner.parse_header_svg
     
-    # Check text positioning
+    # Check text positioning - coordinates are now in the SVG text elements
     assert_present(svg_output, "x='10%'")
     assert_present(svg_output, "y='20%'")
     assert_present(svg_output, "x='15%'")
@@ -576,7 +578,7 @@ class BannerSVGTest < Minitest::Test
       subtitle.xy 50% 70%
     CONFIG
     
-    File.write("config.txt", config_content)
+    File.write("svg.txt", config_content)
     @banner.parse_header_svg
     
     # Verify all settings were applied
@@ -605,7 +607,7 @@ class BannerSVGTest < Minitest::Test
   def test_061_end_to_end_workflow
     # Test complete workflow from config to final output
     config_content = "back.color #e0e0e0\ntext.color #000\ntitle.style bold\nsubtitle.xy 10% 80%"
-    File.write("config.txt", config_content)
+    File.write("svg.txt", config_content)
     
     # Parse config
     @banner.parse_header_svg
@@ -645,8 +647,8 @@ class BannerSVGTest < Minitest::Test
     # Check for JavaScript variables
     assert_present(js_output, 'const svgWidth = window.innerWidth')
     assert_present(js_output, 'const aspectRatio = 8.0')
-    assert_present(js_output, 'const titleScale = 0.8')
-    assert_present(js_output, 'const subtitleScale = 0.4')
+    assert_present(js_output, 'const titleFontSize = 0.8 * 60')
+    assert_present(js_output, 'const subtitleFontSize = 0.4 * 60')
   end
 
   def test_063_javascript_with_custom_settings
@@ -659,15 +661,15 @@ class BannerSVGTest < Minitest::Test
     
     # Check that custom values are interpolated into JavaScript
     assert_present(js_output, 'const aspectRatio = 4.0')
-    assert_present(js_output, 'const titleScale = 1.5')
-    assert_present(js_output, 'const subtitleScale = 0.6')
+    assert_present(js_output, 'const titleFontSize = 1.5 * 60')
+    assert_present(js_output, 'const subtitleFontSize = 0.6 * 60')
     assert_present(js_output, "fill='#ff0000'")
   end
 
   def test_064_background_priority_integration
     # Test that background priority works correctly in full workflow
     config_content = "back.color #fff\nback.linear red blue\nback.radial green yellow\nback.image bg.jpg"
-    File.write("config.txt", config_content)
+    File.write("svg.txt", config_content)
     
     @banner.parse_header_svg
     svg_output = @banner.parse_header_svg
@@ -718,7 +720,7 @@ class BannerSVGTest < Minitest::Test
     assert_equal "end", @banner.instance_variable_get(:@subtitle_text_anchor)
     
     # Should raise an error for invalid direction
-    assert_raises(CannotHandleAlignInvalidDirection) do
+    assert_raises(AlignInvalidDirection) do
       @banner.handle_text_align("invalid")
     end
   end
@@ -765,4 +767,234 @@ class BannerSVGTest < Minitest::Test
     assert_match(/Warning: title.align x=50% conflicts with title.xy x=5%/, captured)
   end
 
+  # ========================================
+  # Banner SVG Validation Error Tests
+  # ========================================
+
+  def test_072_banner_svg_validation_exceptions
+    # Test that exception classes exist
+    assert InvalidBackground
+    assert InvalidGradient
+    assert InvalidImage
+    assert InvalidFont
+    assert InvalidColor
+    assert InvalidAspect
+    assert InvalidAlign
+    assert InvalidXY
+  end
+
+  def test_073_background_validation_exceptions
+    # Test that exception classes exist
+    assert BackgroundNoArgs
+    assert BackgroundFirstArgNil
+    assert BackgroundFirstArgEmpty
+    
+    # Test actual exception raising
+    assert_raises(BackgroundNoArgs) do
+      @banner.handle_background
+    end
+    
+    assert_raises(BackgroundFirstArgNil) do
+      @banner.handle_background(nil)
+    end
+    
+    assert_raises(BackgroundFirstArgEmpty) do
+      @banner.handle_background("")
+    end
+  end
+
+  def test_074_gradient_validation_exceptions
+    # Test that exception classes exist
+    assert LinearGradientNoArgs
+    assert LinearGradientStartColorNil
+    assert LinearGradientArgEmpty
+    assert RadialGradientNoArgs
+    assert RadialGradientStartColorNil
+    assert RadialGradientArgEmpty
+    
+    # Test actual exception raising for linear gradient
+    assert_raises(LinearGradientNoArgs) do
+      @banner.handle_linear_gradient
+    end
+    
+    assert_raises(LinearGradientStartColorNil) do
+      @banner.handle_linear_gradient(nil, "blue")
+    end
+    
+    assert_raises(LinearGradientStartColorNil) do
+      @banner.handle_linear_gradient("", "blue")
+    end
+    
+    assert_raises(LinearGradientArgEmpty) do
+      @banner.handle_linear_gradient("red", "")
+    end
+    
+    # Test actual exception raising for radial gradient
+    assert_raises(RadialGradientNoArgs) do
+      @banner.handle_radial_gradient
+    end
+    
+    assert_raises(RadialGradientStartColorNil) do
+      @banner.handle_radial_gradient(nil, "yellow")
+    end
+    
+    assert_raises(RadialGradientStartColorNil) do
+      @banner.handle_radial_gradient("", "yellow")
+    end
+    
+    assert_raises(RadialGradientArgEmpty) do
+      @banner.handle_radial_gradient("green", "")
+    end
+  end
+
+  def test_075_image_background_validation_exceptions
+    # Test that exception classes exist
+    assert ImageBackgroundNoArgs
+    assert ImageBackgroundFirstArgNil
+    assert ImageBackgroundFirstArgEmpty
+    
+    # Test actual exception raising
+    assert_raises(ImageBackgroundNoArgs) do
+      @banner.handle_image_background
+    end
+    
+    assert_raises(ImageBackgroundFirstArgNil) do
+      @banner.handle_image_background(nil)
+    end
+    
+    assert_raises(ImageBackgroundFirstArgEmpty) do
+      @banner.handle_image_background("")
+    end
+  end
+
+  def test_076_aspect_validation_exceptions
+    # Test that exception classes exist
+    assert AspectNoArgs
+    assert AspectFirstArgNil
+    assert AspectFirstArgEmpty
+    assert AspectInvalidValue
+    
+    # Test actual exception raising
+    assert_raises(AspectNoArgs) do
+      @banner.handle_aspect
+    end
+    
+    assert_raises(AspectFirstArgNil) do
+      @banner.handle_aspect(nil)
+    end
+    
+    assert_raises(AspectFirstArgEmpty) do
+      @banner.handle_aspect("")
+    end
+    
+    assert_raises(AspectInvalidValue) do
+      @banner.handle_aspect("invalid")
+    end
+  end
+
+  def test_077_font_validation_exceptions
+    # Test that exception classes exist
+    assert FontArgsNil
+    assert FontArgNil
+    assert FontArgEmpty
+    
+    # Test actual exception raising
+    assert_raises(FontArgNil) do
+      @banner.handle_font(nil)
+    end
+    
+    assert_raises(FontArgNil) do
+      @banner.handle_font("Arial", nil)
+    end
+    
+    assert_raises(FontArgEmpty) do
+      @banner.handle_font("Arial", "")
+    end
+  end
+
+  def test_078_text_color_validation_exceptions
+    # Test that exception classes exist
+    assert TextColorNoArgs
+    assert TextColorFirstArgNil
+    assert TextColorFirstArgEmpty
+    
+    # Test actual exception raising
+    assert_raises(TextColorNoArgs) do
+      @banner.handle_text_color
+    end
+    
+    assert_raises(TextColorFirstArgNil) do
+      @banner.handle_text_color(nil)
+    end
+    
+    assert_raises(TextColorFirstArgEmpty) do
+      @banner.handle_text_color("")
+    end
+  end
+
+  def test_079_xy_validation_exceptions
+    # Test that exception classes exist
+    assert XYWhichNil
+    assert XYWhichEmpty
+    assert XYInvalidWhich
+    
+    # Test actual exception raising
+    assert_raises(XYWhichNil) do
+      @banner.handle_xy(nil, "5%", "70%")
+    end
+    
+    assert_raises(XYWhichEmpty) do
+      @banner.handle_xy("", "5%", "70%")
+    end
+    
+    assert_raises(XYInvalidWhich) do
+      @banner.handle_xy("invalid", "5%", "70%")
+    end
+  end
+
+  def test_080_align_validation_exceptions
+    # Test that exception classes exist
+    assert AlignNoArgs
+    assert AlignDirectionNil
+    assert AlignArgEmpty
+    assert AlignInvalidDirection
+    
+    # Test actual exception raising
+    assert_raises(AlignNoArgs) do
+      @banner.handle_text_align
+    end
+    
+    assert_raises(AlignDirectionNil) do
+      @banner.handle_text_align(nil)
+    end
+    
+    assert_raises(AlignDirectionNil) do
+      @banner.handle_text_align("")
+    end
+    
+    assert_raises(AlignInvalidDirection) do
+      @banner.handle_text_align("invalid")
+    end
+  end
+
+  def test_081_color_validation_exceptions
+    # Test that exception classes exist
+    assert ColorNoArgs
+    assert ColorFirstArgNil
+    assert ColorFirstArgEmpty
+    
+    # Test actual exception raising
+    assert_raises(ColorNoArgs) do
+      @banner.handle_title_color
+    end
+    
+    assert_raises(ColorFirstArgNil) do
+      @banner.handle_title_color(nil)
+    end
+    
+    assert_raises(ColorFirstArgEmpty) do
+      @banner.handle_title_color("")
+    end
+  end
+
 end 

data/test/config/deployment.txt

@@ -0,0 +1,5 @@
+user      blogtest
+server    gymnos.media
+docroot   /var/www/gymnos
+path      blogtest
+proto     https

data/test/integration/integration_test.rb

@@ -33,7 +33,7 @@ class IntegrationTest < Minitest::Test
     output = @sample_view.dir/:output/:panes/"header.html"
     assert File.exist?(output), "Expected header.html to exist"
     content = File.read(output)
-    assert_includes content, "<h1>", "Expected header content to include <h1>"
+    assert_includes_concise_string content, "<h1>", "Expected header content to include <h1>"
   end
 
   def test_002_posts_generated_and_indexed_across_multiple_views
@@ -63,7 +63,7 @@ class IntegrationTest < Minitest::Test
     posts_content = File.read(@repo.root/:views/"blog1"/:output/"index.html")
     posts = @repo.all_posts("blog1")
     posts.each do |post|
-      assert_includes posts_content, post.title
+      assert_includes_concise_string posts_content, post.title, "Post title should appear in index"
       month, day, year = post.pubdate_month_day_year
       assert_includes posts_content, month + " " + day
       assert_includes posts_content, year
@@ -95,9 +95,9 @@ class IntegrationTest < Minitest::Test
     @repo.all_posts("blog1").each do |post|
       next unless post.pubdate && post.title
       month, day, year = post.pubdate_month_day_year
-      assert_includes content, month + " " + day + "</div>", "Expected pubdate #{month} #{day} to appear"
-      assert_includes content, year + "</div>", "Expected year #{year} to appear"
-      assert_includes content, post.title,   "Expected title #{post.title} to appear"
+      assert_includes_concise_string content, month + " " + day + ",", "Expected pubdate #{month} #{day} to appear"
+      assert_includes_concise_string content, year + "</div>", "Expected year #{year} to appear"
+      assert_includes_concise_string content, post.title,   "Expected title #{post.title} to appear"
     end
   end
   
@@ -249,8 +249,8 @@ class IntegrationTest < Minitest::Test
     assert_present(index_html, *targets)
     assert_ordered(index_html, *targets)
     FileUtils.cp(index_file, "/tmp/testcms1.html")
-    post_div = %[class="index-entry"]
-    num_posts = index_html.scan(/#{Regexp.escape(post_div)}/).length
+    post_links = %[onclick="load_main]
+    num_posts = index_html.scan(/#{Regexp.escape(post_links)}/).length
     assert_equal 7, num_posts, "Expected 7 posts, found #{num_posts}"
   end
 

data/test/integration/preview_flow_test.rb

@@ -0,0 +1,94 @@
+require 'minitest/autorun'
+require_relative '../../lib/scriptorium'
+require_relative '../test_helpers'
+require 'fileutils'
+require_relative '../support/preview_utils'
+
+class PreviewFlowTest < Minitest::Test
+  include TestHelpers
+
+  def setup
+    @repo_name = "test/scriptorium-TEST"
+    @view_name = "preview_test_view"
+
+    @api = Scriptorium::API.new
+    # Ensure a clean slate before creating the repo
+    begin
+      FileUtils.rm_rf(@repo_name)
+      backup_dir = File.join(File.dirname(@repo_name), 'backup-scriptorium-TEST')
+      FileUtils.rm_rf(backup_dir)
+    rescue => e
+      puts "[Integration] Warning: cleanup failed: #{e.message}"
+    end
+    @api.create_repo(@repo_name)
+    @api.open_repo(@repo_name)
+    @api.create_view(@view_name, "Preview Test View")
+
+    # Add a couple of posts
+    @api.create_post("Final Test Post", "ADD BLURB HERE")
+    @api.create_post("Another New Post", "ADD BLURB HERE")
+
+    # Configure date format with break and small pagination (via shared helper)
+    PreviewUtils.write_post_index_config(@repo_name, @view_name, {
+      "posts.per.page" => "5",
+      "entry.date.format" => "month dd break yyyy"
+    })
+
+    # Upload a global image and reference it from the first post via .image
+    test_asset = Tempfile.new(['previewflow', '.jpg'])
+    begin
+      test_asset.write("x")
+      test_asset.close
+      @api.upload_asset(test_asset.path, filename: "previewflow.jpg")
+    ensure
+      test_asset.unlink rescue nil
+    end
+
+    # Insert image reference into post 0001
+    src1 = "#{@repo_name}/posts/0001/source.lt3"
+    File.write(src1, ".image previewflow.jpg\n\nHello")
+
+    # Generate view
+    @api.generate_view(@view_name)
+  end
+
+  def teardown
+    FileUtils.rm_rf(@repo_name)
+  end
+
+  def test_post_index_has_table_and_formatted_dates
+    post_index = "#{@repo_name}/views/#{@view_name}/output/post_index.html"
+    assert File.exist?(post_index), "Expected post_index.html to exist"
+    content = File.read(post_index)
+    assert_includes content, "<table", "post_index should be wrapped in a table"
+    assert_includes content, "<br>", "post_index should include a line break in the date"
+  end
+
+  def test_paginated_page_table_wrapper
+    page1 = "#{@repo_name}/views/#{@view_name}/output/page1.html"
+    assert File.exist?(page1), "Expected page1.html to exist"
+    content = File.read(page1)
+    assert_includes content, "<table", "page1 should be wrapped in a table"
+  end
+
+  def test_index_inlines_table_content
+    index = "#{@repo_name}/views/#{@view_name}/output/index.html"
+    assert File.exist?(index), "Expected index.html to exist"
+    content = File.read(index)
+    # The main section should include a table from post_index inclusion
+    assert_includes content, "<table", "index should inline post_index table"
+  end
+
+  def test_post_page_references_assets_relatively
+    # Verify that the first post page references ../assets/ for the image
+    # Find slug for post 0001 from its meta
+    meta = File.read("#{@repo_name}/posts/0001/meta.txt")
+    slug = meta.lines.grep(/^post.slug\s+/).first.split.last
+    post_html = "#{@repo_name}/views/#{@view_name}/output/posts/#{slug}"
+    assert File.exist?(post_html), "Expected post HTML to exist"
+    html = File.read(post_html)
+    assert_includes html, "<img src=../assets/previewflow.jpg", "Post image should use ../assets/ path"
+  end
+end
+
+