jekyll-hackclub 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de886c16f8e0135c5cf61d9918210a0ea31905bb51f5292d539fcd1ff27aaf4c
-  data.tar.gz: 6649112e691948cb83a94829364d5a4c0b22b617c4c3e5d600aeccab79973200
+  metadata.gz: '0495d9b427da78fb0c05e06159bebbd4c8b345398450d2962274fc0acd8e1bc4'
+  data.tar.gz: 81c1e2d3ac7e91326cd00c26a96eb353af2c1b141239aa449005e89d2801545c
 SHA512:
-  metadata.gz: 9fef2b54b058eba122b6ef06cf801d271fdefc4d00e71b9a5c554f09a6fe03272f194a5f0d629c45f8a812ba1a1ec0091f0f0795df31cf9df4f99bcbfe0ef6af
-  data.tar.gz: f39585ba8cc849022224092743768f83c8d2864942523526aade46a4326b6de4efcb2603ca1ec81d89572c97c840c808bdc7c581799026d78de2b5d1b4dc63fe
+  metadata.gz: 766b2fdcd3e220a8d75bc500f8232f4dad39bcb3f800c10006c5e2735a1a2acb40ab8f4169b5e1933ae4240d6ffec87d711bbbc4568e2499774cbe8f9c22e049
+  data.tar.gz: 6cff13dae2e12a3a47aad22d598d53dd6a6f88181621c9a385f3793b2d25253861688b41810ad31498d9513fd90f9460e681c8824d42f27fbcc67701e5e7d34f

data/lib/args-parser.rb

@@ -0,0 +1,47 @@
+module StringManipulation
+    def self.uppercase(content)
+        content.upcase
+    end
+
+    def self.downcase(content)
+        content.downcase
+    end
+
+    def self.capitalize(content)
+        content.capitalize
+    end
+
+    def self.size(content)
+        content.size
+    end
+end
+
+module ArgsParser
+    def self.split_args(content)
+        content.split(" ; ").map(&:strip)
+    end
+    
+    def self.eval_pipes_with_val(value, pipes)
+        pipes.each do |pipe|
+            if (match = pipe.match(/\[(-?\d+):(-?\d+)\]/))
+                start_idx, end_idx = match[1].to_i, match[2].to_i
+                value = value[start_idx..end_idx]
+            elsif StringManipulation.respond_to?(pipe)
+                value = StringManipulation.public_send(pipe, value)
+            else
+                raise ArgumentError, "Unkown pipe '#{pipe}'"
+            end
+        end
+        value
+    end
+
+    def self.eval_pipes(arg)
+        parts = arg.split(" | ").map(&:strip)
+        value = parts.shift
+        eval_pipes_with_val(value, parts)
+    end
+
+    def self.parse(content)
+        split_args(content).map { |arg| eval_pipes(arg) }
+    end
+end

data/lib/jekyll-hackclub.rb

@@ -1,5 +1,7 @@
-require_relative "./emoji"
-require_relative "./mentions"
-require_relative "./server-bridge"
-require_relative "./user-tag"
-require_relative "./channel-tag"
+require_relative "./tags/emoji"
+require_relative "./tags/mentions"
+require_relative "./tags/user-tag"
+require_relative "./tags/channel-tag"
+require_relative "./tags/parser"
+
+require_relative "./server-bridge"

data/lib/{channel-tag.rb → tags/channel-tag.rb}

@@ -1,14 +1,17 @@
 require "jekyll"
-require_relative "./server-bridge"
+require_relative "../server-bridge"
 
 module Jekyll
     class HackclubChannelTag < Liquid::Tag
         def initialize(tagName, content, tokens)
             super
             content = content.strip()
-            @id, *rest = content.split(" ", 2)
-            keys = rest.join.split(".")
+            @id, keys, pipes = ArgsParser.split_args(content)
+            pipes = pipes || ""
+            keys = keys.split(".")
+
             @data = HackclubRequest.raw_channel(@id).dig("channel").dig(*keys)
+            @data = ArgsParser.eval_pipes_with_val(@data, pipes.split(" | ").map(&:strip))
         end
 
         def render(context)

data/lib/{emoji.rb → tags/emoji.rb}

@@ -1,5 +1,5 @@
 require "jekyll"
-require_relative "./server-bridge"
+require_relative "../server-bridge"
 
 module Jekyll
     class HackclubEmoji < Liquid::Tag

data/lib/{mentions.rb → tags/mentions.rb}

@@ -1,5 +1,6 @@
 require "jekyll"
-require_relative "./server-bridge"
+require_relative "../args-parser"
+require_relative "../server-bridge"
 
 module Jekyll
     class HackclubMention < Liquid::Tag
@@ -10,11 +11,18 @@ module Jekyll
         end
 
         def render(context)
+            parts = @id.split(" | ")
+            @id = parts[0]
+            @pipes = parts[1..-1]
+
             if @id && @id.start_with?("U")
+
                 display_name = @args[1] || HackclubRequest.resolve_username(@id)
+                display_name = ArgsParser.eval_pipes_with_val(display_name, @pipes)
                 %Q{<a href="https://hackclub.slack.com/team/#{@id}" class="hackclub-mention hackclub-user" target="_blank">@#{display_name}</a>}
             elsif @id && @id.start_with?("C")
                 display_name = @args[1] || HackclubRequest.resolve_channel(@id)
+                display_name = ArgsParser.eval_pipes_with_val(display_name, @pipes)
                 %Q{<a href="https://hackclub.slack.com/archives/#{@id}" class="hackclub-mention hackclub-channel" target="_blank">##{display_name}</a>}
             end
         end

data/lib/tags/parser.rb

@@ -0,0 +1,18 @@
+require "jekyll"
+require_relative "../server-bridge"
+require_relative "../args-parser"
+
+module Jekyll
+    class HackclubParser < Liquid::Tag
+        def initialize(tagName, content, tokens)
+            super
+            @content = content
+        end
+
+        def render(context)
+            %Q{#{ArgsParser.parse(@content)}}
+        end
+    end
+
+    Liquid::Template.register_tag "_parser", HackclubParser
+end

data/lib/{user-tag.rb → tags/user-tag.rb}

@@ -1,14 +1,18 @@
 require "jekyll"
-require_relative "./server-bridge"
+require_relative "../args-parser"
+require_relative "../server-bridge"
 
 module Jekyll
     class HackclubUserTag < Liquid::Tag
         def initialize(tagName, content, tokens)
             super
             content = content.strip()
-            @id, *rest = content.split(" ", 2)
-            keys = rest.join.split(".")
+            @id, keys, pipes = ArgsParser.split_args(content)
+            pipes = pipes || ""
+            keys = keys.split(".")
+
             @data = HackclubRequest.raw_user(@id).dig("user").dig(*keys)
+            @data = ArgsParser.eval_pipes_with_val(@data, pipes.split(" | ").map(&:strip))
         end
 
         def render(context)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-hackclub
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - MathiasDPX
@@ -41,12 +41,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/channel-tag.rb
-- lib/emoji.rb
+- lib/args-parser.rb
 - lib/jekyll-hackclub.rb
-- lib/mentions.rb
 - lib/server-bridge.rb
-- lib/user-tag.rb
+- lib/tags/channel-tag.rb
+- lib/tags/emoji.rb
+- lib/tags/mentions.rb
+- lib/tags/parser.rb
+- lib/tags/user-tag.rb
 licenses:
 - MIT
 metadata: {}