scriptorium 0.6.1 → 0.7.2

data/lib/scriptorium/repo.rb

@@ -1,3 +1,5 @@
+
+
 class Scriptorium::Repo
   include Scriptorium::Exceptions
   extend  Scriptorium::Exceptions
@@ -22,7 +24,8 @@ class Scriptorium::Repo
   end
 
   def self.create(path = nil, testmode: false)
-    assume { path.nil? || path.is_a?(String) }
+    msg = "path must be nil or String, got #{path.class}"
+    assume(msg) { path.nil? || path.is_a?(String) }
     # Handle backward compatibility: boolean true means testing mode
     if testmode == true
       Scriptorium::Repo.testing = path
@@ -32,12 +35,9 @@ class Scriptorium::Repo
     home = ENV['HOME']
     @predef = Scriptorium::StandardFiles.new
     @root = path || "#{home}/.scriptorium"
-    parent = path ? "." : home
-    file = path || ".scriptorium"
-    @root = parent/file
     raise self.RepoDirAlreadyExists(@root) if Dir.exist?(@root)
-    make_tree(parent, <<~EOS)
-      #@root
+    make_tree(@root, <<~EOS)
+      .
       ├── config/       # Global config files
       ├── views/        # Views
       ├── drafts/       # Draft posts (global)
@@ -50,10 +50,18 @@ class Scriptorium::Repo
     postnum_file = "#@root/config/last_post_num.txt"
     write_file(postnum_file, "0")
     write_file(@root/:config/"global-head.txt",   @predef.html_head_content)
-    write_file(@root/:config/"bootstrap_js.txt",  @predef.bootstrap_js)
-    write_file(@root/:config/"bootstrap_css.txt", @predef.bootstrap_css)
+    copy_support_file('bootstrap/js.txt', @root/:config/"bootstrap_js.txt")
+    copy_support_file('bootstrap/css.txt', @root/:config/"bootstrap_css.txt")
     write_file(@root/:config/"common.js",         @predef.common_js)
     write_file(@root/:config/"widgets.txt",       @predef.available_widgets)
+    copy_support_file('post_index/config.txt', @root/:config/"post_index_defaults.txt")
+    
+    # Create global credentials directory and template
+    FileUtils.mkdir_p(@root/:credentials)
+    copy_support_file('config/reddit_template.txt', @root/:credentials/"reddit.txt")
+    
+
+    
     Scriptorium::Theme.create_standard(@root)     # Theme: templates, etc.
     
     # Copy application-wide gem assets to library
@@ -63,20 +71,22 @@ class Scriptorium::Repo
     generate_os_helpers(@root)
     
     @repo = self.open(@root)
-    Scriptorium::View.create_sample_view(repo)
+    Scriptorium::View.create_sample_view(@repo)
     verify { @repo.is_a?(Scriptorium::Repo) }
-    return repo
+    return @repo
   end
 
   def self.open(root)
-    assume { root.is_a?(String) && !root.empty? }
+    msg = "root must be a non-empty String, got #{root.class} (#{root.inspect})"
+    assume(msg) { root.is_a?(String) && !root.empty? }
     repo = Scriptorium::Repo.new(root)
     verify { repo.is_a?(Scriptorium::Repo) }
     repo
   end
 
   def self.destroy
-    assume { Scriptorium::Repo.testing }
+    msg = "Repo.testing must be true in test mode"
+    assume(msg) { Scriptorium::Repo.testing }
     raise self.TestModeOnly unless Scriptorium::Repo.testing
     system!("rm -rf #@root", "destroying repository")
     verify { !Dir.exist?(@root) }
@@ -94,7 +104,8 @@ class Scriptorium::Repo
   end
 
   def initialize(root)    # repo
-    assume { root.is_a?(String) && !root.empty? }
+    msg = "root must be a non-empty String, got #{root.class} (#{root.inspect})"
+    assume(msg) { root.is_a?(String) && !root.empty? }
     @root = root
     @predef = Scriptorium::StandardFiles.new
     # Scriptorium::Repo.class_eval { @root, @repo = root, self }
@@ -117,7 +128,7 @@ class Scriptorium::Repo
       view_name = read_file(cview_file).chomp
       begin
         @current_view = lookup_view(view_name)
-      rescue => e
+      rescue
         # If the saved view doesn't exist, just leave current_view as nil
         # It will be set when a view is created or selected
       end
@@ -138,9 +149,14 @@ class Scriptorium::Repo
   end
 
   private def validate_view_target(target)
-    raise CannotLookupViewTargetNil if target.nil?
+    raise ViewTargetNil if target.nil?
+    
+    raise ViewTargetEmpty if target.to_s.strip.empty?
     
-    raise CannotLookupViewTargetEmpty if target.to_s.strip.empty?
+    # Validate that target is a valid view name (alphanumeric, hyphen, underscore)
+    unless target.match?(/^[a-zA-Z0-9_-]+$/)
+      raise ViewTargetInvalid(target)
+    end
   end
 
   def view(change = nil)   # get/set current view
@@ -160,19 +176,21 @@ class Scriptorium::Repo
   end
 
   def create_view(name, title, subtitle = "", theme: "standard")
-    assume { name.is_a?(String) }
-    assume { title.is_a?(String) }
+    msg = "name must be a String, got #{name.class}"
+    assume(msg) { name.is_a?(String) }
+    msg = "title must be a String, got #{title.class}"
+    assume(msg) { title.is_a?(String) }
     validate_view_name(name)
     validate_view_title(title)
     
     # Validate name format (only allow alphanumeric, hyphen, underscore)
     unless name.match?(/^[a-zA-Z0-9_-]+$/)
-      raise CannotCreateViewNameInvalid(name)
+      raise ViewNameInvalid(name)
     end
     
     raise ViewDirAlreadyExists(name) if view_exist?(name)
-    make_tree(@root/:views, <<~EOS)
-    #{name}/
+    make_tree(@root/:views/name, <<~EOS)
+    .
     ├── config/              # View-specific config files 
     │   ├── layout.txt       # Overall layout for front page
     │   ├── footer.txt       # Content for footer.html
@@ -193,6 +211,9 @@ class Scriptorium::Repo
     │   │   ├── main.html    # Generated from main.txt
     │   │   └── right.html   # Generated from right.txt
     │   └── posts/           # Generated posts for view (slug.html)
+    ├── posts/               # Post state tracking
+    │   ├── unpublished.txt  # Posts NOT published in this view (empty = all published)
+    │   └── undeployed.txt   # Posts NOT published in this view (empty = all deployed)
     ├── widgets/             # Widgets for view
     └── staging/             # Staging area prior to deployment
     EOS
@@ -200,19 +221,62 @@ class Scriptorium::Repo
     ### 
 
     dir = "#@root/views/#{name}"
-    write_file!(dir/"config.txt", 
-               "title    #{title}",
-               "subtitle #{subtitle}",
-               "theme    #{theme}")
-    write_file(dir/:config/"global-head.txt",   @predef.html_head_content(true))  # true = view-specific
-    write_file(dir/:config/"bootstrap_js.txt",  @predef.bootstrap_js)
-    write_file(dir/:config/"bootstrap_css.txt", @predef.bootstrap_css)
-    write_file(dir/:config/"common.js",         @predef.common_js)
-    write_file(dir/:config/"social.txt",        @predef.social_config)
-    write_file(dir/:config/"reddit.txt",        @predef.reddit_config)
-    write_file(dir/:config/"deploy.txt",        @predef.deploy_text % {view: name, domain: "example.com"})
-    write_file(dir/:config/"status.txt",        @predef.status_txt)
-    view = open_view(name)
+    
+    begin
+      write_file!(dir/"config.txt", 
+                 "title    #{title}",
+                 "subtitle #{subtitle}",
+                 "theme    #{theme}")
+      
+      write_file(dir/:config/"global-head.txt",   @predef.html_head_content(true))  # true = view-specific
+      copy_support_file('bootstrap/js.txt', dir/:config/"bootstrap_js.txt")
+      copy_support_file('bootstrap/css.txt', dir/:config/"bootstrap_css.txt")
+      # Highlight.js config files (renamed from prism_* for clarity)
+      copy_support_file('highlight/js.txt',        dir/:config/"highlight_js.txt")
+      write_file(dir/:config/"highlight_ruby_js.txt", @predef.highlight_ruby_js)
+      copy_support_file('highlight/css.txt',       dir/:config/"highlight_css.txt")
+      write_file(dir/:config/"common.js",         @predef.common_js)
+      copy_support_file('config/social.txt', dir/:config/"social.txt")
+      copy_support_file('config/reddit.txt', dir/:config/"reddit.txt")
+      write_file(dir/:config/"deploy.txt",        @predef.deploy_text % {view: name, domain: "example.com"})
+      write_file(dir/:config/"status.txt",        @predef.status_txt)
+      copy_support_file('post_index/config.txt', dir/:config/"post_index.txt")
+      
+      # Create view credentials directory and template
+      FileUtils.mkdir_p(dir/:credentials)
+      copy_support_file('config/reddit_template.txt', dir/:credentials/"reddit.txt")
+      
+      # Copy essential icons to view assets directory
+      view_assets_dir = dir/:assets
+      FileUtils.mkdir_p(view_assets_dir)
+      FileUtils.mkdir_p(view_assets_dir/"icons"/"ui")
+      FileUtils.mkdir_p(view_assets_dir/"icons"/"social")
+      
+      # Copy UI icons
+      if File.exist?(@root/:assets/"icons"/"ui"/"back.png")
+        FileUtils.cp(@root/:assets/"icons"/"ui"/"back.png", view_assets_dir/"icons"/"ui"/"back.png")
+      end
+      
+      # Copy social icons
+      if File.exist?(@root/:assets/"icons"/"social"/"reddit.png")
+        FileUtils.cp(@root/:assets/"icons"/"social"/"reddit.png", view_assets_dir/"icons"/"social"/"reddit.png")
+      end
+      
+      # Copy missing image placeholder
+      if File.exist?(@root/:assets/"imagenotfound.jpg")
+        FileUtils.cp(@root/:assets/"imagenotfound.jpg", view_assets_dir/"imagenotfound.jpg")
+      end
+      
+      # Create post state tracking files
+      write_file(dir/:posts/"unpublished.txt",   "")  # Empty = all posts published
+      write_file(dir/:posts/"undeployed.txt",    "")  # Empty = all posts deployed
+      
+      view = open_view(name)
+    rescue => e
+      # Clean up partial view directory if creation fails
+      FileUtils.rm_rf(dir) if Dir.exist?(dir)
+      raise CannotCreateView("Failed to create view '#{name}': #{e.message}")
+    end
     @views -= [view]
     @views << view
     @current_view = view
@@ -221,13 +285,18 @@ class Scriptorium::Repo
     theme_config = @root/:themes/theme/:layout/:config
     containers = %w[header.txt footer.txt left.txt right.txt main.txt]
     containers.each { |container| FileUtils.cp(theme_config/container, cfg/container) }  # from theme to view
+    
+    # Create default SVG configuration using standard files
+    write_file(cfg/"svg.txt", @predef.svg_txt)
+    
     view.apply_theme(theme)
     verify { view.is_a?(Scriptorium::View) }
     return view
   end
 
   def open_view(name)
-    vhash = getvars(view_dir(name)/"config.txt")
+    config_file = view_dir(name)/"config.txt"
+    vhash = getvars(config_file)
     title, subtitle, theme = vhash.values_at(:title, :subtitle, :theme)
     view = Scriptorium::View.new(name, title, subtitle, theme)
     @views -= [view]
@@ -245,18 +314,16 @@ class Scriptorium::Repo
     
     # Whoa - what if different views have different themes??? FIXME 
     # Maybe solution is as simple as: Initial post is not theme-dependent
-    theme = @current_view.theme
     views ||= @current_view.name   # initial_post wants a String!
     views, tags = Array(views), Array(tags)
-    id = incr_post_num
     
     # Create content file (no ID, no created date)
-    content = @predef.initial_post_content(title: title, blurb: blurb, 
-                                          views: views, tags: tags, body: body)
+    content = @predef.initial_post(:filled, title: title, blurb: blurb, 
+                                   views: views, tags: tags, body: body)
     write_file(content_name, content)
     
-    # Create metadata file (with ID and created date)
-    metadata = @predef.initial_post_metadata(num: id, title: title, blurb: blurb, 
+    # Create metadata file (no ID for drafts)
+    metadata = @predef.initial_post_metadata(title: title, blurb: blurb, 
                                             views: views, tags: tags)
     write_file(metadata_name, metadata)
     
@@ -275,7 +342,7 @@ class Scriptorium::Repo
   end
 
   def finish_draft(name)
-    id = last_post_num
+    id = incr_post_num
     id4 = d4(id)
     posts = @root/:posts
     make_dir(posts/id4)
@@ -297,28 +364,6 @@ class Scriptorium::Repo
   end
 
 
-  private def copy_post_assets_to_view(num, view)
-    id4 = d4(num)
-    post_assets_dir = @root/:posts/id4/"assets"
-    view_assets_dir = view.dir/:output/"assets"
-    
-    # Only copy if post has assets
-    return unless Dir.exist?(post_assets_dir)
-    
-    # Create view assets directory if it doesn't exist
-    make_dir(view_assets_dir)
-    
-    # Copy all files from post assets to view assets
-    Dir.glob(post_assets_dir/"*").each do |file|
-      next unless File.file?(file)
-      filename = File.basename(file)
-      target_file = view_assets_dir/filename
-      
-      # Copy file, overwriting if it exists (post assets take precedence)
-      FileUtils.cp(file, target_file)
-    end
-  end
-
   private def write_post_metadata(data, view)
     num, title = data.values_at(:"post.id", :"post.title")
     metadata_file = @root/:posts/d4(num)/"meta.txt"
@@ -356,83 +401,269 @@ class Scriptorium::Repo
     #   view/.../output/permalink/0123-this-is-me.html (for direct access)
     permalink_path = view.dir/:output/:permalink/slug
     make_dir(File.dirname(permalink_path))
+    # Remove the Back-to-index block from permalink content
+    cleaned_final = final.gsub(/<div align='right'>.*?Back to index<\/a>\s*<\/div>\s*/m, "")
     # Write the permalink version with "Visit Blog" link and "Copy link" button
-    permalink_content = final + "\n<div style=\"text-align: center; margin-top: 20px;\">\n<a href=\"../index.html\">Visit Blog</a>\n</div>\n<div style=\"text-align: center; margin-top: 10px;\">\n<button onclick=\"copyPermalinkToClipboard()\" style=\"padding: 8px 16px; background: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer;\">Copy link</button>\n</div>\n<script>\nfunction copyPermalinkToClipboard() {\n  navigator.clipboard.writeText(window.location.href).then(function() {\n    // Change button text temporarily to show success\n    const button = event.target;\n    const originalText = button.textContent;\n    button.textContent = 'Copied!';\n    button.style.background = '#28a745';\n    setTimeout(function() {\n      button.textContent = originalText;\n      button.style.background = '#007bff';\n    }, 2000);\n  }).catch(function(err) {\n    console.error('Failed to copy: ', err);\n    alert('Failed to copy link to clipboard');\n  });\n}\n</script>"
+    permalink_content = cleaned_final + "\n<div style=\"text-align: center; margin-top: 20px;\">\n<a href=\"../index.html\">Visit Blog</a>\n</div>\n<div style=\"text-align: center; margin-top: 10px;\">\n<button onclick=\"copyPermalinkToClipboard()\" style=\"padding: 8px 16px; background: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer;\">Copy link</button>\n</div>\n<script>\nfunction copyPermalinkToClipboard() {\n  navigator.clipboard.writeText(window.location.href).then(function() {\n    const button = event.target;\n    const originalText = button.textContent;\n    button.textContent = 'Copied!';\n    button.style.background = '#28a745';\n    setTimeout(function() {\n      button.textContent = originalText;\n      button.style.background = '#007bff';\n    }, 2000);\n  }).catch(function(err) {\n    console.error('Failed to copy: ', err);\n    alert('Failed to copy link to clipboard');\n  });\n}\n</script>"
     write_file(permalink_path, permalink_content)
     
-    # Create symlink for clean URL (without numeric prefix)
+    # Create copy for clean URL (without numeric prefix)
     clean_slug = clean_slugify(title) + ".html"
-    clean_symlink_path = view.dir/:output/:permalink/clean_slug
+    clean_copy_path = view.dir/:output/:permalink/clean_slug
     
-    # Remove existing symlink if it exists
-    File.delete(clean_symlink_path) if File.exist?(clean_symlink_path) && File.symlink?(clean_symlink_path)
-    
-    # Create symlink (relative path from clean_symlink_path to slug)
-    begin
-      File.symlink(slug, clean_symlink_path)
-    rescue Errno::EEXIST => e
-      # If symlink already exists (not a symlink), remove it and try again
-      File.delete(clean_symlink_path) if File.exist?(clean_symlink_path)
-      File.symlink(slug, clean_symlink_path)
-    end
+    # Remove existing file if it exists
+    File.delete(clean_copy_path) if File.exist?(clean_copy_path)
     
-    # Copy post-specific assets to view output directory for deployment
-    copy_post_assets_to_view(num, view)
+    # Copy the permalink file to create clean URL
+    FileUtils.cp(permalink_path, clean_copy_path)
   end
 
   def create_post(title: nil, views: nil, tags: nil, body: nil, blurb: nil)
-    assume { title.nil? || title.is_a?(String) }
-    assume { views.nil? || views.is_a?(Array) || views.is_a?(String) }
-    assume { tags.nil? || tags.is_a?(Array) || tags.is_a?(String) }
-    assume { body.nil? || body.is_a?(String) }
-    assume { blurb.nil? || blurb.is_a?(String) }
+    msg = "title must be nil or String, got #{title.class}"
+    assume(msg) { title.nil? || title.is_a?(String) }
+    msg = "views must be nil, Array, or String, got #{views.class}"
+    assume(msg) { views.nil? || views.is_a?(Array) || views.is_a?(String) }
+    msg = "tags must be nil, Array, or String, got #{tags.class}"
+    assume(msg) { tags.nil? || tags.is_a?(Array) || tags.is_a?(String) }
+    msg = "body must be nil or String, got #{body.class}"
+    assume(msg) { body.nil? || body.is_a?(String) }
+    msg = "blurb must be nil or String, got #{blurb.class}"
+    assume(msg) { blurb.nil? || blurb.is_a?(String) }
     name = create_draft(title: title, views: views, tags: tags, body: body, blurb: blurb)
     num = finish_draft(name)
+    
+    # Add post to unpublished and undeployed lists for all views it belongs to
+    metadata_file = @root/:posts/d4(num)/"meta.txt"
+    if File.exist?(metadata_file)
+      metadata = getvars(metadata_file)
+      views = metadata[:"post.views"]&.strip&.split(/\s+/) || ["sample"]
+      views.each do |view_name|
+        view_obj = lookup_view(view_name)
+        unpublished_file = view_obj.dir/:posts/"unpublished.txt"
+        undeployed_file = view_obj.dir/:posts/"undeployed.txt"
+        add_post_to_state_file(unpublished_file, num)
+        add_post_to_state_file(undeployed_file, num)
+      end
+    end
+    
     generate_post(num)
     post = self.post(num)  # Return the Post object
     verify { post.is_a?(Scriptorium::Post) }
     post
   end
 
-  def publish_post(num)
+  def publish_post(num, view = nil)
     validate_post_id(num)
+    
+    # Check if post exists in normal location first
     metadata_file = @root/:posts/d4(num)/"meta.txt"
+    unless File.exist?(metadata_file)
+      # Check if post is deleted
+      if post_deleted?(num)
+        raise PostDeleted(num)
+      else
+        raise CannotGetPost("Post #{num} not found")
+      end
+    end
     
-    # Read current metadata if it exists
-    metadata = {}
-    metadata = getvars(metadata_file) if File.exist?(metadata_file)
+    # Read current metadata
+    metadata = getvars(metadata_file)
     
-    # Check if already published
-    if metadata[:"post.published"] != "no" && metadata[:"post.published"] != nil
-      raise "Post #{num} is already published"
+    if view.nil?
+      # Use current view if no view specified
+      view = @current_view&.name || "sample"
     end
     
-    # Update published timestamp
-    metadata[:"post.published"] = ymdhms
+    # Check if already published in this view
+    view_obj = lookup_view(view)
+    unpublished_file = view_obj.dir/:posts/"unpublished.txt"
+    if !post_in_state_file?(unpublished_file, num)
+      raise PostAlreadyPublished(num)
+    end
     
-    # Write updated metadata
-    lines = metadata.map { |k, v| sprintf("%-18s  %s", k, v) }
-    write_file(metadata_file, lines.join("\n"))
+    # View-specific publish - only update the specified view's state
+    remove_post_from_state_file(unpublished_file, num)
     
-    # Generate the post (this will preserve the updated metadata)
-    generate_post(num)
+    # If this is the first time publishing this post, update global metadata
+    if metadata[:"post.published"] == "no" || metadata[:"post.published"].nil?
+      metadata[:"post.published"] = ymdhms
+      
+      # Write updated metadata
+      lines = metadata.map { |k, v| sprintf("%-18s  %s", k, v) }
+      write_file(metadata_file, lines.join("\n"))
+    end
     
     self.post(num)
   end
-
-  def post_published?(num)
+  
+  def mark_post_deployed(num, view = nil)
     validate_post_id(num)
+    
+    # Check if post exists in normal location first
     metadata_file = @root/:posts/d4(num)/"meta.txt"
-        return false unless File.exist?(metadata_file)
+    unless File.exist?(metadata_file)
+      # Check if post is deleted
+      if post_deleted?(num)
+        raise PostDeleted(num)
+      else
+        raise CannotGetPost("Post #{num} not found")
+      end
+    end
     
-    metadata = getvars(metadata_file)
-    result = metadata[:"post.published"] != "no"
-    result
+    if view.nil?
+      # Use current view if no view specified
+      view = @current_view&.name || "sample"
+    end
+    
+    # Check if already deployed in this view
+    view_obj = lookup_view(view)
+    undeployed_file = view_obj.dir/:posts/"undeployed.txt"
+    if !post_in_state_file?(undeployed_file, num)
+      raise PostAlreadyDeployed(num)
+    end
+    
+    # Validate that only published posts can be deployed
+    unless post_published?(num, view)
+      raise PostNotPublished(num)
+    end
+    
+    # Remove from undeployed list for this view
+    remove_post_from_state_file(undeployed_file, num)
+    
+    # Update global metadata if this is the first deployment
+    metadata_file = @root/:posts/d4(num)/"meta.txt"
+    if File.exist?(metadata_file)
+      metadata = getvars(metadata_file)
+      if metadata[:"post.deployed"] == "no" || metadata[:"post.deployed"].nil?
+        metadata[:"post.deployed"] = ymdhms
+        lines = metadata.map { |k, v| sprintf("%-18s  %s", k, v) }
+        write_file(metadata_file, lines.join("\n"))
+      end
+    else
+      raise CannotGetPost("Post #{num} metadata not found")
+    end
   end
-
-  def get_published_posts(view = nil)
+  
+  def mark_post_undeployed(num, view = nil)
+    validate_post_id(num)
+    
+    if view.nil?
+      # Use current view if no view specified
+      view = @current_view&.name || "sample"
+    end
+    
+    # Add to undeployed list for this view
+    view_obj = lookup_view(view)
+    undeployed_file = view_obj.dir/:posts/"undeployed.txt"
+    add_post_to_state_file(undeployed_file, num)
+    
+    # Update global metadata
+    metadata_file = @root/:posts/d4(num)/"meta.txt"
+    if File.exist?(metadata_file)
+      metadata = getvars(metadata_file)
+      metadata[:"post.deployed"] = "no"
+      lines = metadata.map { |k, v| sprintf("%-18s  %s", k, v) }
+      write_file(metadata_file, lines.join("\n"))
+    end
+  end
+  
+  def post_deployed?(num, view = nil)
+    validate_post_id(num)
+    
+    # If no specific view, check global metadata (for backward compatibility)
+    if view.nil?
+      metadata_file = @root/:posts/d4(num)/"meta.txt"
+      return false unless File.exist?(metadata_file)
+      
+      metadata = getvars(metadata_file)
+      return metadata[:"post.deployed"] != "no"
+    end
+    
+    # Check view-specific deployed status
+    view = lookup_view(view)
+    undeployed_file = view.dir/:posts/"undeployed.txt"
+    !post_in_state_file?(undeployed_file, num)
+  end
+  
+  def get_deployed_posts(view = nil)
     all_posts = all_posts(view)
-    all_posts.select { |post| post_published?(post.id) }
+    
+    if view.nil?
+      # If no specific view, use global metadata (for backward compatibility)
+      all_posts.select { |post| post_deployed?(post.id) }
+    else
+      # Use view-specific deployed status
+      view = lookup_view(view)
+      undeployed_file = view.dir/:posts/"undeployed.txt"
+      all_posts.reject { |post| post_in_state_file?(undeployed_file, post.id) }
+    end
+  end
+  
+  def unpublish_post(num, view = nil)
+    validate_post_id(num)
+    
+    # Check if post is deployed in any view (including current view if none specified)
+    if view.nil?
+      view = @current_view&.name || "sample"
+    end
+    
+    # Check if post is deployed in this view
+    view_obj = lookup_view(view)
+    if post_deployed?(num, view)
+      raise PostAlreadyDeployed(num)
+    end
+    
+    # Always use view-specific logic when a specific view is provided
+    # Add to view-specific unpublished list
+    unpublished_file = view_obj.dir/:posts/"unpublished.txt"
+    add_post_to_state_file(unpublished_file, num)
+    
+    # Also update global metadata to "no" if this was the first published view
+    metadata_file = @root/:posts/d4(num)/"meta.txt"
+    if File.exist?(metadata_file)
+      metadata = getvars(metadata_file)
+      metadata[:"post.published"] = "no"
+      lines = metadata.map { |k, v| sprintf("%-18s  %s", k, v) }
+      write_file(metadata_file, lines.join("\n"))
+    end
+    
+    # Regenerate the post
+    generate_post(num)
+  end
+
+  def post_published?(num, view = nil)
+    validate_post_id(num)
+    
+    # If no specific view, check global metadata (for backward compatibility)
+    if view.nil?
+      metadata_file = @root/:posts/d4(num)/"meta.txt"
+      return false unless File.exist?(metadata_file)
+      
+      metadata = getvars(metadata_file)
+      return metadata[:"post.published"] != "no"
+    end
+    
+    # Check view-specific published status
+    view = lookup_view(view)
+    unpublished_file = view.dir/:posts/"unpublished.txt"
+    !post_in_state_file?(unpublished_file, num)
+  end
+  
+  def post_deleted?(num)
+    validate_post_id(num)
+    
+    # Check deleted location first (with underscore prefix)
+    deleted_metadata_file = @root/:posts/"_#{d4(num)}"/"meta.txt"
+    if File.exist?(deleted_metadata_file)
+      return true
+    end
+    
+    # Check normal location
+    metadata_file = @root/:posts/d4(num)/"meta.txt"
+    return false unless File.exist?(metadata_file)
+    
+    metadata = getvars(metadata_file)
+    metadata[:"post.deleted"] == "yes"
   end
 
   def generate_post(num)
@@ -443,43 +674,54 @@ class Scriptorium::Repo
     
     # Read content file
     vars = { View: @current_view.name, :"post.id" => num }
-    # live = Livetext.customize(mix: "lt3scriptor", call: ".nopara", vars: vars)
-    # text = live.xform_file(content_file)
-    # vars, _body = live.vars.vars, live.body
+    # Mark transform as post-context
+    vars[:"post.context"] = "post"
     
-    live = Livetext.customize(mix: "lt3scriptor", call: ".nopara", vars: vars)
-    body, vars = live.process(file: content_file)
-
-    # Create or update metadata from post content
+    # Merge metadata into vars if metadata file exists
     if File.exist?(metadata_file)
-      # Preserve existing metadata (like post.published timestamp)
-      existing_metadata = getvars(metadata_file)
-      metadata_vars = create_metadata_from_content(num, vars)
-      # Merge existing metadata over defaults
-      existing_metadata.each do |key, value|
-        metadata_vars[key] = value
-      end
-    else
-      # Create new metadata
-      metadata_vars = create_metadata_from_content(num, vars)
+      metadata = getvars(metadata_file)
+      vars.merge!(metadata)
     end
     
+    live = Livetext.customize(mix: "lt3scriptor", call: ".nopara", vars: vars)
+    body, vars = live.process(file: content_file)
+    
+    # Debug: Write vars to file
+    File.open("/tmp/debug_vars_#{num}.txt", "w") do |f|
+      f.puts "Vars after LiveText processing:"
+      vars.each { |k, v| f.puts "#{k} = #{v.inspect}" }
+    end
+
+    # Use metadata from LiveText processing
+    # Filter vars to only include post.* fields for metadata
+    metadata_vars = vars.select {|k,v| k.to_s.start_with?("post.") }
+    metadata_vars.delete(:"post.body")
+    metadata_vars[:"post.slug"] = slugify(num, vars[:"post.title"]) + ".html"
+    metadata_vars[:"post.published"] = "no"
+    metadata_vars[:"post.deployed"] = "no"
+    
+    if vars[:"post.created"]
+      time = Time.parse(vars[:"post.created"])
+      metadata_vars["post.pubdate"]       = time.strftime("%Y-%m-%d %H:%M:%S") 
+      metadata_vars["post.pubdate.month"] = time.strftime("%B") 
+      metadata_vars["post.pubdate.day"]   = time.strftime("%e") 
+      metadata_vars["post.pubdate.year"]  = time.strftime("%Y")
+    end 
+  
     # Write metadata file
     lines = metadata_vars.map { |k, v| sprintf("%-18s  %s", k, v) }
     write_file(metadata_file, lines.join("\n"))
     
-    # Merge metadata into vars, but don't override content vars
-    metadata_vars.each { |key, value| vars[key] = value unless vars.key?(key) }
-    
-    views = vars[:"post.views"].strip.split(/\s+/)
+    views = (vars[:"post.views"] || "").strip.split(/\s+/)
     vars[:"post.views"] = views.join(" ")  # Ensure post.views is set in vars
     views.each do |view|  
       view = lookup_view(view)
-      theme = view.theme 
       vars[:"post.id"] = num.to_s  # Always use the post number as ID
       vars[:"post.body"] = body
-      template = @predef.post_template("standard")
-      set_pubdate(vars)
+      vars[:"post.date"] = self.post(num).date  # Set post.date for templates
+      
+      
+      template = support_data('templates/post.lt3')
       # Add Reddit button if enabled
       vars[:"reddit_button"] = view.generate_reddit_button(vars)
       final = substitute(vars, template) 
@@ -487,31 +729,7 @@ class Scriptorium::Repo
     end
   end
 
-  private def create_metadata_from_content(num, vars)
-    metadata = {}
-    
-    # Set required fields
-    metadata[:"post.id"] = d4(num)
-    metadata[:"post.created"] = ymdhms
-    metadata[:"post.published"] = "no"  # Default to unpublished
-    metadata[:"post.deployed"] = "no"
-    
-    # Copy fields from content vars
-    metadata[:"post.title"] = vars[:"post.title"] || "ADD TITLE HERE"
-    metadata[:"post.blurb"] = vars[:"post.blurb"] || "ADD BLURB HERE"
-    metadata[:"post.views"] = vars[:"post.views"] || "sample"
-    metadata[:"post.tags"] = vars[:"post.tags"] || ""
-    
-    metadata
-  end
 
-  private def set_pubdate(vars)    # Not Post#set_pubdate 
-    t = Time.now
-    vars[:"post.pubdate"] = t.strftime("%Y-%m-%d %H:%M:%S") 
-    vars[:"post.pubdate.month"] = t.strftime("%B") 
-    vars[:"post.pubdate.day"] = t.strftime("%d") 
-    vars[:"post.pubdate.year"] = t.strftime("%Y") 
-  end
 
   def all_posts(view = nil)
     posts = []
@@ -525,6 +743,31 @@ class Scriptorium::Repo
     view = lookup_view(view)
     posts.select {|x| x.views.include?(view.name) }
   end
+  
+  def all_posts_including_deleted(view = nil)
+    posts = []
+    dirs = Dir.children(@root/:posts)
+    dirs.each do |id4|
+      # Include both normal and deleted posts
+      if id4.start_with?('_')
+        # Deleted post - remove underscore prefix and pass deleted: true
+        original_id = id4[1..-1]
+        posts << Scriptorium::Post.read(self, original_id, deleted: true)
+      else
+        posts << Scriptorium::Post.read(self, id4)
+      end
+    end
+    return posts if view.nil?
+    view = lookup_view(view)
+    posts.select {|x| 
+      views_str = x.views
+      if views_str.nil? || views_str.strip.empty?
+        false
+      else
+        views_str.strip.split(/\s+/).include?(view.name)
+      end
+    }
+  end
 
   def generate_post_index(view)
     view = lookup_view(view)
@@ -543,16 +786,81 @@ class Scriptorium::Repo
     return Scriptorium::Post.new(self, id) if File.exist?(deleted_meta)
     
     # Post not found in either location
-    nil
+    raise CannotGetPost("Post with ID #{id} not found")
+  end
+  
+  def delete_post(num)
+    validate_post_id(num)
+    
+    # Check if post exists
+    metadata_file = @root/:posts/d4(num)/"meta.txt"
+    unless File.exist?(metadata_file)
+      raise CannotGetPost("Post #{num} not found")
+    end
+    
+    # Check if already deleted
+    if post_deleted?(num)
+      raise PostAlreadyDeleted(num)
+    end
+    
+    # Mark as deleted in metadata
+    metadata = getvars(metadata_file)
+    metadata[:"post.deleted"] = "yes"
+    metadata[:"post.deleted_at"] = ymdhms
+    
+    # Write updated metadata
+    lines = metadata.map { |k, v| sprintf("%-18s  %s", k, v) }
+    write_file(metadata_file, lines.join("\n"))
+    
+    # Move post directory to deleted location (with underscore prefix)
+    post_dir = @root/:posts/d4(num)
+    deleted_dir = @root/:posts/"_#{d4(num)}"
+    
+    if Dir.exist?(post_dir)
+      FileUtils.mv(post_dir, deleted_dir)
+    end
+  end
+  
+  def undelete_post(num)
+    validate_post_id(num)
+    
+    # Check if post exists in deleted location
+    deleted_dir = @root/:posts/"_#{d4(num)}"
+    unless Dir.exist?(deleted_dir)
+      raise CannotGetPost("Deleted post #{num} not found")
+    end
+    
+    # Check if already undeleted
+    unless post_deleted?(num)
+      raise PostNotDeleted(num)
+    end
+    
+    # Move post directory back to normal location
+    post_dir = @root/:posts/d4(num)
+    FileUtils.mv(deleted_dir, post_dir)
+    
+    # Remove deleted flag from metadata
+    metadata_file = @root/:posts/d4(num)/"meta.txt"
+    if File.exist?(metadata_file)
+      metadata = getvars(metadata_file)
+      metadata.delete(:"post.deleted")
+      metadata.delete(:"post.deleted_at")
+      
+      # Write updated metadata
+      lines = metadata.map { |k, v| sprintf("%-18s  %s", k, v) }
+      write_file(metadata_file, lines.join("\n"))
+    end
   end
+  
+
 
   private def validate_post_id(id)
-    raise CannotGetPostIdNil if id.nil?
+    raise PostIdNil if id.nil?
     
-    raise CannotGetPostIdEmpty if id.to_s.strip.empty?
+    raise PostIdEmpty if id.to_s.strip.empty?
     
     unless id.to_s.match?(/^\d+$/)
-      raise CannotGetPostIdInvalid(id)
+      raise PostIdInvalid(id)
     end
   end
   
@@ -574,17 +882,23 @@ class Scriptorium::Repo
     reddit.configured?
   end
 
+
+
   private def validate_view_name(name)
-    raise CannotCreateViewNameNil if name.nil?
+    raise ViewNameNil if name.nil?
     
-    raise CannotCreateViewNameEmpty if name.to_s.strip.empty?
+    raise ViewNameEmpty if name.to_s.strip.empty?
   end
 
+
+
   private def validate_view_title(title)
-    raise CannotCreateViewTitleNil if title.nil?
+    raise ViewTitleNil if title.nil?
     
-    raise CannotCreateViewTitleEmpty if title.to_s.strip.empty?
+    raise ViewTitleEmpty if title.to_s.strip.empty?
   end
+  
+
 
   def self.generate_os_helpers(root)
     os_code = case RbConfig::CONFIG['host_os']