zine 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d01e24a10aef7862c7680b23ed3690761e11fea353dcba75860e10613c47c2aa
-  data.tar.gz: e5bfdf23fe573be6be9974392536972c027e32e7606fcc4a99070ed20fd6de9e
+  metadata.gz: c72d8eba392c259b5c9a7914da03137f9d85ad1a4aed6cd694401681ac5966b3
+  data.tar.gz: 0ac041d6c35d5608a81c2da8cb802d2aa3e324e5f16873a6069c4ef9e2060bde
 SHA512:
-  metadata.gz: a3deb89272c028b9c50771df629a25472770fd8e07d0ab54eaa820efe5a67f7860326746077723dc555176d34300eb0d645eefe2dcac13df307534727f0e8e66
-  data.tar.gz: 057b9d63b71610d0ffb7756ddcd8e5d32d7916b48eddd299b138fbf39a920c237c48c9745c86cabada832b3484d1e4312877f82b58789a7693c3df649e9dafc2
+  metadata.gz: '004903591348d94c69026caec60e849cf071f180a63aaeb2c2481e7dbab731d3a4f0b32c1d9cb011ed3d9848dd6d15c41022aefebbc2e72a977c8d6989278d0e'
+  data.tar.gz: 9e720d20097b3219035d828c78f7bf2739c8938875401822550ebfe4e8350302ffe09d4056ce12355c83fb13c076b9ccaf45fc1fd8c037be91aa271009f4fd60

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Zine Changelog
 
+## 0.20.0 - 5 December, 2023
+
+- added Open Graph & canonical link tags - source/templates/header_partial.erb will need to be updated on your site
+- added an extra 'git push' in the Rakefile, to push code changes as well as the tag
+- expanded the meta data in the gemspec file
+
 ## 0.19.0 - 22 November, 2023
 
 - moved the repo from GitHub to Codeberg, changed the links in the README, gemspec, and skeleton files

data/lib/zine/page.rb

@@ -15,32 +15,33 @@ module Zine
   # A page on the site where the content comes from a file's markdown, and the
   # destination's location mirrors its own
   class Page
-    attr_accessor :source_file # used in zine notice --
+    attr_accessor :formatted_data, :source_file # used in zine notice --
     # PostsAndHeadlines.one_new_post
-    attr_reader :dest_path, :formatted_data, :template_bundle
+    attr_reader :dest_path, :template_bundle
 
     # the meta data, passed formatted to the template
     class FormattedData
       include ERB::Util
 
-      attr_accessor :data, :footer_partial, :header_partial, :html, :uri
+      attr_accessor :config, :data, :footer_partial, :header_partial, :html, :uri
       attr_reader   :page
 
       def initialize(front_matter, site_opt)
-        site = site_opt['options']
+        @config = site_opt
+        options =  @config['options']
         @page = { date_rfc3339: front_matter['date'],
                   date_rfc822: parse_822_date(front_matter['date']),
                   date_us: parse_date(front_matter['date']),
-                  github_name: site['github_name'],
-                  links_array: site_opt['links'],
-                  num_items_on_home: site['num_items_on_home'],
-                  site_author: site['site_author'],
-                  site_description: site['site_description'],
-                  site_name: site['site_name'],
-                  site_URL: site['site_URL'],
+                  github_name: options['github_name'],
+                  links_array: @config['links'],
+                  num_items_on_home: options['num_items_on_home'],
+                  site_author: options['site_author'],
+                  site_description: options['site_description'],
+                  site_name: options['site_name'],
+                  site_URL: options['site_URL'],
                   tags: slugify_tags(front_matter['tags']),
                   title: html_escape(front_matter['title']),
-                  twitter_name: site['twitter_name'],
+                  twitter_name: options['twitter_name'],
                   uri: '' } # uri only generated for posts, and not until after markdown, TO DO
       end
 
@@ -125,12 +126,17 @@ module Zine
       { 'date' => DateTime.now.to_s, 'title' => md_file_name, 'tags' => [] }
     end
 
-    def rel_path_from_build_dir(path)
-      full = Pathname(path)
-      full.relative_path_from(Pathname(@build_dir))
+    def rel_path_str_from_build_dir
+      dest_file = Pathname.new(@dest_path)
+      build_dir = Pathname.new(@formatted_data.config['directories']['build'])
+      dest_file.relative_path_from(build_dir).to_s
     end
 
     def template_the_html
+      # kludge to fix in rewrite, path wasn't created until after data originally
+      @formatted_data.page[:uri] = URI.join(@formatted_data.page[:site_URL],
+                                            rel_path_str_from_build_dir).to_s
+
       data_binding = @formatted_data.public_binding
       @formatted_data.header_partial = @header_partial.result data_binding
       @formatted_data.footer_partial = @footer_partial.result data_binding

data/lib/zine/post.rb

@@ -43,11 +43,11 @@ module Zine
 
     def tag_and_uri_subprocess
       page_data = @formatted_data.page
-      file_path = rel_path_from_build_dir(@dest_path).to_s
+      file_path_str = rel_path_str_from_build_dir
       # URI.join will expect a root directory to start...
-      @formatted_data.uri = "#{page_data[:site_URL]}/#{file_path}"
+      @formatted_data.uri = "#{page_data[:site_URL]}/#{file_path_str}"
       TagData.new(page_data[:tags],
-                  file_path,
+                  file_path_str,
                   page_data[:title],
                   page_data[:date_rfc3339],
                   page_data[:date_us])

data/lib/zine/skeleton/source/templates/header_partial.erb

@@ -8,8 +8,11 @@
     <link rel="home alternate" href="<%= page[:site_URL] %>/atom.xml" type="application/atom+xml" title="<%= page[:site_name] %>">
     <link rel="home alternate" href="<%= page[:site_URL] %>/rss.xml" type="application/rss+xml" title="<%= page[:site_name] %>">
     <link rel="stylesheet" href="/screen.css">
-    <link rel="apple-touch-icon" href="/apple-touch-icon.png">
-    <!--<link rel="canonical" href="<%= page[:uri] %>" />-->
+    <link rel="apple-touch-icon" href="<%= page[:site_URL] %>/apple-touch-icon.png">
+    <meta property="og:title" content="<%= page[:site_name] %> - <%= page[:title] %>" />
+    <meta property="og:url" content="<%= page[:uri] %>" />
+    <meta property="og:image" content="<%= page[:site_URL] %>/apple-touch-icon.png" />
+    <link rel="canonical" href="<%= page[:uri] %>">
   </head>
   <body>
     <div id="skiptocontent">

data/lib/zine/version.rb

@@ -2,5 +2,5 @@
 
 module Zine
   # The version
-  VERSION = '0.19.0'
+  VERSION = '0.20.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zine
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Mike Kreuzer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudfront
@@ -248,7 +248,10 @@ homepage: https://codeberg.org/kreuzer/zine
 licenses:
 - AGPL-3.0-or-later
 metadata:
+  changelog_uri: https://codeberg.org/kreuzer/zine/src/branch/main/CHANGELOG.md
+  homepage_uri: https://codeberg.org/kreuzer/zine
   rubygems_mfa_required: 'true'
+  source_code_uri: https://codeberg.org/kreuzer/zine
 post_install_message:
 rdoc_options: []
 require_paths: