msgtrail 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22f08180d5b28dc98df44b9f78bcef2201dcc9af653b15bbcc47dc1e7b1154cd
-  data.tar.gz: 67a1d8d51fb231e7aa12a16c85f51e7fce2bba0c3a794eb257914a50c1a5f60b
+  metadata.gz: 28e7072fe3ebdebc29a89edccec28b74522208f82be5aeef20ad627564b37d07
+  data.tar.gz: 2e1eab46f795631e71f00f9125afb82bff67f67e2cdc58cf684b61d862b1a375
 SHA512:
-  metadata.gz: d3f111b8e2b03d55f94101d8e9cdbdf57d8bef24dc0261eb808a8e28e4644e044133dc4468f41bb91dec7f9191fb1932a1484cb1e1f4c733ed4a4bfed2e7d475
-  data.tar.gz: b7e5c2807f0a845e62e80be55c563de9d76a080accdafcb3afdc6b99f91ee80d6321e6142352c856836345c7442d16bef7ab84ba8382afaad0ec5544d3ee0731
+  metadata.gz: 4bc9b1f3bd053300bab75a40ea78ba82451f604c431b38a07dd8978dfcc889dd4fcbde208d96b822171c1d8292f411429a760fd92a637c8ad4f2d26445f4bf05
+  data.tar.gz: 58a263140a89b1b189ecbc56c90190ddf1e96552095591f56cc0d5426862529b2f53749934ae57a62a6acd28a0c9b3ddd755a390d1c1491537569f9649ec02ed

data/CHANGELOG.md

@@ -1,39 +1,44 @@
-### Changelog
+# Changelog
 
-##### Version 0.9.2
+## Version 0.9.3
+
+- Make published and updated date/time datestamps explicit
+- Change feed format from RSS to Atom
+
+## Version 0.9.2
 
 - Add details to error messages
 - Add plaintext rendering
 
-##### Version 0.9.1
+## Version 0.9.1
 
 - Fix link to tweets on mobile devices
 
-##### Version 0.9.0
+## Version 0.9.0
 
 - Condense multiple dashes in slugs into single dash
 
-##### Version 0.8.0
+## Version 0.8.0
 
 - Remove old packages (trims gem size).
 
-##### Version 0.7.0
+## Version 0.7.0
 
 - Add `track()` helper. Use for example `<%= track("index") %>` or `<%= track("article", article[:slug]) %>` to add a 1x1 pixel image using the following format: `"<img src=\"#{self.config.settings.domain_matter.tracking_pixel_url}?e=#{event}&se=#{sub_event}\" width=\"1\" height=\"1\" alt=\".\"/>"`. The `tracking_pixel_url` setting must be added to the `domain_matter` section in `config.json`. The URL should point to a (transparent) tracking pixel e.g. hosted on AWS CloudFront/S3.
 
-##### Version 0.7.0
+## Version 0.7.0
 
 - Add access to `cfg` variable inside partials.
 
-##### Version 0.6.0
+## Version 0.6.0
 
 - Added changelog.
 - Removed unnecessary warning about missing output directory.
 
-##### Version 0.5.0
+## Version 0.5.0
 
 - First production version capable of rendering static files for msgtrail.com.
 
-##### Version 0.1.0 - 0.4.0
+## Version 0.1.0 - 0.4.0
 
 - Alpha/beta versions

data/lib/msgtrail/blog.rb

@@ -55,7 +55,7 @@ module Msgtrail
 
     def generate_article_slugs
       self.articles.each do |article|
-        article[:slug] = Slug.generate(article[:title], article[:date], article[:time])
+        article[:slug] = Slug.generate(article[:title], article[:published][:date], article[:published][:time])
       end
     end
 

data/lib/msgtrail/publish.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'date'
 require 'dotenv'
 require 'fileutils'
 require 'http'

data/lib/msgtrail/renderers.rb

@@ -1,7 +1,28 @@
+module RenderHelper
+
+  def now_as_rfc3339
+    DateTime.now.rfc3339
+  end
+
+  def as_rfc3339(published, updated = nil)
+    updated.nil? ? datestamp = published : datestamp = updated
+    ymd = datestamp[:date].split(/\D/).map(&:to_i)
+    hm  = datestamp[:time].split(/\D/).map(&:to_i)
+    DateTime.new(ymd[0], ymd[1], ymd[2], hm[0], hm[1], 0, datestamp[:utc_offset]).rfc3339
+  end
+
+  def xml_safe(str)
+    str.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;").gsub("\"", "&quot;").gsub("'", "&apos;")
+  end
+
+end
+
 module Msgtrail
 
   class PageRenderer
 
+    include RenderHelper
+
     attr_accessor :article, :articles, :config, :layout, :markdown, :plaintext, :template, :theme_directory
 
     def initialize(layout_filepath, template_filepath, config)
@@ -58,18 +79,12 @@ module Msgtrail
       end
     end
 
-    def rfc2822_time(date, time)
-      ymd = date.split(/\D/).map(&:to_i)
-      hm = time.split(/\D/).map(&:to_i)
-      Time.new(ymd[0], ymd[1], ymd[2], hm[0], hm[1])
-          .getlocal(cfg.time_matter.utc_offset)
-          .rfc2822
-    end
-
   end
 
   class PartialRenderer
 
+    include RenderHelper
+
     attr_accessor :config, :markdown, :partial, :plaintext, :variables
 
     def initialize(partial_filepath, variables, config)

data/lib/msgtrail/version.rb

@@ -1,3 +1,3 @@
 module Msgtrail
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgtrail
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Erik van Eykelen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A simple blog publication tool