ragerender 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f50082e3a10f4085a8bec12f5dbc5386af2fa209239abffc1a01c051e6ed3ea4
-  data.tar.gz: eb27a5b3de3f325b9c998174c7e2be1a37ebe953c3595431833619d2ff261fdb
+  metadata.gz: 87b99ec72e739c37527a89acfc8124efb5ed6f293446ee36ae84ffdc072f061b
+  data.tar.gz: cb2735417a459577704a526ff90b4723709101faca6ec4b7d927edf598dfc697
 SHA512:
-  metadata.gz: 1e0a5e77617c32868ca965f36e903ee208442de230d620499802d2dbad9c2c110341feb32077b5cc7a41fee69f4a81a95f307bff405b9098c13c28b45fa96dd8
-  data.tar.gz: 8d41968f7a7ff34622c489fad7731e7dcf8a8573aea3871bf869538eb086503c7116102c87291a395123e23a6658affa4939f497a8b214846b56a8084dc97a20
+  metadata.gz: 45d46421b5e611dbb14debb3e290a89dd50b38586c843d51da42557cf87402fc7a9afe354680e7cd5ca8cc05a33e7c338605fc1e0526190a848c64b5288315c1
+  data.tar.gz: c3f33f3eeb53ad63cfe135acd394a838446dd6270388605fa299f3d303ba6fb3876844b569b0b611b27f2c5d641a4d2256067b29863fdd60a97fffc8bc6074ea

data/README.rdoc

@@ -183,6 +183,20 @@ that and more with optional Front Matter:
   ---
   <h1>yo check out my bonus content!</h1>
 
+=== Controlling the front page
+
+As on ComicFury you have a few options for setting the front page of you site.
+You control this by setting a <tt>frontpage</tt> key in your site config.
+
+- <tt>latest</tt> will display the latest comic (also the default)
+- <tt>first</tt> will display the first comic
+- <tt>chapter</tt> will display the first comic in the latest chapter
+- <tt>blog</tt> will display the list of blog posts
+- <tt>archive</tt> will display the comic archive
+- <tt>overview</tt> will display the comic overview (blogs and latest page)
+- anything else will display the extra page that has the matching
+  <tt>slug</tt> in its Front Matter
+
 === Stuff that doesn't work
 
 Here is a probably incomplete list of things you can expect to be different

data/assets/blog.html

@@ -1,6 +1,6 @@
 ---
 title: Blog
 layout: blog-archive
-permalink: "/blog/"
+permalink: "/blog/index.html"
 hidden: true
 ---

data/lib/ragerender/functions.rb

@@ -0,0 +1,30 @@
+require 'cgi'
+
+# Include this module to get ComicFury intrinsic functions available in
+# templates.
+module RageRender
+  module TemplateFunctions
+    def js str
+      '"' + CGI.escape_html(str) + '"'
+    end
+
+    def randomnumber a, b
+      rand a.to_i..b.to_i
+    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/setup_collection.rb

@@ -2,6 +2,7 @@ def setup_collection site, label, permalink, **kwargs
   site.config['collections'][label.to_s] = {
     'output' => true,
     'permalink' => permalink,
+    'sort_by' => 'date',
   }
 
   site.config['defaults'].prepend({

data/lib/ragerender/jekyll.rb

@@ -3,6 +3,7 @@ require 'stringio'
 require 'jekyll'
 require 'dimensions'
 require_relative 'language'
+require_relative 'functions'
 require_relative 'to_liquid'
 require_relative 'date_formats'
 require_relative 'jekyll/archive'
@@ -39,6 +40,7 @@ Jekyll::Hooks.register :site, :after_init do |site|
 end
 
 Jekyll::Hooks.register :site, :post_read do |site|
+  Liquid::Template.register_filter(RageRender::TemplateFunctions)
   site.layouts.each do |(name, layout)|
     layout.data['layout'] = 'overall' unless name == 'overall'
     layout.content = RageRender.to_liquid(RageRender::Language.parse(StringIO.new(layout.content))).join
@@ -63,15 +65,15 @@ class RageRender::FrontpageGenerator < Jekyll::Generator
       collection = site.collections['comics'].docs
       chapter = comics.docs.last.data['chapter']
       comics.docs.detect {|c| c.data['chapter'] == chapter }
-    when 'overview'
+    when 'blog', 'archive', 'overview'
       collection = site.pages
-      site.pages.detect {|p| p.data["permalink"] == '/overview/index.html' }
+      site.pages.detect {|p| p.data["permalink"] == "/#{frontpage}/index.html" }
     else
       collection = site.pages
       site.pages.detect {|p| p.data["slug"] == frontpage }
     end.dup
-    index.instance_variable_set(:"@destination", {site.dest => File.join(site.dest, 'index.html')})
     index.instance_variable_set(:"@data", index.data.dup)
+    index.data['permalink'] = '/index.html'
     index.data['slug'] = 'frontpage'
     collection << index
   end

data/lib/ragerender/language.rb

@@ -40,6 +40,7 @@ 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) },

data/lib/ragerender/to_erb.rb

@@ -20,7 +20,7 @@ module RageRender
         elsif chunk.path == ['l', 'iteration']
           '<%= index %>'
         else
-          "<%= #{chunk.path.join('.')} rescue nil %>"
+          "<%= #{chunk.path.join('.')}.to_s.gsub(/'/, '&#039;').gsub(/\"/, '&quot;') rescue nil %>"
         end
 
       when Language::Conditional
@@ -76,7 +76,17 @@ module RageRender
 
         if ERB_OPERATORS.include? chunk.name
           "<%= #{params.join(ERB_OPERATORS[chunk.name])} %>"
+        elsif chunk.name == 'rawhtml'
+          "<%= #{params.first} %>"
         else
+          params = params.zip(chunk.params).map do |param, old_param|
+            case old_param
+            when Language::Variable
+              param + ".to_s.gsub(/'/, '&#039;').gsub(/\"/, '&quot;')"
+            else
+              param
+            end
+          end
           "<%= #{chunk.name}(#{params.join(', ')}) %>"
         end
 

data/lib/ragerender/to_liquid.rb

@@ -2,13 +2,37 @@ require_relative 'language'
 
 module RageRender
   LIQUID_FUNCTIONS = {
-    'add' => 'plus',
-    'subtract' => 'minus',
-    'multiply' => 'times',
-    'divide' => 'divided_by',
-    'js' => 'escape', # TODO: check these do the same thing!
+    '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| QUOTE_ESCAPER.call(Language::Function.new('strip_html', f.params)) },
+    'rawhtml' => proc {|f| f.params }
   }
 
+  QUOTE_REPLACEMENTS = {
+    '"' => '"',
+    "'" => ''',
+  }
+
+  REPLACE_QUOTES = ["replace: '\"', '"'", "replace: \"'\", '''"].join(' | ')
+
+  QUOTE_ESCAPER = proc do |f|
+    output = []
+    params = f.params.each_with_index do |param, index|
+      case param
+      when Language::Variable
+        new_name = param.path.join('_')
+        output << "{% assign #{new_name} = #{render_value(param)} | #{REPLACE_QUOTES} %}"
+        Language::Variable.new([new_name])
+      else
+        param
+      end
+    end
+    output << Language::Function.new(f.name, params)
+    output
+  end
+
   def self.render_value value
     case value
     when String
@@ -21,6 +45,10 @@ module RageRender
       else
         value.path.join('.')
       end
+    when Language::Function
+      params = value.params.map {|p| render_value p }
+      args = params.drop(1).map {|p| "#{value.name}: #{p}" }.join(' | ')
+      [params.first, args.empty? ? value.name : args].join(' | ')
     when nil
       ""
     end
@@ -35,7 +63,7 @@ module RageRender
         chunk
 
       when Language::Variable
-        "{{ #{render_value chunk} }}"
+        "{{ #{render_value chunk} | #{REPLACE_QUOTES} }}"
 
       when Language::Conditional
         tag_stack << (chunk.reversed ? :endunless : :endif)
@@ -77,10 +105,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, QUOTE_ESCAPER).call(chunk)
+        output << "{{ #{render_value(func)} }}"
+        output.join
 
       when Language::Loop
         tag_stack << :endfor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragerender
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Simon Worthington
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2025-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsec
@@ -253,6 +253,20 @@ description: |-
     ---
     <h1>yo check out my bonus content!</h1>
 
+  === Controlling the front page
+
+  As on ComicFury you have a few options for setting the front page of you site.
+  You control this by setting a <tt>frontpage</tt> key in your site config.
+
+  - <tt>latest</tt> will display the latest comic (also the default)
+  - <tt>first</tt> will display the first comic
+  - <tt>chapter</tt> will display the first comic in the latest chapter
+  - <tt>blog</tt> will display the list of blog posts
+  - <tt>archive</tt> will display the comic archive
+  - <tt>overview</tt> will display the comic overview (blogs and latest page)
+  - anything else will display the extra page that has the matching
+    <tt>slug</tt> in its Front Matter
+
   === Stuff that doesn't work
 
   Here is a probably incomplete list of things you can expect to be different
@@ -305,6 +319,7 @@ files:
 - assets/search.html
 - lib/ragerender.rb
 - lib/ragerender/date_formats.rb
+- lib/ragerender/functions.rb
 - lib/ragerender/jekyll.rb
 - lib/ragerender/jekyll/archive.rb
 - lib/ragerender/jekyll/blog.rb