rawfeed 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce48f07e15a628115569f19b3664e5bbe3c0ce9dcfbae3bede8612acc1298ad
-  data.tar.gz: 69d36262eace558f29c037d31bf46046ac8bc7cc4bae732a00653db0a83b79e0
+  metadata.gz: 8511f7129df556936ff6d30d8603ae79a2a83cdcb2be2482fe325cf67efc875f
+  data.tar.gz: 4bfec0dee20997adc15158230a331ac79a1626ae59c367df03455bc74710d306
 SHA512:
-  metadata.gz: 07134d1761dbd2a2c48a9a2413708c8630abe68d3e193843823fb7a5f55fd604b1acaf28621e27ce3fb06a09de3c76b5e7eb0d83279f7219c80b33b940836a4c
-  data.tar.gz: c15d9e442c1bbbd108901895d823527718beb4249ef8b0c3281c67d0d5718027c3cda77c6a6814df9c46a763ff2305bdcf530dcb6b0fa6fc7e070087ef5b0c40
+  metadata.gz: 58ed203632f48facc743334dbcee401886ee70f409885f7c720eed7aa2f6342761e9a18e9e7da0f997094c5768bc5bacf1ffbecca81e049e5be63efd4c5db446
+  data.tar.gz: da43880931fc8d59d35cb82ac9b1d557044b0f0453342f0747798ff17f43c4c26a3a2b9bbede385b4fcbbe4051527421a60264f74c3b1702015133644b289abb

data/_data/options.yml

@@ -59,14 +59,18 @@ head:
     connect-src:
       - https://www.google.com
       - https://api.github.com
+      - https://script.google.com
+      - https://script.googleusercontent.com
     img-src:
       - https://www.google.com
       - https://media0.giphy.com
       - https://media4.giphy.com
+      - https://media.giphy.com
       - https://github.githubassets.com
     script-src:
       - https://www.google.com
       - https://www.gstatic.com
+      - https://script.google.com
       - https://cdn.jsdelivr.net
       - https://cdnjs.cloudflare.com
       - https://giscus.app

data/_includes/layout/head.html

@@ -87,6 +87,13 @@
   {% comment %} load theme {% endcomment %}
   <link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
 
+  {% comment %} custom theme {% endcomment %}
+  {%- assign file_path = '/assets/css/custom.css' -%}
+  {%- assign file_exists = site.static_files | where: "path", file_path | size -%}
+  {%- if file_exists > 0 -%}
+    <link rel="stylesheet" href="{{ '/assets/css/custom.css' | relative_url }}">
+  {%- endif -%}
+
   {% comment %} feed {% endcomment %}
   <link rel="alternate" type="application/atom+xml" title="{{ site_title }}" href="{{ '/feed.xml' | relative_url }}">
 

data/_layouts/default.html

@@ -38,12 +38,14 @@
 
     <!-- scripts -->
     <script src="{{ '/assets/vendor/bootstrap/js/bootstrap.bundle.min.js' | relative_url }}"></script>
-    <script src="{{ '/assets/js/default.js' | relative_url }}"></script>
-    <script src="{{ '/assets/js/home.js' | relative_url }}"></script>
-    <script src="{{ '/assets/vendor/simple-jekyll-search.min.js' | relative_url }}"></script>
-    <script src="{{ '/assets/js/blog.js' | relative_url }}"></script>
-    <script src="{{ '/assets/js/page.js' | relative_url }}"></script>
-    <script src="{{ '/assets/js/contact.js' | relative_url }}"></script>
+    <script src="{{ '/assets/js/fallback/default.js' | relative_url }}"></script>
+    {%- if page.url contains '/blog/' -%}
+      <script src="{{ '/assets/vendor/simple-jekyll-search.min.js' | relative_url }}"></script>
+    {%- endif -%}
+    <script src="{{ '/assets/js/fallback/blog.js' | relative_url }}"></script>
+    <script src="{{ '/assets/js/fallback/home.js' | relative_url }}"></script>
+    <script src="{{ '/assets/js/fallback/page.js' | relative_url }}"></script>
+    <script src="{{ '/assets/js/fallback/contact.js' | relative_url }}"></script>
     <!-- scripts -->
   </body>
   <!-- body -->

data/assets/js/fallback/contact.js

@@ -5,112 +5,113 @@
 
 document.addEventListener("DOMContentLoaded", () => {
   const form = document.getElementById("contactForm");
-  const submitButton = document.getElementById("submitButton");
-  const endpoint = "{{ head_.google.apps_script.url }}"; // URL Google Apps Script
-
-  // get modal
-  function showModal(title, message, type = 'success') {
-    const modalEl = document.getElementById('contactMessageModal');
-    const modalTitle = modalEl.querySelector('.modal-title');
-    const modalBody = modalEl.querySelector('.modal-body');
-    const modalContent = modalEl.querySelector('.modal-content');
-
-    modalContent.classList.remove('contact-message-success', 'contact-message-error', 'contact-message-warning');
-
-
-    // Apply the color according to the type
-    if (type === 'success') {
-      modalContent.classList.add('contact-message-success');
-    } else if (type === 'error') {
-      modalContent.classList.add('contact-message-error');
-    } else if (type === 'warning') {
-      modalContent.classList.add('contact-message-warning');
-    }
-
-    modalTitle.innerHTML = title;
-    modalBody.innerHTML = message;
-
-    const bsModal = new bootstrap.Modal(modalEl);
-    bsModal.show();
-  }
+  if (form) {
+    const submitButton = document.getElementById("submitButton");
+    const endpoint = "{{ head_.google.apps_script.url }}"; // URL Google Apps Script
+
+    // get modal
+    function showModal(title, message, type = 'success') {
+      const modalEl = document.getElementById('contactMessageModal');
+      const modalTitle = modalEl.querySelector('.modal-title');
+      const modalBody = modalEl.querySelector('.modal-body');
+      const modalContent = modalEl.querySelector('.modal-content');
+
+      modalContent.classList.remove('contact-message-success', 'contact-message-error', 'contact-message-warning');
+
+
+      // Apply the color according to the type
+      if (type === 'success') {
+        modalContent.classList.add('contact-message-success');
+      } else if (type === 'error') {
+        modalContent.classList.add('contact-message-error');
+      } else if (type === 'warning') {
+        modalContent.classList.add('contact-message-warning');
+      }
 
-  form.addEventListener("submit", async (e) => {
-    e.preventDefault();
-
-    const recaptchaResponse = grecaptcha.getResponse();
-    if (!recaptchaResponse) {
-      showModal(
-        "{{ contact_.recaptcha.warning.title | default: 'Warning' }}",
-        `{{ contact_.recaptcha.warning.content | default: "Please tick the 'I'm not a robot' box." }}`,
-        "warning"
-      );
-      return;
-    }
+      modalTitle.innerHTML = title;
+      modalBody.innerHTML = message;
 
-    const textarea = document.getElementById('textMessage');
-    const text = textarea.value.trim();
-    if (text.length < "{{ contact_.message.caracters.min }}" ) {
-      showModal(
-        "{{ contact_.message.caracters.warning.title | default: 'Warning' }}",
-        "{{ contact_.message.caracters.warning.content | default: 'The message must have at least 50 characters.' }}",
-        "warning"
-      );
-      return;
+      const bsModal = new bootstrap.Modal(modalEl);
+      bsModal.show();
     }
 
-    submitButton.disabled = true;
-    submitButton.textContent = "{{ contact_.message.status | default: 'Sending...Wait' }}";
+    form.addEventListener("submit", async (e) => {
+      e.preventDefault();
 
-    const formData = new FormData(form);
-    const data = Object.fromEntries(formData.entries());
-
-    try {
-      const response = await fetch(endpoint, {
-        method: "POST",
-        redirect: "follow",
-        body: JSON.stringify(data)
-      });
-
-      const result = await response.json();
-
-      if (result.result === 'success') {
-        form.reset();
-        grecaptcha.reset();
+      const recaptchaResponse = grecaptcha.getResponse();
+      if (!recaptchaResponse) {
         showModal(
-          "{{ contact_.message.success.title | default: 'Message Sent' }}",
-          "{{ contact_.message.success.content | default: 'Your message has been sent successfully!' }}",
-          "success"
+          "{{ contact_.recaptcha.warning.title | default: 'Warning' }}",
+          `{{ contact_.recaptcha.warning.content | default: "Please tick the 'I'm not a robot' box." }}`,
+          "warning"
         );
-      } else {
+        return;
+      }
+
+      const textarea = document.getElementById('textMessage');
+      const text = textarea.value.trim();
+      if (text.length < "{{ contact_.message.caracters.min }}" ) {
         showModal(
-          "{{ contact_.message.error.title | default: 'Error' }}",
-          "{{ contact_.message.error.content | default: 'Something went wrong while sending your message.' }}",
-          "error"
+          "{{ contact_.message.caracters.warning.title | default: 'Warning' }}",
+          "{{ contact_.message.caracters.warning.content | default: 'The message must have at least 50 characters.' }}",
+          "warning"
         );
-        throw new Error(result.message || "{{ contact_.message.error.content | default: 'An unknown error has occurred.' }}");
+        return;
       }
 
-    } catch (error) {
-      console.error("Error sending:", error);
-      if (error.message.includes("reCAPTCHA")) {
+      submitButton.disabled = true;
+      submitButton.textContent = "{{ contact_.message.status | default: 'Sending...Wait' }}";
+
+      const formData = new FormData(form);
+      const data = Object.fromEntries(formData.entries());
+
+      try {
+        const response = await fetch(endpoint, {
+          method: "POST",
+          redirect: "follow",
+          body: JSON.stringify(data)
+        });
+
+        const result = await response.json();
+
+        if (result.result === 'success') {
+          form.reset();
+          grecaptcha.reset();
           showModal(
-            "{{ contact_.message.error.title | default: 'Error' }}",
-            "{{ contact_.recaptcha.fail | default: 'Verification failed. Please reload the page and try again.' }}",
-            "error"
+            "{{ contact_.message.success.title | default: 'Message Sent' }}",
+            "{{ contact_.message.success.content | default: 'Your message has been sent successfully!' }}",
+            "success"
           );
-      } else {
+        } else {
           showModal(
             "{{ contact_.message.error.title | default: 'Error' }}",
-            "{{ contact_.recaptcha.error | default: 'An error occurred while sending the message. Please try again.' }}",
+            "{{ contact_.message.error.content | default: 'Something went wrong while sending your message.' }}",
             "error"
           );
-      }
-      grecaptcha.reset();
-
-    } finally {
-      submitButton.disabled = false;
-      submitButton.textContent = "{{ contact_.button.text | default: 'Send!' }}";
-    }
-  });
+          throw new Error(result.message || "{{ contact_.message.error.content | default: 'An unknown error has occurred.' }}");
+        }
+
+      } catch (error) {
+        console.error("Error sending:", error);
+        if (error.message.includes("reCAPTCHA")) {
+            showModal(
+              "{{ contact_.message.error.title | default: 'Error' }}",
+              "{{ contact_.recaptcha.fail | default: 'Verification failed. Please reload the page and try again.' }}",
+              "error"
+            );
+        } else {
+            showModal(
+              "{{ contact_.message.error.title | default: 'Error' }}",
+              "{{ contact_.recaptcha.error | default: 'An error occurred while sending the message. Please try again.' }}",
+              "error"
+            );
+        }
+        grecaptcha.reset();
 
+      } finally {
+        submitButton.disabled = false;
+        submitButton.textContent = "{{ contact_.button.text | default: 'Send!' }}";
+      }
+    });
+  }
 });

data/lib/rawfeed/reading_time.rb

@@ -3,10 +3,11 @@ require "jekyll"
 module Rawfeed
   module ReadingTimeFilter
     def reading_time(input)
-      site_config = Jekyll.sites.first.config rescue {}
-      words_per_minute = site_config&.dig("reading_time", "words_per_minute") || 180
-      message = site_config&.dig("reading_time", "message") || ["Read this post in", "Read this post in less than"]
-      minutes_text = site_config&.dig("reading_time", "minutes_label") || ["minute", "minutes"]
+      site = Jekyll.sites.first rescue nil
+      options_data = site&.data&.dig("options") rescue {}
+      words_per_minute = options_data&.dig("reading_time", "words_per_minute") || 180
+      message = options_data&.dig("reading_time", "message") || ["Read this post in", "Read this post in less than"]
+      minutes_text = options_data&.dig("reading_time", "minutes_label") || ["minute", "minutes"]
       words = input.split.size;
       minutes = ( words / words_per_minute ).floor
       minutes_label = minutes == 1 ? "#{minutes_text[0]}" : "#{minutes_text[1]}"

data/lib/rawfeed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rawfeed
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rawfeed
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - William C. Canin