ragerender 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 670837503b9bdfb7e314412c2ad7f3fbed616035c83e231e94afbc1a8461ae7d
-  data.tar.gz: 4642302a27d7a2433267abca12fda09703a5b583593501279f87196f0885aa28
+  metadata.gz: f50082e3a10f4085a8bec12f5dbc5386af2fa209239abffc1a01c051e6ed3ea4
+  data.tar.gz: eb27a5b3de3f325b9c998174c7e2be1a37ebe953c3595431833619d2ff261fdb
 SHA512:
-  metadata.gz: 6dcfa8001b76f24b00360b52da55889307e2ada02b93b5fe9f1dfa8561b28f3c2cf6939a477977f27c356c43a1e7a596ba7d5007f371a689b9b17b2ccb29e7d1
-  data.tar.gz: 687ccd2273c923d13178dce12e9de7afba951e6bcabe576c9c1fe67e6a2a21b987b99dda8a73bd95897ca930cd05b96e7029af377e48e7387e6fd3f1847892e4
+  metadata.gz: 1e0a5e77617c32868ca965f36e903ee208442de230d620499802d2dbad9c2c110341feb32077b5cc7a41fee69f4a81a95f307bff405b9098c13c28b45fa96dd8
+  data.tar.gz: 8d41968f7a7ff34622c489fad7731e7dcf8a8573aea3871bf869538eb086503c7116102c87291a395123e23a6658affa4939f497a8b214846b56a8084dc97a20

data/lib/ragerender/jekyll/archive.rb

@@ -49,10 +49,10 @@ module RageRender
   # handle that pagination manually by calling another paginator for each page
   # we generate here.
   class ChapterArchiveGenerator < Jekyll::Generator
-    priority :high
+    priority :normal
 
     def generate site
-      site.collections['chapters'].docs.each do |page|
+      site.collections['chapters'].docs.to_a.dup.each do |page|
         page.data['mode'] = 'chapters'
         ChapterArchivePaginator.new(page).generate(site)
       end
@@ -72,6 +72,12 @@ module RageRender
       @page
     end
 
+    def duplicate original
+      page = Jekyll::Document.new(original.path, site: original.site, collection: original.collection)
+      page.merge_data! original.data, source: 'original document'
+      page
+    end
+
     def num_pages site
       site.collections['comics'].docs.select do |c|
         c.data['chapter'] == @page.data['slug']
@@ -79,7 +85,13 @@ module RageRender
     end
 
     def permalink
-      Pathname.new(@page.permalink).join('../').join('page/:number/index.html').to_path
+      path = Pathname.new(@page.url)
+      path = path.dirname unless @page.url.end_with?('/')
+      path.join('page/:number/index.html').to_path
+    end
+
+    def handle_page page
+      page.collection.docs << page
     end
   end
 
@@ -102,7 +114,9 @@ module RageRender
 
     def chapters
       unless show_chapter_overview
-        @obj.site.collections['chapters'].docs.map do |page|
+        @obj.site.collections['chapters'].docs.reject do |page|
+          page.data['hidden']
+        end.map do |page|
           ChapterDrop.new(page).to_liquid
         end
       end

data/lib/ragerender/jekyll/chapter.rb

@@ -1,9 +1,13 @@
 require 'jekyll/generator'
 require 'jekyll/drops/document_drop'
+require_relative 'named_data_delegator'
+require_relative 'setup_collection'
 
 # Add default values for the 'unchapter' which is used to hold all comics that
 # don't have a chapter.
 Jekyll::Hooks.register :site, :after_init do |site|
+  setup_collection site, :chapters, '/archive/:slug/', layout: 'archive'
+
   site.config['defaults'].prepend({
     'scope' => {
       'path' => '_chapters/0.html',
@@ -32,6 +36,7 @@ module RageRender
       existing = Set.new(site.collections['chapters'].docs.map {|c| c.data['slug'] })
       missing = required - existing
       missing.each do |slug|
+        Jekyll.logger.debug 'Adding chapter:', slug
         filename = Pathname.new(site.collections['chapters'].relative_directory).join("#{slug}.html")
         chapter = Jekyll::Document.new(filename.to_path, site: site, collection: site.collections['chapters'])
         chapter.send(:merge_defaults)

data/lib/ragerender/jekyll/pagination.rb

@@ -1,15 +1,16 @@
 module RageRender
-  def self.duplicate_page page
-    Jekyll::Page.new(
-      page.site,
-      page.instance_variable_get(:"@base"),
-      page.instance_variable_get(:"@dir"),
-      page.name,
-    )
-  end
-
   module PaginationGenerator
     def handle_page page
+      page.site.pages << page
+    end
+
+    def duplicate page
+      Jekyll::Page.new(
+        page.site,
+        page.instance_variable_get(:"@base"),
+        page.instance_variable_get(:"@dir"),
+        page.name,
+      )
     end
 
     def generate site
@@ -17,11 +18,11 @@ module RageRender
       archive.data['number'] = 1
 
       num_pages(site).times.each do |number|
-        paged_archive = RageRender.duplicate_page archive
+        paged_archive = duplicate archive
         paged_archive.data['permalink'] = permalink.gsub(/:number/, (number + 1).to_s)
         paged_archive.data['number'] = number + 1
+        paged_archive.data['hidden'] = true
         Jekyll.logger.debug 'Paginating:', paged_archive.data['permalink']
-        site.pages << paged_archive
         handle_page paged_archive
       end
     end

data/lib/ragerender/jekyll/setup_collection.rb

@@ -0,0 +1,19 @@
+def setup_collection site, label, permalink, **kwargs
+  site.config['collections'][label.to_s] = {
+    'output' => true,
+    'permalink' => permalink,
+  }
+
+  site.config['defaults'].prepend({
+    'scope' => {
+      'path' => '',
+      'type' => label.to_s,
+    },
+    'values' => {
+      'permalink' => permalink,
+      **kwargs.map do |k, v|
+        [k.to_s, v]
+      end.to_h,
+    },
+  })
+end

data/lib/ragerender/jekyll.rb

@@ -14,26 +14,7 @@ require_relative 'jekyll/overview'
 require_relative 'jekyll/error'
 require_relative 'jekyll/search'
 require_relative 'jekyll/named_data_delegator'
-
-def setup_collection site, label, permalink, **kwargs
-  site.config['collections'][label.to_s] = {
-    'output' => true,
-    'permalink' => permalink,
-  }
-
-  site.config['defaults'].prepend({
-    'scope' => {
-      'path' => '',
-      'type' => label.to_s,
-    },
-    'values' => {
-      'permalink' => permalink,
-      **kwargs.map do |k, v|
-        [k.to_s, v]
-      end.to_h,
-    },
-  })
-end
+require_relative 'jekyll/setup_collection'
 
 Jekyll::Hooks.register :site, :after_init do |site|
   # This is obviously quite naughty for many reasons,
@@ -46,7 +27,6 @@ Jekyll::Hooks.register :site, :after_init do |site|
 
   setup_collection site, :comics, '/:collection/:slug/', layout: 'comic-page', chapter: '0'
   setup_collection site, :posts, '/blogarchive/:slug/', layout: 'blog-display'
-  setup_collection site, :chapters, '/archive/:slug/', layout: 'archive'
 
   site.config['defaults'].push({
     'scope' => {

data/lib/ragerender/language.rb

@@ -28,7 +28,7 @@ module RageRender
     # PATH parses dotted paths: 'dotted.name' => ['dotted', 'name']
     PATH = IDENT.join('.'.r).even
 
-    OPERATOR = %w{= != ~ !~ < > <= >= % !%}.map(&:r).reduce {|a, b| a | b }
+    OPERATOR = %w{= != ~ !~ <= >= < > % !%}.map(&:r).reduce {|a, b| a | b }
 
     # VARIABLE parses names: 'v:name' => Variable.new(['name'])
     # VARIABLE parses dotted paths: 'v:dotted.name' => Variable.new(['dotted', 'name'])
@@ -39,6 +39,7 @@ module RageRender
     # CONDITIONAL tests for falsiness: 'c:!variable' => Conditional.new(true, Variable.new(['variable']), nil, nil)
     # 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 = ('c:'.r >> seq_(
       /!?/.r.map {|c| c == '!' },
       PATH.map {|p| Variable.new(p) },

data/lib/ragerender/to_erb.rb

@@ -1,6 +1,13 @@
 require_relative 'language'
 
 module RageRender
+  ERB_OPERATORS = {
+    'add' => '+',
+    'subtract' => '-',
+    'multiply' => '*',
+    'divide' => '/',
+  }
+
   def self.to_erb document
     document.map do |chunk|
       case chunk
@@ -8,32 +15,73 @@ module RageRender
         chunk
 
       when Language::Variable
-        "<%= #{chunk.path.join('.')} %>"
+        if chunk.path == ['l', 'aiteration']
+          '<%= (index+1) %>'
+        elsif chunk.path == ['l', 'iteration']
+          '<%= index %>'
+        else
+          "<%= #{chunk.path.join('.')} rescue nil %>"
+        end
 
       when Language::Conditional
+        lhs = chunk.lhs.path.join('.')
         rhs = case chunk.rhs
-        when String
-          "\"#{chunk.rhs}\""
         when Language::Variable
           chunk.rhs.path.join('.')
+        when /^[0-9]+$/
+          chunk.rhs
+        when String
+          "\"#{chunk.rhs}\""
         when nil
           ""
         end
-        "<% if #{chunk.reversed ? 'not ' : ''} #{chunk.lhs.path.join('.')} #{chunk.operator} #{rhs} %>"
+
+        lhs, rhs, operator = case chunk.operator
+        when '='
+          [lhs, rhs, '==']
+        when '%', '!%'
+          ["#{lhs} % #{rhs}", 0, if chunk.operator[0] == '!' then '!=' else '==' end]
+        when '~', '!~'
+          ["#{lhs}.downcase", "#{rhs}.downcase", if chunk.operator[0] == '!' then '!=' else '==' end]
+        else
+          [lhs, rhs, chunk.operator]
+        end
+
+        if chunk.lhs.is_a?(Language::Variable) && chunk.lhs.path.first == "l"
+          case chunk.lhs.path.last
+          when "is_first", "is_last"
+            lhs = "index"
+            rhs = {"is_first" => "0", "is_last" => "(forloop.size - 1)"}[chunk.lhs.path.last]
+            operator = "=="
+          when "is_even", "is_odd"
+            lhs = 'index % 2'
+            rhs = '0'
+            operator = {'is_even' => '==', 'is_odd' => '!='}[chunk.lhs.path.last]
+          end
+        end
+
+        "<% if #{chunk.reversed ? 'not ' : ''} #{lhs} #{operator} #{rhs} %>"
 
       when Language::Function
         params = chunk.params.map do |param|
           case param
           when Language::Variable
             param.path.join('.')
+          when /^[0-9]+$/
+            param
           else
             "\"#{param}\""
           end
         end
-        "<%= #{chunk.name}(#{params.join(', ')}) %>"
+
+        if ERB_OPERATORS.include? chunk.name
+          "<%= #{params.join(ERB_OPERATORS[chunk.name])} %>"
+        else
+          "<%= #{chunk.name}(#{params.join(', ')}) %>"
+        end
 
       when Language::Loop
-        "<% for l in #{chunk.path.join('.')} %>"
+        "<% #{chunk.path.join('.')}.each_with_object(#{chunk.path.join('.')}).each_with_index do |(l, forloop), index| %>"
 
       when Language::Layout
         "<%= #{chunk.name} %>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragerender
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Simon Worthington
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-30 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsec
@@ -316,6 +316,7 @@ files:
 - lib/ragerender/jekyll/overview.rb
 - lib/ragerender/jekyll/pagination.rb
 - lib/ragerender/jekyll/search.rb
+- lib/ragerender/jekyll/setup_collection.rb
 - lib/ragerender/language.rb
 - lib/ragerender/to_erb.rb
 - lib/ragerender/to_liquid.rb