ragerender 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aedbeb388659f01299aa3694a3f30bd1368e09e9f729caa31334fff4300c6b7c
-  data.tar.gz: 11e966fefecb160bf9992f6697ae8fc23dbe299095c1bc458af6395fb29903c8
+  metadata.gz: 152c14ba01c06c930b537a0e1c72a994e673fa8aea1176b82f92adfc912e5e77
+  data.tar.gz: bfb9fa9e0e5d4e1dae45c3bdc7fc09fd7de45fdcbb3043fd45c26e11404b0d1d
 SHA512:
-  metadata.gz: cbdffe416a3edb68d95c256456341c19199d09d71cbc0ef8d3a2f3b41b362048ec81d67848982beca07d2560d4a164758861c152d9b24d71f76010ee45bfc793
-  data.tar.gz: 266d915e6744dd58bf1f5db3fe795105190f9a09081ed03b596d7c58420e258d0f3ff7e1546c209c051bfb936654583d528c5555835ce5340b2863f0158baf67
+  metadata.gz: 78e6690eb005da5ac9604c4111612b3e3dcf2d68c52bb8b351dc6165d3fecf9acc8267cfb69d551a6ee8374bb6b660d812465e2bb14875e2d95199c5b1a81a6e
+  data.tar.gz: 841b860abb04b124f88aa730ece8650fce559f08a889598f4121b503eb6d5c3ef03bb396f6afffe860ded22cffb92d887750cd597b170369dbc74e7660d8f1ea

data/README.rdoc

@@ -49,7 +49,7 @@ To set up a new site, open a terminal and type:
   mkdir mycomic && cd mycomic
   bundle init
   bundle add jekyll
-  bundle add ragerender
+  bundle add ragerender --group=jekyll_plugins
 
 Now you can add comics! Add the image into an <tt>images</tt> folder:
 
@@ -92,6 +92,9 @@ Put something like this in your webcomic folder and call it
   description: >
     My epic story about how him and her
     fell into a romantic polycule with they and them
+  genres:
+  - Comedy
+  - Romance
 
   defaults:
   - scope:
@@ -105,18 +108,17 @@ Your webcomic now has its basic information set up.
 
 === Adding your layouts
 
-RageRender will use a ComicFury default layout if you don't supply your own
-files.
+If you want to use your own layout code, then create a <tt>_layouts</tt>
+directory and put the contents of each of your ComicFury layout tabs in there,
+and then put your CSS in the main folder.
 
-If you want to keep using the "simple" layout, you can add the details into your
-<tt>_config.yml</tt> too:
+The easiest way is to go to your Webcomic Management, click "Edit Layout", then
+in the box labelled "Useful", click "Download Layout Backup". Pass this file to
+RageRender, which will <tt>unpack</tt> it for you:
 
-  layout:
+    bundle exec jekyll unpack mycomic-2025-09-13.cflxml
 
-If you want to use your own layout code, then create a <tt>_layouts</tt>
-directory and put the contents of each of your ComicFury layout tabs in there,
-and then put your CSS in the main folder. You should end up with a full set of
-files like:
+You should end up with a full set of files like:
 
   _layouts
     archive.html
@@ -134,7 +136,7 @@ instead.
 
 === Adding blogs
 
-Add your blogs into a folder called `_posts`:
+Add your blogs into a folder called <tt>_posts</tt>:
 
   cat _posts/2025-05-29-my-new-comic.md
   Hey guys, welcome to my new comic! It's gonna be so sick!
@@ -201,6 +203,16 @@ You control this by setting a <tt>frontpage</tt> key in your site config.
 - anything else will display the extra page that has the matching
   <tt>slug</tt> in its Front Matter
 
+=== Putting changes on ComicFury
+
+Once you're done making changes, you can <tt>pack</tt> your layout:
+
+    bundle exec jekyll pack
+
+The resulting file can be uploaded to ComicFury by going to your Webcomic
+Management, clicking "Edit Layout", then in the box labelled "Useful", click
+"Restore Layout Backup".
+
 === Stuff that doesn't work
 
 Here is a probably incomplete list of things you can expect to be different

data/assets/comic-not-found.html

@@ -0,0 +1,7 @@
+---
+title: Comic not found
+layout: error-page
+hidden: true
+published: false
+---
+This webcomic does not have any comic pages yet!

data/lib/ragerender/cflxml.rb

@@ -0,0 +1,105 @@
+require 'pathname'
+require 'rexml'
+require 'base64'
+
+module RageRender
+  HTML_FILES = {
+    overall: 'overall',
+    overview: 'overview',
+    viewblog: 'blog-display',
+    comic: 'comic-page',
+    archive: 'archive',
+    blogarchive: 'blog-archive',
+    error: 'error-page',
+    search: 'search',
+  }
+
+  CSS_FILES = {
+    layoutcss: 'layout'
+  }
+
+  def self.unpack src, html_dest, css_dest
+    doc = REXML::Document.new(src).elements
+    html_dir = Pathname.new(html_dest)
+    css_dir = Pathname.new(css_dest)
+
+    HTML_FILES.each do |(tag, filename)|
+      File.write html_dir.join(filename + '.html'), Base64.decode64(doc["/layout/ldata/#{tag.to_s}/text()"].value)
+    end
+
+    CSS_FILES.each do |(tag, filename)|
+      File.write css_dir.join(filename + '.css'), Base64.decode64(doc["/layout/ldata/#{tag.to_s}/text()"].value)
+    end
+  end
+
+  def self.pack html_srcdir, css_srcdir, dest
+    layout = REXML::Element.new('layout')
+
+    name = REXML::Element.new('name')
+    name.text = "Downloaded ComicFury layout"
+    layout.add name
+
+    version = REXML::Element.new('cfxml')
+    version.text = '1.2'
+    layout.add version
+
+    spage = REXML::Element.new('spage')
+    spage.text = '1'
+    layout.add spage
+
+    ldata = REXML::Element.new('ldata')
+    html_dir = Pathname.new(html_srcdir)
+    css_dir = Pathname.new(css_srcdir)
+
+    HTML_FILES.each do |(tag, filename)|
+      elem = REXML::Element.new tag.to_s
+      elem.text = Base64.strict_encode64 File.read html_dir.join(filename + '.html')
+      ldata.add elem
+    end
+
+    CSS_FILES.each do |(tag, filename)|
+      elem = REXML::Element.new tag.to_s
+      elem.text = Base64.strict_encode64 File.read css_dir.join(filename + '.css')
+      ldata.add elem
+    end
+    layout.add ldata
+
+    # ComicFury will only accept backup files that have:
+    # - A valid XML declaration using double quotes
+    # – A comment as per below
+    # – Tab indentation
+    doc = REXML::Document.new(nil, prologue_quote: :quote)
+    doc.add REXML::XMLDecl.new REXML::XMLDecl::DEFAULT_VERSION, REXML::XMLDecl::DEFAULT_ENCODING
+    doc.add REXML::Comment.new 'This is a ComicFury layout backup, use the import layout function to restore this to a webcomic site. You can access this as follows: Go to your Webcomic Management, click "Edit Layout", then in the Box labelled "Useful", click "Restore Layout Backup"'
+    doc.add layout
+
+    # Pretty print, but *always* make text nodes take up a single line, no
+    # matter how long they are
+    formatter = REXML::Formatters::Pretty.new(1)
+    formatter.compact = true
+    formatter.width = Float::INFINITY
+
+    # Replace the space indentation with tab indentation
+    buf = StringIO.new
+    formatter.write(doc, buf)
+    buf.string.each_line do |line|
+      dest << line.gsub(/^ +/) {|sp| "\t" * sp.size }
+    end
+  end
+end
+
+if __FILE__ == $0
+  case ARGV.shift
+  when 'pack'
+    html_srcdir, css_srcdir, *dest = ARGV
+    RageRender.pack(html_srcdir, css_srcdir, dest.any? ? File.open(dest.first, 'w') : $stdout)
+  when 'unpack'
+    src, html_dest, css_dest = ARGV
+    RageRender.unpack(src == '-' ? $stdin : File.open(src, 'r'), html_dest, css_dest)
+  else
+    raise <<~USAGE
+      Usage: pack html_srcdir css_srcdir dest
+      Usage: unpack src html_dest css_dest
+    USAGE
+  end
+end

data/lib/ragerender/jekyll/archive.rb

@@ -1,6 +1,7 @@
 require 'jekyll/generator'
 require 'jekyll/drops/drop'
 require_relative 'comics'
+require_relative 'chapter'
 require_relative 'pagination'
 require_relative 'pipettes'
 
@@ -8,6 +9,7 @@ require_relative 'pipettes'
 # chapter pages because they are not "pages"
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'archive'
+    RageRender::Pipettes.clean_payload payload
     payload.merge! RageRender::ArchiveDrop.new(page).to_liquid
   end
 end
@@ -112,6 +114,7 @@ module RageRender
       !show_comic_list
     end
 
+    def_loop :chapters, *(RageRender::ChapterDrop.invokable_methods - Jekyll::Drops::DocumentDrop.invokable_methods)
     def chapters
       unless show_chapter_overview
         @obj.site.collections['chapters'].docs.reject do |page|
@@ -122,13 +125,14 @@ module RageRender
       end
     end
 
+    def_loop :comics_paginated, :number, :newchapter, :chapterend, *ComicDrop::PAGINATION_FIELDS, *ChapterDrop::PAGINATION_FIELDS
     def comics_paginated
       number = @obj.data['number']
       comics = if number
         selected_comics.to_a[number - 1]
       else
         selected_comics.to_a.flatten
-      end.group_by {|c| c.data['chapter'] }
+      end&.group_by {|c| c.data['chapter'] } || []
 
       comics.map do |chapter, comics|
         chapter_data = ChapterDrop.new(@obj.site.collections['chapters'].docs.detect {|c| c.data['slug'] == chapter })

data/lib/ragerender/jekyll/blog.rb

@@ -4,6 +4,7 @@ require_relative '../date_formats'
 require_relative 'pipettes'
 
 Jekyll::Hooks.register :posts, :pre_render do |post, payload|
+  RageRender::Pipettes.clean_payload payload
   payload.merge! RageRender::BlogDrop.new(post).to_liquid
 end
 

data/lib/ragerender/jekyll/blog_archive.rb

@@ -8,6 +8,7 @@ require_relative 'pipettes'
 # Pass the right variables to blog archive pages.
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'blog-archive'
+    RageRender::Pipettes.clean_payload payload
     payload.merge! RageRender::BlogArchiveDrop.new(page).to_liquid
   end
 end
@@ -51,11 +52,40 @@ module RageRender
     end
   end
 
+  # Data representing a single paginated blog entry, as available from
+  # [l:blogs_paginated].
+  class PaginatedBlogDrop < Jekyll::Drops::DocumentDrop
+    extend Pipettes
+
+    def_data_delegator :title, :blogtitle
+    def_delegator :@obj, :url, :bloglink
+    def_data_delegator :author, :authorname
+    def_delegator :@obj, :content, :blog
+    # TODO profilelink
+
+    private delegate_method_as :data, :fallback_data
+
+    def posttime
+      comicfury_date(@obj.date)
+    end
+
+    def allowcomments
+      @obj.site.config['allowcomments']
+    end
+
+    def comments
+      (@obj.data['comments'] || []).size
+    end
+  end
+
   # Data to pass to a blog archive page.
   class BlogArchiveDrop < Jekyll::Drops::Drop
+    extend Pipettes
+
     private delegate_method_as :data, :fallback_data
     data_delegator 'number'
 
+    def_loop :blogs_paginated, *(RageRender::PaginatedBlogDrop.invokable_methods - Jekyll::Drops::DocumentDrop.invokable_methods)
     def blogs_paginated
       all_blogs[number-1]&.map {|blog| PaginatedBlogDrop.new(blog).to_liquid } || []
     end
@@ -80,36 +110,11 @@ module RageRender
         }
       end
     end
+    def_loop :pages, :page, :pagelink, :is_current, :skipped_ahead
 
     private
     def all_blogs
       @all_blogs = @obj.site.posts.docs.each_slice(BLOGS_PER_PAGE).to_a
     end
   end
-
-  # Data representing a single paginated blog entry, as available from
-  # [l:blogs_paginated].
-  class PaginatedBlogDrop < Jekyll::Drops::DocumentDrop
-    extend Pipettes
-
-    def_data_delegator :title, :blogtitle
-    def_delegator :@obj, :url, :bloglink
-    def_data_delegator :author, :authorname
-    def_delegator :@obj, :content, :blog
-    # TODO profilelink
-
-    private delegate_method_as :data, :fallback_data
-
-    def posttime
-      comicfury_date(@obj.date)
-    end
-
-    def allowcomments
-      @obj.site.config['allowcomments']
-    end
-
-    def comments
-      (@obj.data['comments'] || []).size
-    end
-  end
 end

data/lib/ragerender/jekyll/chapter.rb

@@ -21,6 +21,7 @@ Jekyll::Hooks.register :site, :after_init do |site|
 end
 
 Jekyll::Hooks.register :chapters, :pre_render do |chapter, payload|
+  RageRender::Pipettes.clean_payload payload
   payload.merge! RageRender::ChapterDrop.new(chapter).to_liquid
   payload.merge! RageRender::ArchiveDrop.new(chapter).to_liquid
 end
@@ -73,21 +74,22 @@ module RageRender
     COVER_MAX_HEIGHT = 420
     COVER_MAX_WIDTH = 300
 
-    PAGINATION_FIELDS = %w[ chaptername chapterdescription ]
+    PAGINATION_FIELDS = %w[ chaptername chapterdescription chapterid ]
 
     delegate_method_as :data, :fallback_data
     extend Pipettes
     extend Forwardable
 
     def_data_delegator :description, :chapterdescription
+    def_data_delegator :image, :image
     def_delegator :@obj, :url, :chapterarchiveurl
 
-    def chaptername
-      escape @obj.data['title']
+    def chapterid
+      @obj.collection.docs.index @obj
     end
 
-    def cover
-      cover_obj.url
+    def chaptername
+      escape @obj.data['title']
     end
 
     def cover_width_small
@@ -117,24 +119,16 @@ module RageRender
     end
 
     private
-    def cover_width
-      cover_obj.data['width'] ||= Dimensions.width cover_obj.path
-    end
-
-    def cover_height
-      cover_obj.data['height'] ||= Dimensions.height cover_obj.path
-    end
-
-    def cover_obj
-      @cover_obj ||= @obj.site.static_files.detect {|f| f.relative_path == cover_relative_path }
-    end
-
-    def cover_relative_path
-      Pathname.new('/').join(@obj.data['image']).to_s
-    end
+    def_image_metadata :image
+    private :image_url, :image_width, :image_height
 
     def first_comic
       @obj.site.collections['comics'].docs.select {|c| c.data['chapter'] == @obj.data['slug'] }.first
     end
+
+    public
+    alias cover image_url
+    alias cover_height image_height
+    alias cover_width image_width
   end
 end

data/lib/ragerender/jekyll/comics.rb

@@ -1,16 +1,24 @@
+require 'uri'
+require 'liquid/drop'
+require 'jekyll/hooks'
+require 'jekyll/plugin'
 require 'jekyll/generator'
 require 'jekyll/document'
+require 'jekyll/drops/drop'
 require 'jekyll/drops/document_drop'
 require_relative '../date_formats'
 require_relative 'pipettes'
 
 Jekyll::Hooks.register :comics, :pre_render do |page, payload|
+  RageRender::Pipettes.clean_payload payload
   payload.merge! RageRender::ComicDrop.new(page).to_liquid
 end
 
 module RageRender
   SPECIAL_COMIC_SLUGS = %w{frontpage index}
 
+  BASE_DIR = File.join(File.dirname(__FILE__), '..', '..', '..')
+
   # Creates comics for each file found in the 'images' directory
   # that does not already have an associated comic object.
   class ComicFromImageGenerator < Jekyll::Generator
@@ -41,9 +49,14 @@ module RageRender
     def generate site
       comics = site.collections['comics']
       index = comics.docs.last.dup
+      collection = comics.docs
+      if index.nil?
+        index = site.pages.detect {|p| p.data["title"] == "Comic not found" }.dup
+        collection = site.pages
+      end
       index.instance_variable_set(:"@data", index.data.dup)
       index.data['slug'] = 'index'
-      comics.docs << index
+      collection << index
     end
   end
 
@@ -82,6 +95,7 @@ module RageRender
 
     delegate_method_as :id, :comicid
     def_delegator :@obj, :url, :comicurl
+    def_delegator :@obj, :url, :permalink
     data_delegator 'rating'
     data_delegator 'votecount'
 
@@ -89,10 +103,26 @@ module RageRender
       escape @obj.data['title']
     end
 
+    def comicnumber
+      1 + all_comics.index(@obj)
+    end
+
+    def comicsnum
+      all_comics.size
+    end
+
     def posttime
       comicfury_date(@obj.date)
     end
 
+    def postyear
+      @obj.date.year
+    end
+
+    def postmonth
+      @obj.date.month
+    end
+
     def usechapters
       all_comics.any? {|comic| comic.data.include? 'chapter' }
     end
@@ -109,6 +139,7 @@ module RageRender
       chapter&.url
     end
 
+    def_loop :dropdown, :is_selected, :is_disabled, :title, :grouplabel, :newgroup, :endgroup, :url
     def dropdown
       all_comics.each_with_object([]) do |c, dropdown|
         new_group = dropdown.last.nil? ? true : dropdown.last['grouplabel'] != c.data['chapter']
@@ -141,6 +172,7 @@ module RageRender
       end
     end
 
+    def_loop :authornotes, :is_reply, :comment, :isguest, :avatar, :authorname, :commentanchor, :posttime, :profilelink
     def authornotes
       @obj.data['authornotes'] || [{
         'is_reply' => false,
@@ -176,10 +208,22 @@ module RageRender
       @obj.previous_doc&.url
     end
 
+    def prevcomicpermalink
+      unless @obj.previous_doc.nil?
+        URI.join(@obj.site.config["url"], @obj.site.baseurl || '/', @obj.previous_doc&.url).to_s
+      end
+    end
+
     def nextcomic
       @obj.next_doc&.url
     end
 
+    def nextcomicpermalink
+      unless @obj.next_doc.nil?
+        URI.join(@obj.site.config["url"], @obj.site.baseurl || '/', @obj.next_doc&.url).to_s
+      end
+    end
+
     # An HTML tag to print for the comic image. If there is a future image, then
     # this is also a link to the next comic page.
     def comicimage
@@ -195,6 +239,10 @@ module RageRender
       [linkopen, image, linkclose].join
     end
 
+    def keys
+      super.reject {|k| private_methods.include? k.to_sym }
+    end
+
     def to_liquid
       super.reject do |k, v|
         Jekyll::Drops::DocumentDrop::NESTED_OBJECT_FIELD_BLACKLIST.include? k
@@ -212,6 +260,7 @@ module RageRender
 
     data_delegator 'image'
     def_image_metadata :image
+    private :image, :image_url, :image_width, :image_height
 
     public
     alias comicimageurl image_url

data/lib/ragerender/jekyll/error.rb

@@ -2,6 +2,7 @@ require_relative 'pipettes'
 
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'error-page'
+    RageRender::Pipettes.clean_payload payload
     payload.merge! RageRender::ErrorDrop.new(page).to_liquid
   end
 end

data/lib/ragerender/jekyll/overview.rb

@@ -6,17 +6,23 @@ require_relative 'blog_archive'
 # Pass the right variables to overview pages.
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'overview'
-    payload.merge! RageRender::ComicDrop.new(page.site.collections['comics'].docs.last).to_liquid
+    RageRender::Pipettes.clean_payload payload
+    latest_comic = page.site.collections['comics'].docs.last
+    if latest_comic
+      payload.merge! RageRender::ComicDrop.new(latest_comic).to_liquid
+    end
     payload.merge! RageRender::OverviewDrop.new(page).to_liquid
   end
 end
 
 module RageRender
   class OverviewDrop < Jekyll::Drops::Drop
+    extend Pipettes
     private delegate_method_as :data, :fallback_data
 
+    def_loop :latestblogs, *(RageRender::PaginatedBlogDrop.invokable_methods - Jekyll::Drops::DocumentDrop.invokable_methods)
     def latestblogs
-      @obj.site.posts.docs[-5..].map {|post| RageRender::PaginatedBlogDrop.new(post) }
+      @obj.site.posts.docs[-5..]&.map {|post| RageRender::PaginatedBlogDrop.new(post) } || []
     end
   end
 end

data/lib/ragerender/jekyll/pipettes.rb

@@ -1,14 +1,30 @@
 # Pipettes help you make drops.
 require 'cgi'
+require 'dimensions'
 
 module RageRender
   module Pipettes
+    def self.clean_payload payload
+      Jekyll.logger.debug("Cleaning payload")
+      sets = Jekyll::Drops::DocumentDrop.subclasses.map(&:invokable_methods)
+      methods = sets.reduce(Set.new) {|s,acc| acc.merge(s)} - Set.new(Jekyll::Drops::DocumentDrop.invokable_methods)
+      payload.send(:fallback_data).delete_if {|k| methods.include? k}
+    end
+
     def def_data_delegator key, aliaz
       define_method(aliaz.to_sym) do
         @obj.data[key.to_s]
       end
     end
 
+    def def_loop method, *fields
+      (@loops ||= {})[method.to_sym] = fields
+    end
+
+    def loops
+      @loops || {}
+    end
+
     def self.extended mod
       mod.define_method(:escape) do |str|
         str.nil? ? nil : CGI.escapeHTML(str)
@@ -25,6 +41,7 @@ module RageRender
       define_method(:"#{prefix}_relative_path") do
         Pathname.new('/').join(send(prefix.to_sym)).to_path
       end
+      private :"#{prefix}_relative_path"
 
       define_method(:"#{prefix}_url") do
         File.join (@obj.site.baseurl || ''), send(:"#{prefix}_relative_path")
@@ -36,17 +53,19 @@ module RageRender
         end
         instance_variable_get(:"@#{prefix}_obj")
       end
+      private :"#{prefix}_obj"
 
       define_method(:"#{prefix}_path") do
         send(:"#{prefix}_obj").path
       end
+      private :"#{prefix}_path"
 
       define_method(:"#{prefix}_width") do
-        send(:"#{prefix}_obj").data['width'] ||= Dimensions.width(send(:"#{prefix}_path")) rescue nil
+        send(:"#{prefix}_obj") && (send(:"#{prefix}_obj").data['width'] ||= Dimensions.width(send(:"#{prefix}_path")) rescue nil)
       end
 
       define_method(:"#{prefix}_height") do
-        send(:"#{prefix}_obj").data['height'] ||= Dimensions.height(send(:"#{prefix}_path")) rescue nil
+        send(:"#{prefix}_obj") && (send(:"#{prefix}_obj").data['height'] ||= Dimensions.height(send(:"#{prefix}_path")) rescue nil)
       end
     end
   end

data/lib/ragerender/jekyll/search.rb

@@ -1,11 +1,14 @@
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'search'
+    RageRender::Pipettes.clean_payload payload
     payload.merge! RageRender::SearchDrop.new(page).to_liquid
   end
 end
 
 module RageRender
   class SearchDrop < Jekyll::Drops::Drop
+    extend Pipettes
+
     private delegate_method_as :data, :fallback_data
     data_delegator 'searchterm'
 
@@ -13,6 +16,7 @@ module RageRender
       !searchterm.nil?
     end
 
+    def_loop :searchresults, :number, *ComicDrop::PAGINATION_FIELDS
     def searchresults
       return [] unless searched
       @results ||= @obj.site.collections['comics'].docs.select do |comic|

data/lib/ragerender/jekyll.rb

@@ -1,11 +1,15 @@
 require 'etc'
 require 'stringio'
-require 'jekyll'
-require 'dimensions'
+require 'jekyll/command'
+require 'jekyll/hooks'
+require 'jekyll/plugin'
+require 'jekyll/generator'
+require 'liquid/drop'
 require_relative 'language'
 require_relative 'functions'
 require_relative 'to_liquid'
 require_relative 'date_formats'
+require_relative 'cflxml'
 require_relative 'jekyll/archive'
 require_relative 'jekyll/blog'
 require_relative 'jekyll/blog_archive'
@@ -17,6 +21,39 @@ require_relative 'jekyll/search'
 require_relative 'jekyll/pipettes'
 require_relative 'jekyll/setup_collection'
 
+module RageRender
+  class CFLXMLCommands < Jekyll::Command
+    class << self
+      def init_with_program(jekyll)
+        jekyll.command :pack do |pack|
+          pack.syntax 'pack'
+          pack.description 'Create a ComicFury layout backup from this site'
+          pack.action do |args, options|
+            config = configuration_from_options(options)
+            filename = "#{(config['title'] || File.basename(config['source']))} #{Time.now.to_s}.cflxml"
+            puts "Outputting backup file #{filename}"
+            File.open(filename, 'w') do |file|
+              RageRender.pack config['layouts_dir'], config['source'], file
+            end
+          end
+        end
+
+        jekyll.command :unpack do |unpack|
+          unpack.syntax 'unpack <file>'
+          unpack.description 'Overwrite HTML and CSS from a ComicFury layout backup'
+          unpack.action do |args, options|
+            raise ArgumentError, 'unpack requires one cflxml file' unless args.one?
+            config = configuration_from_options(options)
+            File.open(args.first, 'r') do |file|
+              RageRender.unpack file, config['layouts_dir'], config['source']
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
 Jekyll::Hooks.register :site, :after_init do |site|
   # This is obviously quite naughty for many reasons,
   # but it's the only way to get the theme selected
@@ -24,6 +61,7 @@ Jekyll::Hooks.register :site, :after_init do |site|
   site.config['theme'] ||= 'ragerender'
   site.config['title'] ||= File.basename(site.source)
   site.config['search'] ||= true
+  site.config['url'] ||= "https://#{File.basename(site.source)}.thecomicseries.com"
   site.config = site.config
 
   setup_collection site, :comics, '/:collection/:slug/', layout: 'comic-page', chapter: '0'
@@ -72,6 +110,10 @@ class RageRender::FrontpageGenerator < Jekyll::Generator
       collection = site.pages
       site.pages.detect {|p| p.data["slug"] == frontpage }
     end.dup
+    if index.nil?
+      collection = site.pages
+      index = site.pages.detect {|p| p.data['title'] == 'Comic not found' }.dup
+    end
     index.instance_variable_set(:"@data", index.data.dup)
     index.data['permalink'] = '/index.html'
     index.data['slug'] = 'frontpage'
@@ -84,6 +126,7 @@ Jekyll::Hooks.register :documents, :pre_render do |doc, payload|
 end
 
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
+  RageRender::Pipettes.clean_payload payload
   payload.merge! RageRender::WebcomicDrop.new(page).to_liquid
 end
 
@@ -108,6 +151,20 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
     escape @obj.site.config['description']
   end
 
+  def_loop :webcomicgenres, :genre_link, :genre_name
+  def webcomicgenres
+    (@obj.site.config['genres'] || []).map do |g|
+      {
+        'genre_name' => escape(g),
+        'genre_link' => "https://comicfury.com/search.php?vr=1&query=&tags=#{g.downcase.gsub(/[^a-z]/, '')}"
+      }
+    end
+  end
+
+  def webcomicgenre
+    (webcomicgenres.first || {})['genre_name']
+  end
+
   def webcomicurl
     @obj.site.baseurl
   end
@@ -117,7 +174,7 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
   end
 
   def copyrights
-    escape @obj.site.config['copyrights'].gsub('[year]', Date.today.year.to_s)
+    escape @obj.site.config.fetch('copyrights', '').gsub('[year]', Date.today.year.to_s)
   end
 
   def banner
@@ -141,6 +198,7 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
     false
   end
 
+  def_loop :extrapages, :link, :title
   def extrapages
     @obj.site.pages.reject {|page| page.data['hidden'] }.map do |page|
       {'link' => page.url, 'title' => escape(page.data['title'])}
@@ -160,6 +218,7 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
     css_files << Pathname.new(@obj.site.theme.includes_path).join('layout.css') unless css_files.any?
     css_files.map {|f| File.read f }.join
   end
+  private :css
 
   def layoutcss
     <<~HTML
@@ -169,8 +228,6 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
     HTML
   end
 
-  delegate_method_as :url, :permalink
-
   def pagetitle
     escape @obj.data['title']
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragerender
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Simon Worthington
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-06 00:00:00.000000000 Z
+date: 2026-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsec
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +141,7 @@ description: |-
     mkdir mycomic && cd mycomic
     bundle init
     bundle add jekyll
-    bundle add ragerender
+    bundle add ragerender --group=jekyll_plugins
 
   Now you can add comics! Add the image into an <tt>images</tt> folder:
 
@@ -170,6 +184,9 @@ description: |-
     description: >
       My epic story about how him and her
       fell into a romantic polycule with they and them
+    genres:
+    - Comedy
+    - Romance
 
     defaults:
     - scope:
@@ -185,8 +202,15 @@ description: |-
 
   If you want to use your own layout code, then create a <tt>_layouts</tt>
   directory and put the contents of each of your ComicFury layout tabs in there,
-  and then put your CSS in the main folder. You should end up with a full set of
-  files like:
+  and then put your CSS in the main folder.
+
+  The easiest way is to go to your Webcomic Management, click "Edit Layout", then
+  in the box labelled "Useful", click "Download Layout Backup". Pass this file to
+  RageRender, which will <tt>unpack</tt> it for you:
+
+      bundle exec jekyll unpack mycomic-2025-09-13.cflxml
+
+  You should end up with a full set of files like:
 
     _layouts
       archive.html
@@ -204,7 +228,7 @@ description: |-
 
   === Adding blogs
 
-  Add your blogs into a folder called `_posts`:
+  Add your blogs into a folder called <tt>_posts</tt>:
 
     cat _posts/2025-05-29-my-new-comic.md
     Hey guys, welcome to my new comic! It's gonna be so sick!
@@ -271,6 +295,16 @@ description: |-
   - anything else will display the extra page that has the matching
     <tt>slug</tt> in its Front Matter
 
+  === Putting changes on ComicFury
+
+  Once you're done making changes, you can <tt>pack</tt> your layout:
+
+      bundle exec jekyll pack
+
+  The resulting file can be uploaded to ComicFury by going to your Webcomic
+  Management, clicking "Edit Layout", then in the box labelled "Useful", click
+  "Restore Layout Backup".
+
   === Stuff that doesn't work
 
   Here is a probably incomplete list of things you can expect to be different
@@ -319,9 +353,11 @@ files:
 - assets/archive-comics.html
 - assets/archive.html
 - assets/blog.html
+- assets/comic-not-found.html
 - assets/overview.html
 - assets/search.html
 - lib/ragerender.rb
+- lib/ragerender/cflxml.rb
 - lib/ragerender/date_formats.rb
 - lib/ragerender/functions.rb
 - lib/ragerender/jekyll.rb