jekyll-koziolekweb-tags 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43266d61852a499977df46bd3d4626c0368b121dc1d962857c41b0308470bf20
-  data.tar.gz: f5f7fcdcade5cdead24b51f2cf2cd46a06cf3d71f42c0d9cdfb37ff441ba9749
+  metadata.gz: 70ab6aa5e1facb748323e5fd524b6ba17ce3269488b588f8910c152a18c44f65
+  data.tar.gz: 931601af22d327e6343beeae416904f848c075819345b9b6c1bf27686f853be6
 SHA512:
-  metadata.gz: 5f8d6d2baee780bcfdc57cb95a4daea148c5a3650a309f0842fdee46b9bbf8179732685ea9fe3e8a97576ef22593851f1a2044a187e20754229f20ca0230536f
-  data.tar.gz: 31c0a52191c88d868658edecfb63432844f9953609bcacdc6df4c25419d3a71dd85a80cfabb070125ba49228b6b2d6a119780e452aae0e77054b7aa877e2c543
+  metadata.gz: be6015623679f1d32cf740055b83bb69155ae58c00c8e66cf4df339f24450f45304b7c7cae46c7f4cb1d741e456ac8ec29e09431679308f0e279db44610d6225
+  data.tar.gz: 6e0e6128e2bf5dd18b80cb2994102a62978a50b74f6cc290a0ac999f84740361087780aa5b8d92b2f296cde3cfe4d3b9f32929a20a7f5685ae30e434a68d5873

data/.tool-versions

@@ -0,0 +1,2 @@
+#ruby 2.6.5
+ruby 3.4.3

data/Gemfile

@@ -6,5 +6,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-
+gem "minitest"
+gem "liquid", "~> 4.0"
+gem "shellwords"
 gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]

data/Rakefile

@@ -1,4 +1,15 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-task default: %i[]
+require "rake/testtask"
+
+# Definiowanie zadania testowego
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/test_*.rb"]
+  t.warning = true
+end
+
+# Domyślne zadanie: uruchom testy
+task default: :test
+

data/lib/jekyll/koziolekweb/tags/version.rb

@@ -3,7 +3,7 @@
 module Jekyll
   module Koziolekweb
     module Tags
-      VERSION = "0.3.0"
+      VERSION = "0.4.1"
     end
   end
 end

data/lib/jekyll/koziolekweb/tags.rb

@@ -1,73 +1,222 @@
 # frozen_string_literal: true
 
+require "liquid"
+require "jekyll"
+require "jekyll/converters/markdown"
+require "shellwords"
+require "yaml"
+require "cgi"
 require_relative "tags/version"
 
 module Koziolekweb
   module Tags
     class Listing < Liquid::Block
-      @@file_state = {}
-
       def initialize(tag_name, markup, tokens)
         super
-
-        matched = /(\w+)\s+["'](.*?)["']/.match(markup)
-
+        matched = markup.strip.match(/\A(\w+)\s+["'](.+?)["']\z/)
         if matched
           @lang = matched[1]
           @title = matched[2]
         else
-          raise SyntaxError.new("
+          raise Liquid::SyntaxError, <<~ERROR.strip
             Invalid parameters for listing. Usage:
-                {% listing lang 'title' %}
-                code goes here
-                {% endlisting %}
-            got
-            #{markup}")
+              {% listing lang 'title' %}
+              code goes here
+              {% endlisting %}
+            Got:
+              #{markup}
+          ERROR
         end
       end
 
       def render(context)
-        current_file = context.registers[:page]["path"]
-        @@file_state[current_file] ||= 0
-        @@file_state[current_file] += 1
-        content = super
-        content_with_code_fence = "```#{@lang} #{content}```"
-        title_with_parese = "#{@title}"
+        page = context.registers[:page]
+        current_file = page["path"] if page.respond_to?(:[]) && page["path"]
+        current_file ||= page.path if page.respond_to?(:path)
+        current_file ||= "__global__"
+        context.registers[:listing_count] ||= {}
+        context.registers[:listing_count][current_file] ||= 0
+        listing_number = (context.registers[:listing_count][current_file] += 1)
+        content = super.chomp
 
-        "<p class='listing'> Listing #{@@file_state[current_file]}. #{@title_with_parese}</p>#{content_with_code_fence}"
+        markdown_converter = context.registers[:site].find_converter_instance(Jekyll::Converters::Markdown)
+        title_html = markdown_converter.convert(@title).strip.sub(%r{\A<p>(.*)</p>\z}, '\1')
+        markdown_code = "```#{@lang}\n#{content}\n```"
+        code_html = markdown_converter.convert(markdown_code).strip
+
+        <<~HTML
+            <p class='listing'> Listing #{listing_number}. #{title_html}</p>
+            #{code_html}
+          HTML
       end
     end
 
     class Offtop < Liquid::Block
+      VALID_DIRECTIONS = %w[right left].freeze
 
       def initialize(tag_name, markup, tokens)
         super
-        @direction = markup
+        @params = parse_params(markup)
+
+        @direction = @params.fetch('direction', 'right').strip
+
+        unless self.class::VALID_DIRECTIONS.include?(@direction)
+          raise ArgumentError, "Invalid direction '#{@direction}'. Allowed values are: #{VALID_DIRECTIONS.join(', ')}"
+        end
       end
 
       def render(context)
         content = super
         "<aside class=\"offtopic f-#{@direction}\">#{content}</aside>"
       end
+
+      private
+
+      def parse_params(text)
+        params = {}
+        text.scan(/(\w+)\s*:\s*("[^"]*"|\S+)/).each do |key, val|
+          val = val.delete_prefix('"').delete_suffix('"') if val.start_with?('"')
+          params[key] = val
+        end
+        params
+      end
     end
 
     class YtVideo < Liquid::Tag
       def initialize(tag_name, video_id, tokens)
         super
         @video_id = video_id.strip
+
+        if @video_id.empty? || !valid_video_id?(@video_id)
+          raise Liquid::SyntaxError, "Invalid video ID: #{@video_id.inspect}"
+        end
+
       end
 
       def render(_context)
         <<~HTML
-        <div class="video">
-          <iframe src="https://www.youtube-nocookie.com/embed/#{@video_id}" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
-        </div>
-      HTML
+          <div class="video">
+            <iframe title="Youtube Video" src="https://www.youtube-nocookie.com/embed/#{@video_id}" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+          </div>
+        HTML
       end
+
+      private
+
+      def valid_video_id?(video_id)
+        video_id.match?(/\A[\w-]{11}\z/)
+      end
+
     end
+
+    class Book < Liquid::Tag
+      MIN_ARGS = 5
+
+      def initialize(tag_name, markup, tokens)
+        super
+
+        args = Shellwords.split(markup)
+        raise Liquid::SyntaxError, "Invalid usage" if args.size < self::MIN_ARGS
+
+        @title, @author, @year, @isbn, @cover_url = args[0..4].map { _1.delete('"') }
+
+        unless @year.match?(/\A\d{4}\z/)
+          raise Liquid::SyntaxError, "Invalid publication year: #{@year.inspect}"
+        end
+
+        lang_arg = args.find { |s| s.start_with?("lang:") }
+        @lang = lang_arg&.split(":", 2)&.last || "en"
+
+        unless @lang.match?(/\A[a-z]{2}\z/i)
+          raise Liquid::SyntaxError, "Invalid language code: #{@lang.inspect}"
+        end
+        # Inicjalizacja LanguageManager
+        lang_data_path = File.join(Dir.pwd, '_data', 'lang') # Katalog z plikami językowymi
+        config_path = File.join(Dir.pwd, '_config.yml') # Ścieżka do pliku `_config.yml`
+        @language_manager = Koziolekweb::LanguageSupport::LanguageManager.new(config_path, lang_data_path)
+      end
+
+      def render(_context)
+        title_html  = CGI.escapeHTML(@title)
+        author_html = CGI.escapeHTML(@author)
+        year_html   = CGI.escapeHTML(@year)
+        isbn_html   = CGI.escapeHTML(@isbn.to_s)
+        label_title = @language_manager.translate('title', @lang, 'Tytuł')
+        label_author = @language_manager.translate('author', @lang, 'Autor')
+        label_year = @language_manager.translate('year', @lang, 'Rok')
+        label_isbn = @language_manager.translate('isbn', @lang, 'ISBN')
+        cover_alt = @language_manager.translate('cover_alt', @lang, 'Okładka książki %{title} autorstwa %{author}')
+                                     .gsub('%{title}', @title)
+                                     .gsub('%{author}', @author)
+
+        <<~HTML
+          <div class="book">
+            <img src="#{@cover_url}" alt="#{cover_alt}" title="#{@title}" class="cover" />
+            <div class="book_desc">
+              <ul>
+                <li><span>#{label_title}: </span>#{title_html}</li>
+                <li><span>#{label_author}: </span>#{author_html}</li>
+                <li><span>#{label_year}: </span>#{year_html}</li>
+                #{@isbn.nil? ? "" : "<li><span>#{label_isbn}: </span>#{isbn_html}</li>"}
+              </ul>
+            </div>
+          </div>
+        HTML
+      end
+    end
+  end
+
+  module LanguageSupport
+    class LanguageManager
+      attr_reader :default_language
+      def initialize(config_path, lang_data_path)
+        @dictionary_cache = {}
+        @config_path = config_path
+        @lang_data_path = lang_data_path
+        @default_language = load_default_language
+      end
+
+      # Pobiera tłumaczenie dla danego klucza
+      def translate(key, lang = nil, default_value = nil)
+        lang ||= default_language
+        load_dictionary(lang)[key] || default_value
+      end
+
+      private
+
+      # Wczytanie domyślnego języka z pliku `_config.yml`
+      def load_default_language
+        if File.exist?(@config_path)
+          config = YAML.load_file(@config_path)
+          config['lang'] || 'en'
+        else
+          'en'
+        end
+      end
+
+      # Wczytuje słownik dla danego języka
+      def load_dictionary(lang)
+        @dictionary_cache[lang] ||=
+          begin
+            dictionary_path = File.join(@lang_data_path, "#{lang}.yml")
+            if File.exist?(dictionary_path)
+              YAML.safe_load(File.read(dictionary_path), aliases: true)
+            else
+              {}
+            end
+          end
+      end
+    end
+
   end
 end
 
-Liquid::Template.register_tag('listing', Koziolekweb::Tags::Listing)
-Liquid::Template.register_tag('offtop', Koziolekweb::Tags::Offtop)
-Liquid::Template.register_tag('yt_video', Koziolekweb::Tags::YtVideo)
+%w[listing offtop yt_video book].each do |tag|
+  class_name = tag.split('_').map(&:capitalize).join
+  begin
+    klass = Koziolekweb::Tags.const_get(class_name)
+    Liquid::Template.register_tag(tag, klass)
+  rescue NameError
+    warn "[WARN] Tag '#{tag}' not registered: Koziolekweb::Tags::#{class_name} not defined"
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-koziolekweb-tags
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Koziolek
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,11 +37,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".tool-versions"
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
-- jekyll-koziolekweb-tags.gemspec
 - lib/jekyll/koziolekweb/tags.rb
 - lib/jekyll/koziolekweb/tags/version.rb
 - sig/jekyll/koziolekweb/tags.rbs
@@ -52,7 +51,6 @@ licenses:
 metadata:
   source_code_uri: https://github.com/Koziolek/jekyll-koziolekweb-tags
   changelog_uri: https://github.com/Koziolek/jekyll-koziolekweb-tags/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,8 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Set of structural tags that helps to organise article.
 test_files: []

data/jekyll-koziolekweb-tags.gemspec

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/jekyll/koziolekweb/tags/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "jekyll-koziolekweb-tags"
-  spec.version = Jekyll::Koziolekweb::Tags::VERSION
-  spec.authors = ["Koziolek"]
-  spec.email = ["bjkuczynski@gmail.com"]
-
-  spec.summary = "Set of structural tags that helps to organise article."
-  spec.description = "Here you will find a set of tags that allow you to create code listings with numbering, notes using the <aside> element and more."
-  spec.homepage = "https://github.com/Koziolek/jekyll-koziolekweb-tags"
-  spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.4.0"
-  spec.add_dependency "jekyll", ">= 3.7", "< 5.0"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-
-  spec.metadata["source_code_uri"] = "https://github.com/Koziolek/jekyll-koziolekweb-tags"
-  spec.metadata["changelog_uri"] = "https://github.com/Koziolek/jekyll-koziolekweb-tags/CHANGELOG.md"
-
-
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end