ragerender 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f4de79ae989bb91629afddccfe914b06ac2a734bf1e3be4394e3be6377025d
-  data.tar.gz: 22e88907930952d291a3a79868fb8927ce9592a8b30304ee2136d2fe347bda0d
+  metadata.gz: aedbeb388659f01299aa3694a3f30bd1368e09e9f729caa31334fff4300c6b7c
+  data.tar.gz: 11e966fefecb160bf9992f6697ae8fc23dbe299095c1bc458af6395fb29903c8
 SHA512:
-  metadata.gz: 8bde6a8ebb2c8495ddc554d053088e0ae163250cd5ee24775e13d8322656c7c9578098852fcdf5527880edf41eaa5b6493fbe523321944850084a54c6df35bd2
-  data.tar.gz: 55a5fed8c1912be039122714f98afe2c50c019ecc2687592ccf502ac98cb2b6931910f86e3c52c7384537e77bd7142b6865e487659a8ab328b026748d1864f93
+  metadata.gz: cbdffe416a3edb68d95c256456341c19199d09d71cbc0ef8d3a2f3b41b362048ec81d67848982beca07d2560d4a164758861c152d9b24d71f76010ee45bfc793
+  data.tar.gz: 266d915e6744dd58bf1f5db3fe795105190f9a09081ed03b596d7c58420e258d0f3ff7e1546c209c051bfb936654583d528c5555835ce5340b2863f0158baf67

data/README.rdoc

@@ -60,10 +60,14 @@ The file name of the image will be the title of your comic page. And that's it,
 you added your first comic!
 
 If you want to add an author note, create a text file in a folder called
-<tt>_comics</tt> that has the same file name, but with a <tt>.md</tt> extension:
+<tt>_comics</tt> that has the same file name, but with a <tt>.txt</tt> extension:
 
   mkdir _comics
-  echo "Check out my cool comic y'all!" > '_comics/My first page.md'
+  echo "Check out my cool comic y'all!" > '_comics/My first page.txt'
+
+Or use HTML:
+
+  echo "This is my <strong>first</strong> page!" > '_comics/My first page.html'
 
 Generate the site using:
 

data/lib/ragerender/functions.rb

@@ -1,15 +1,38 @@
 require 'cgi'
+require 'json'
 
 # Include this module to get ComicFury intrinsic functions available in
 # templates.
 module RageRender
   module TemplateFunctions
     def js str
-      '"' + CGI.escape_html(str) + '"'
+      JSON.generate(str, script_safe: true, ascii_only: true).gsub(/[<>'&]|\\"/) do |m|
+        '\u' + sprintf('%04x', m.chars.last.ord).upcase
+      end
     end
 
     def randomnumber a, b
-      rand a..b
+      rand a.to_i..b.to_i
+    end
+
+    # Unescape all HTML entities in the input
+    def rawhtml str
+      CGI.unescape_html str
+    end
+
+    # https://github.com/Shopify/liquid/blob/9bb7fbf123e6e2bd61e00189b1c83159f375d3f3/lib/liquid/standardfilters.rb#L24-L29
+    # Used under the MIT License.
+    STRIP_HTML_BLOCKS = Regexp.union(
+      %r{<script.*?</script>}m,
+      /<!--.*?-->/m,
+      %r{<style.*?</style>}m,
+    )
+    STRIP_HTML_TAGS = /<.*?>/m
+
+    # This is only used for ERB – for Liquid, we use the native `strip_html`
+    # This pretty much mirrors the Liquid implementation.
+    def removehtmltags str
+      str.gsub(STRIP_HTML_BLOCKS, '').gsub(STRIP_HTML_TAGS, '')
     end
   end
 end

data/lib/ragerender/jekyll/archive.rb

@@ -2,7 +2,7 @@ require 'jekyll/generator'
 require 'jekyll/drops/drop'
 require_relative 'comics'
 require_relative 'pagination'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 # Pass the right variables to archive pages. Note that this doesn't apply to
 # chapter pages because they are not "pages"
@@ -98,7 +98,7 @@ module RageRender
   # A Drop that provides all of the page variables for the archive pages.
   class ArchiveDrop < Jekyll::Drops::Drop
     private delegate_method_as :data, :fallback_data
-    extend NamedDataDelegator
+    extend Pipettes
 
     def ischapterarchive
       @obj.type == :chapters

data/lib/ragerender/jekyll/blog.rb

@@ -1,7 +1,7 @@
 require 'jekyll/hooks'
 require 'jekyll/drops/document_drop'
 require_relative '../date_formats'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 Jekyll::Hooks.register :posts, :pre_render do |post, payload|
   payload.merge! RageRender::BlogDrop.new(post).to_liquid
@@ -10,11 +10,17 @@ end
 module RageRender
   class BlogDrop < Jekyll::Drops::DocumentDrop
     private delegate_method_as :data, :fallback_data
-    extend NamedDataDelegator
+    extend Pipettes
 
-    def_data_delegator :title, :blogtitle
     def_data_delegator :author, :authorname
-    delegate_method_as :content, :blog
+
+    def blogtitle
+      escape @obj.data['title']
+    end
+
+    def blog
+      maybe_escape @obj.content
+    end
 
     def posttime
       comicfury_date @obj.date

data/lib/ragerender/jekyll/blog_archive.rb

@@ -3,7 +3,7 @@ require 'jekyll/drops/drop'
 require 'jekyll/drops/document_drop'
 require_relative '../date_formats'
 require_relative 'pagination'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 # Pass the right variables to blog archive pages.
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
@@ -90,7 +90,7 @@ module RageRender
   # Data representing a single paginated blog entry, as available from
   # [l:blogs_paginated].
   class PaginatedBlogDrop < Jekyll::Drops::DocumentDrop
-    extend NamedDataDelegator
+    extend Pipettes
 
     def_data_delegator :title, :blogtitle
     def_delegator :@obj, :url, :bloglink

data/lib/ragerender/jekyll/chapter.rb

@@ -1,6 +1,6 @@
 require 'jekyll/generator'
 require 'jekyll/drops/document_drop'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 require_relative 'setup_collection'
 
 # Add default values for the 'unchapter' which is used to hold all comics that
@@ -76,13 +76,16 @@ module RageRender
     PAGINATION_FIELDS = %w[ chaptername chapterdescription ]
 
     delegate_method_as :data, :fallback_data
-    extend NamedDataDelegator
+    extend Pipettes
     extend Forwardable
 
-    def_data_delegator :title, :chaptername
     def_data_delegator :description, :chapterdescription
     def_delegator :@obj, :url, :chapterarchiveurl
 
+    def chaptername
+      escape @obj.data['title']
+    end
+
     def cover
       cover_obj.url
     end

data/lib/ragerender/jekyll/comics.rb

@@ -2,7 +2,7 @@ require 'jekyll/generator'
 require 'jekyll/document'
 require 'jekyll/drops/document_drop'
 require_relative '../date_formats'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 Jekyll::Hooks.register :comics, :pre_render do |page, payload|
   payload.merge! RageRender::ComicDrop.new(page).to_liquid
@@ -76,16 +76,19 @@ module RageRender
   end
 
   class ComicDrop < Jekyll::Drops::DocumentDrop
-    extend NamedDataDelegator
+    extend Pipettes
 
     PAGINATION_FIELDS = %w[ comicurl comictitle posttime ]
 
     delegate_method_as :id, :comicid
-    def_data_delegator :title, :comictitle
     def_delegator :@obj, :url, :comicurl
     data_delegator 'rating'
     data_delegator 'votecount'
 
+    def comictitle
+      escape @obj.data['title']
+    end
+
     def posttime
       comicfury_date(@obj.date)
     end
@@ -99,11 +102,11 @@ module RageRender
     end
 
     def chaptername
-      chapter.data['title']
+      escape(chapter.data['title']) rescue nil
     end
 
     def chapterlink
-      chapter.url
+      chapter&.url
     end
 
     def dropdown
@@ -118,7 +121,7 @@ module RageRender
           dropdown << {
             'is_selected' => @obj == c,
             'is_disabled' => false,
-            'title' => c.data['title'],
+            'title' => escape(c.data['title']),
             'grouplabel' => c.data['chapter'],
             'newgroup' => new_group,
             'endgroup' => false,
@@ -141,7 +144,7 @@ module RageRender
     def authornotes
       @obj.data['authornotes'] || [{
         'is_reply' => false,
-        'comment' => @obj.content,
+        'comment' => maybe_escape(@obj.content),
         'isguest' => false,
         'avatar' => nil,
         'authorname' => @obj.data['author'],
@@ -152,8 +155,12 @@ module RageRender
     end
 
     def custom
-      @obj.data.fetch('custom', {}).reject do |k, v|
+      chapter_data = chapter.nil? ? {} : chapter.data.fetch('custom', {})
+      comic_data = @obj.data.fetch('custom', {})
+      chapter_data.merge(comic_data).reject do |k, v|
         v.nil? || (v.respond_to?(:empty?) && v.empty?)
+      end.transform_values do |v|
+        v.is_a?(String) ? escape(v) : v
       end
     end
 
@@ -173,18 +180,6 @@ module RageRender
       @obj.next_doc&.url
     end
 
-    def comicimageurl
-      File.join (@obj.site.baseurl || ''), image_relative_path
-    end
-
-    def comicwidth
-      image_obj.data['width'] ||= Dimensions.width image_path
-    end
-
-    def comicheight
-      image_obj.data['height'] ||= Dimensions.height image_path
-    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
@@ -215,16 +210,12 @@ module RageRender
       @obj.site.collections['chapters'].docs.detect {|c| c.data['slug'] == @obj.data['chapter'] }
     end
 
-    def image_obj
-      @image_obj ||= @obj.site.static_files.detect {|f| f.relative_path == image_relative_path }
-    end
-
-    def image_path
-      image_obj.path
-    end
+    data_delegator 'image'
+    def_image_metadata :image
 
-    def image_relative_path
-      Pathname.new('/').join(@obj.data['image']).to_s
-    end
+    public
+    alias comicimageurl image_url
+    alias comicwidth image_width
+    alias comicheight image_height
   end
 end

data/lib/ragerender/jekyll/error.rb

@@ -1,4 +1,4 @@
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'error-page'
@@ -9,7 +9,7 @@ end
 module RageRender
   class ErrorDrop < Jekyll::Drops::Drop
     private delegate_method_as :data, :fallback_data
-    extend NamedDataDelegator
+    extend Pipettes
     extend Forwardable
 
     def_data_delegator :title, :errortitle

data/lib/ragerender/jekyll/pipettes.rb

@@ -0,0 +1,53 @@
+# Pipettes help you make drops.
+require 'cgi'
+
+module RageRender
+  module Pipettes
+    def def_data_delegator key, aliaz
+      define_method(aliaz.to_sym) do
+        @obj.data[key.to_s]
+      end
+    end
+
+    def self.extended mod
+      mod.define_method(:escape) do |str|
+        str.nil? ? nil : CGI.escapeHTML(str)
+      end
+      mod.send(:private, :escape)
+
+      mod.define_method(:maybe_escape) do |str|
+        Pathname.new(@obj.path).extname != '.html' ?  escape(str) : str
+      end
+      mod.send(:private, :maybe_escape)
+    end
+
+    def def_image_metadata prefix
+      define_method(:"#{prefix}_relative_path") do
+        Pathname.new('/').join(send(prefix.to_sym)).to_path
+      end
+
+      define_method(:"#{prefix}_url") do
+        File.join (@obj.site.baseurl || ''), send(:"#{prefix}_relative_path")
+      end
+
+      define_method(:"#{prefix}_obj") do
+        unless instance_variable_defined? :"@#{prefix}_obj"
+          instance_variable_set(:"@#{prefix}_obj", @obj.site.static_files.detect {|f| f.relative_path == send(:"#{prefix}_relative_path") })
+        end
+        instance_variable_get(:"@#{prefix}_obj")
+      end
+
+      define_method(:"#{prefix}_path") do
+        send(:"#{prefix}_obj").path
+      end
+
+      define_method(:"#{prefix}_width") do
+        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
+      end
+    end
+  end
+end

data/lib/ragerender/jekyll.rb

@@ -14,7 +14,7 @@ require_relative 'jekyll/chapter'
 require_relative 'jekyll/overview'
 require_relative 'jekyll/error'
 require_relative 'jekyll/search'
-require_relative 'jekyll/named_data_delegator'
+require_relative 'jekyll/pipettes'
 require_relative 'jekyll/setup_collection'
 
 Jekyll::Hooks.register :site, :after_init do |site|
@@ -89,19 +89,25 @@ end
 
 class RageRender::WebcomicDrop < Jekyll::Drops::Drop
   extend Forwardable
-  extend RageRender::NamedDataDelegator
+  extend RageRender::Pipettes
 
   def self.def_config_delegator source, target
     define_method(target) { @obj.site.config[source.to_s] }
   end
 
-  def_config_delegator :title, :webcomicname
-  def_config_delegator :description, :webcomicslogan
   def_config_delegator :search, :searchon
   %w{bannerads allowratings showpermalinks showcomments allowcomments}.each do |var|
     def_config_delegator var, var
   end
 
+  def webcomicname
+    escape @obj.site.config['title']
+  end
+
+  def webcomicslogan
+    escape @obj.site.config['description']
+  end
+
   def webcomicurl
     @obj.site.baseurl
   end
@@ -111,7 +117,7 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
   end
 
   def copyrights
-    @obj.site.config['copyrights'].gsub('[year]', Date.today.year.to_s)
+    escape @obj.site.config['copyrights'].gsub('[year]', Date.today.year.to_s)
   end
 
   def banner
@@ -122,6 +128,11 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
     Pathname.new(@obj.site.baseurl || '/').join(@obj.site.config['webcomicavatar'] || '').to_path
   end
 
+  def webcomicicon
+    @obj.site.config.fetch('webcomicavatar', '')
+  end
+  def_image_metadata :webcomicicon
+
   def hasblogs
     @obj.site.posts.docs.any?
   end
@@ -132,7 +143,7 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
 
   def extrapages
     @obj.site.pages.reject {|page| page.data['hidden'] }.map do |page|
-      {'link' => page.url, 'title' => page.data['title']}
+      {'link' => page.url, 'title' => escape(page.data['title'])}
     end
   end
 
@@ -150,8 +161,19 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
     css_files.map {|f| File.read f }.join
   end
 
+  def layoutcss
+    <<~HTML
+    <style type="text/css">
+      #{css}
+    </style>
+    HTML
+  end
+
   delegate_method_as :url, :permalink
-  def_data_delegator :title, :pagetitle
+
+  def pagetitle
+    escape @obj.data['title']
+  end
 
   def iscomicpage
     @obj.type == :comics

data/lib/ragerender/language.rb

@@ -40,17 +40,18 @@ module RageRender
     # CONDITIONAL tests for equality: 'c:variable=My comic about bees' => Conditional.new(false, Variable.new(['variable']), '=', 'My comic about bees')
     # CONDITIONAL tests for inequality: 'c:variable!=My comic about bees' => Conditional.new(false, Variable.new(['variable']), '!=', 'My comic about bees')
     # CONDITIONAL tests for greater than: 'c:variable>=3' => Conditional.new(false, Variable.new(['variable']), '>=', '3')
+    # CONDITIONAL tests against two variables: 'c:variable=v:other' => Conditional.new(false, Variable.new(['variable']), '=', Variable.new(['other']))
     CONDITIONAL = ('c:'.r >> seq_(
       /!?/.r.map {|c| c == '!' },
       PATH.map {|p| Variable.new(p) },
       optional(OPERATOR),
-      optional(VARIABLE | TEXT))
+      optional(VARIABLE | /[^\]]+/.r))
     ).map {|(reversed, lhs, operator, rhs)| Conditional.new reversed, lhs, operator, rhs }
 
     # FUNCTION with no arguments: 'f:cowsay' => Function.new("cowsay", [])
     # FUNCTION with a variable argument: 'f:js|v:foo' => Function.new('js', [Variable.new(['foo'])])
     # FUNCTION with literal arguments: 'f:add|2|3' => Function.new('add', ['2', '3'])
-    FUNCTION = ('f:'.r >> seq(IDENT, ('|'.r >> (VARIABLE | TEXT)).star)).map {|(name, params)| Function.new name, params }
+    FUNCTION = ('f:'.r >> seq(IDENT, ('|'.r >> (VARIABLE | /[^\]\|]+/.r)).star)).map {|(name, params)| Function.new name, params }
 
     # TAG matches variable tags: '[v:value]' => Variable.new(["value"])
     # TAG matches loop tags: '[l:loop]' => Loop.new(["loop"])

data/lib/ragerender/to_erb.rb

@@ -70,7 +70,7 @@ module RageRender
           when /^[0-9]+$/
             param
           else
-            "\"#{param}\""
+            "\"#{param.gsub(/['"]/) {|c| "\\" + c}}\""
           end
         end
 

data/lib/ragerender/to_liquid.rb

@@ -1,17 +1,26 @@
+require 'digest'
 require_relative 'language'
 
 module RageRender
   LIQUID_FUNCTIONS = {
-    'add' => 'plus',
-    'subtract' => 'minus',
-    'multiply' => 'times',
-    'divide' => 'divided_by',
+    'add' => proc {|f| [Language::Function.new('plus', f.params)] },
+    'subtract' => proc {|f| [Language::Function.new('minus', f.params)] },
+    'multiply' => proc {|f| [Language::Function.new('times', f.params)] },
+    'divide' => proc {|f| [Language::Function.new('divided_by', f.params)] },
+    'removehtmltags' => proc {|f| Language::Function.new('strip_html', f.params) },
   }
 
-  def self.render_value value
+  def self.render_value value, literals
     case value
     when String
-      value =~ /^[0-9]+$/ ? value : "\"#{value}\""
+      case value
+      when /^[0-9]+$/
+        value
+      when /"'/
+        literals[value]
+      else
+        "\"#{value}\""
+      end
     when Language::Variable
       if value.path.first == 'l' && value.path.last == 'iteration'
         'forloop.index0'
@@ -20,6 +29,10 @@ module RageRender
       else
         value.path.join('.')
       end
+    when Language::Function
+      params = value.params.map {|p| render_value p, literals }
+      args = params.drop(1).map {|p| "#{value.name}: #{p}" }.join(' | ')
+      [params.first, args.empty? ? value.name : args].join(' | ')
     when nil
       ""
     end
@@ -27,20 +40,21 @@ module RageRender
 
   def self.to_liquid document
     tag_stack = Array.new
+    literals = Hash.new {|cache, l| cache[l] = "str" + Digest::MD5.hexdigest(l)}
 
-    document.map do |chunk|
+    chunks = document.map do |chunk|
       case chunk
       when String
         chunk
 
       when Language::Variable
-        "{{ #{render_value chunk} }}"
+        "{{ #{render_value chunk, literals} }}"
 
       when Language::Conditional
         tag_stack << (chunk.reversed ? :endunless : :endif)
 
-        lhs = render_value chunk.lhs
-        rhs = render_value chunk.rhs
+        lhs = render_value chunk.lhs, literals
+        rhs = render_value chunk.rhs, literals
         operator = chunk.operator
 
         if chunk.lhs.is_a?(Language::Variable) && chunk.lhs.path.first == "l"
@@ -76,10 +90,9 @@ module RageRender
         output.join
 
       when Language::Function
-        params = chunk.params.map {|p| render_value p }
-        name = LIQUID_FUNCTIONS.fetch(chunk.name, chunk.name)
-        args = params.drop(1).map {|p| "#{name}: #{p}" }.join(' | ')
-        "{{ #{params.first} | #{args.empty? ? name : args} }}"
+        *output, func = LIQUID_FUNCTIONS.fetch(chunk.name, proc{|f| f}).call(chunk)
+        output << "{{ #{render_value(func, literals)} }}"
+        output.join
 
       when Language::Loop
         tag_stack << :endfor
@@ -96,6 +109,10 @@ module RageRender
         end
       end
     end
+
+    literals.map do |(value, name)|
+      "{% capture #{name} %}#{value}{% endcapture %}"
+    end + chunks
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragerender
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Simon Worthington
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-02 00:00:00.000000000 Z
+date: 2025-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsec
@@ -138,10 +138,14 @@ description: |-
   you added your first comic!
 
   If you want to add an author note, create a text file in a folder called
-  <tt>_comics</tt> that has the same file name, but with a <tt>.md</tt> extension:
+  <tt>_comics</tt> that has the same file name, but with a <tt>.txt</tt> extension:
 
     mkdir _comics
-    echo "Check out my cool comic y'all!" > '_comics/My first page.md'
+    echo "Check out my cool comic y'all!" > '_comics/My first page.txt'
+
+  Or use HTML:
+
+    echo "This is my <strong>first</strong> page!" > '_comics/My first page.html'
 
   Generate the site using:
 
@@ -327,9 +331,9 @@ files:
 - lib/ragerender/jekyll/chapter.rb
 - lib/ragerender/jekyll/comics.rb
 - lib/ragerender/jekyll/error.rb
-- lib/ragerender/jekyll/named_data_delegator.rb
 - lib/ragerender/jekyll/overview.rb
 - lib/ragerender/jekyll/pagination.rb
+- lib/ragerender/jekyll/pipettes.rb
 - lib/ragerender/jekyll/search.rb
 - lib/ragerender/jekyll/setup_collection.rb
 - lib/ragerender/language.rb

data/lib/ragerender/jekyll/named_data_delegator.rb

@@ -1,9 +0,0 @@
-module RageRender
-  module NamedDataDelegator
-    def def_data_delegator key, aliaz
-      define_method(aliaz.to_sym) do
-        @obj.data[key.to_s]
-      end
-    end
-  end
-end