zine 0.18.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da31586867e20b6d0dd4cbfdb80875f43eecbfa9af35e6eb221b9126a41b80ed
-  data.tar.gz: d23b0c6a22460d711205610ce9da116e5ea3b85aa29de6fc1108f9f879551f84
+  metadata.gz: c72d8eba392c259b5c9a7914da03137f9d85ad1a4aed6cd694401681ac5966b3
+  data.tar.gz: 0ac041d6c35d5608a81c2da8cb802d2aa3e324e5f16873a6069c4ef9e2060bde
 SHA512:
-  metadata.gz: f0f640a7d8d1bf07e43fdb63847ea29b34745dca384f16e935ac781da42e54f8f6c1c79537d8d688ee2185bc3af0fa5b2f123a00542906e02b632f930a8dfa12
-  data.tar.gz: 1b5dd24e897ba0b7eae9f58cd9426551f76ec75a3032d3002d26526a99c066a1c0cb73a07a704e2b89a2c0747144ff7279e20f7a0e7848bc81e90f8881fbbb34
+  metadata.gz: '004903591348d94c69026caec60e849cf071f180a63aaeb2c2481e7dbab731d3a4f0b32c1d9cb011ed3d9848dd6d15c41022aefebbc2e72a977c8d6989278d0e'
+  data.tar.gz: 9e720d20097b3219035d828c78f7bf2739c8938875401822550ebfe4e8350302ffe09d4056ce12355c83fb13c076b9ccaf45fc1fd8c037be91aa271009f4fd60

data/CHANGELOG.md

@@ -1,10 +1,23 @@
 # Zine Changelog
 
-# 0.18.0 - 17 February, 2023
+## 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
+- dropped the link to the now defunct Ripley project
+- added Reek, dropped Solargraph, updated dependencies
+- updated the Rakefile, replacing bundler/gem_tasks with direct gem and git calls
+
+## 0.18.0 - 17 February, 2023
 
 - replaced https://mikekreuzer.com/projects/zine/ with GitHub address
 
-# 0.17.0 - 17 February, 2023
+## 0.17.0 - 17 February, 2023
 
 - forced polling for the listener gem, which was skipping new files on linux otherwise
 - fixed an errant inverted comma in links, introduced in the last commit
@@ -15,7 +28,7 @@
 - year bump in the starter template
 - dropped the faraday-retry gem again after Octokit updated
 
-# towards 0.17.0 - 20 June, 2022 (on Github, but not RubyGems)
+## towards 0.17.0 - 20 June, 2022 (on Github, but not RubyGems)
 
 - customised the rake file
 - refactored - from 112 rubocop offenses, to 33
@@ -24,7 +37,7 @@
 - dependency updates
 - added the faraday-retry gem as a dependency, to suppress warnings (from Octokit)
 
-# 0.16.0 - 17 June, 2022
+## 0.16.0 - 17 June, 2022
 
 - temp warning about missing atom template in zine.yaml, better handling of missing templates
 - cli missing options bug fixed - from 0.15.0
@@ -34,25 +47,25 @@
 - reversed the sort order for this change log
 - changed the date format in the log - from US style, to everywhere else style
 
-# towards 0.16.0 - 3 February, 2022
+## towards 0.16.0 - 3 February, 2022
 
 - BREAKING CHANGE: added an RSS 2.0 feed in addition to the Atom feed, the rss.erb file and /rss.xml feed link will now be RSS, an Atom and RSS template are both required in the local site copy, and need to be listed in a site's zine.yml file
 - year bump in starter template
 
-# 0.15.0 - 26 May, 2020
+## 0.15.0 - 26 May, 2020
 
 - dependency version bumps, year bump in template
 - replaced zine.dev with https://mikekreuzer.com/projects/zine/
 - other minor refactoring & doc rewrites
 
-# 0.14.0 - 27 May, 2019
+## 0.14.0 - 27 May, 2019
 
 - added an AWS S3 uploader
 - added AWS CloudFront invalidation
 - added zine.dev to the footer template
 - bug fix - catch carriage returns as default yes answers to the upload? question
 
-# 0.13.0 - lucky 13 - 26 May, 2019
+## 0.13.0 - lucky 13 - 26 May, 2019
 
 - added some of the style changes that survived from v12, eg moved social media to the footer
 - added a (permissive as they come) robots.txt file
@@ -62,20 +75,20 @@
 - minor readme updates
 - placeholder site, mostly in case there's ever an app: https://zine.dev
 
-# 0.12.0 - never pushed, used up until 25 April, 2019
+## 0.12.0 - never pushed, used up until 25 April, 2019
 
 - added (then removed) Mastodon from the list of contacts, changed the styling a few times, neglected to publish
 
-# 0.11.0, 7 November, 2018
+## 0.11.0, 7 November, 2018
 
 - fixed a bug where String#split would break apart markdown files on tables as well as at the metadata/markdown boundary
 
-# 0.9.0, 1 January, 2018
+## 0.9.0, 1 January, 2018
 
 - a bug in 'zine notice' involving full & partial paths that duplicated the post to notice on the history page, fixed
 - minor code clean-up in cli.rb and server.rb
 
-# 0.10.0, 7 November, 2018
+## 0.10.0, 7 November, 2018
 
 - dependency version bumps
 

data/README.md

@@ -81,13 +81,12 @@ Commands:
 
 ## Links
 
-- [Github][github] - show me the code
+- [Code][codeberg] - show me the code
 - [Ruby gems][rubygems] - show me the Ruby details (pick up some gems while you're there)
-- [Project site][mk] - Zine's home on the web
 
 ## Contributing
 
-Yes please. Bug reports and pull requests are welcome on GitHub at https://github.com/mikekreuzer/zine.
+Yes please. Bug reports and pull requests are welcome on Codeberg at https://codeberg.org/kreuzer/zine.
 
 ## Tests
 
@@ -97,8 +96,8 @@ rake
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [AGPL3 License][license].
 
-[github]: https://github.com/mikekreuzer/zine
-[mk]: https://mikekreuzer/projects/zine/
+[codeberg]: https://codeberg.org/kreuzer/zine
+[license]: https://codeberg.org/kreuzer/zine/src/branch/main/LICENSE
 [rubygems]: https://rubygems.org/gems/zine

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/footer_partial.erb

@@ -17,7 +17,7 @@
   <div class="column">
     <h3>The fine print</h3>
     <ul>
-      <li>Built with <a href="https://mikekreuzer.com/projects/zine/">Zine</a></li>
+      <li>Built with <a href="https://codeberg.org/kreuzer/zine">Zine</a></li>
       <li>&copy; 2023<span> <%= page[:site_author] %></span></li>
     </ul>
   </div>

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/skeleton/zine.yaml

@@ -9,11 +9,8 @@ directories:
   templates: templates
 links:
   -
-    name: GitHub
-    uri: https://github.com/mikekreuzer
-  -
-    name: Ripley
-    uri: https://mikekreuzer.github.io/Ripley/
+    name: Codeberg
+    uri: https://codeberg.org/kreuzer
 options:
   github_name: mikekreuzer
   number_items_in_RSS: 7

data/lib/zine/version.rb

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

metadata

@@ -1,131 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: zine
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Mike Kreuzer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.16
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.16
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.6
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudfront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.65'
+        version: '1.84'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.65'
+        version: '1.84'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.114'
+        version: '1.138'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.114'
+        version: '1.138'
 - !ruby/object:Gem::Dependency
   name: htmlcompressor
   requirement: !ruby/object:Gem::Requirement
@@ -174,20 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -208,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +165,7 @@ dependencies:
         version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -269,27 +175,21 @@ dependencies:
         version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.3'
 description: |-
   Yet another blog aware static site generator.
   There are many like it, but this one is mine.
@@ -344,11 +244,14 @@ files:
 - lib/zine/uploader_sftp.rb
 - lib/zine/version.rb
 - lib/zine/watcher.rb
-homepage: https://github.com/mikekreuzer/zine
+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:
@@ -364,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Yet another blog aware static site generator.