bridgetown-feed 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f131469df79b55a8819c8786c67a43dee989af1f25a17eac87be38d4b716855
-  data.tar.gz: e4947533d8fcd65a9039ea3887a5feda1d4eaece77ca3ea9b48cd9027ec098f1
+  metadata.gz: 8d1ee5e7054b88bba714fecc3f8586682c79310b4b868e375207a8792fc288ab
+  data.tar.gz: aca5c23b8dc1ef3b1a16fbd806f2bf34aed21b38553e6b8544507b3675410c94
 SHA512:
-  metadata.gz: 5cef92281ae526b0bc5e7390d267aafc7f7253afaf672a5168f743bfe58856e49d49075141f50a1841d69bdbec61d6bfc764b3baf50d7988da84c5761885d00a
-  data.tar.gz: 51484a2e4497f8279b6bfe7e2e1973befbb38e682de5451da947c5e253df90463f1e0e662b4c98df5626e66ebeaebe8532a8b4e34b0506ded2d0b7a377cc02ee
+  metadata.gz: fe735a12d2e9669646ff7e3e91122ed113b90d14f4302e0dfae5a4a0a172e61dc16628dc9a1d2ae6a46aca28362a8df241934c5494eb4884cccf2dba70a91b75
+  data.tar.gz: 5dc692945109e3eb707b39a42f39509ab5a0299d9e266f5b6478510944645c1bc07a02ddff28f1115a51b1534bbfdbba4ac262e2cbef6bd4eb25c17d7bccec1c

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## Unreleased
+
+...
+
+## 2.1.0 / 2021-10-26
+
+* Update test suite and ensure generated pages have the right permalink
+* Switch from `site.pages` to `site.generated_pages` due to Bridgetown 1.0 API change
+
 ## 2.0.1 / 2021-06-04
 
 * Fix bug where resources' relative URLs weren't included properly

data/bridgetown-feed.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_dependency "bridgetown", ">= 0.20", "< 2.0"
+  spec.add_dependency "bridgetown", ">= 1.0.0.alpha5", "< 2.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "nokogiri", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop-bridgetown", "~> 0.2"
   spec.add_development_dependency "typhoeus", ">= 0.7", "< 2.0"

data/lib/bridgetown-feed/feed.xml

@@ -40,24 +40,20 @@
   {% endif %}
 
   {% assign feed_collection = collections[page.collection] %}
-  {% if site.uses_resource %}
-    {% find posts where feed_collection.resources, draft != true %}
-  {% else %}
-    {% assign posts = feed_collection.docs | where_exp: "post", "post.draft != true" | sort: "date" | reverse %}
-  {% endif %}
+  {% find posts where feed_collection.resources, draft != true %}
   {% if page.category %}
     {% assign posts = posts | where: "category",page.category %}
   {% endif %}
   {% for post in posts limit: 10 %}
     <entry{% if post.lang %}{{" "}}xml:lang="{{ post.lang }}"{% endif %}>
       <title type="html">{{ post.title | smartify | strip_html | normalize_whitespace | xml_escape }}</title>
-      <link href="{{ post.relative_url | default: post.url | absolute_url }}" rel="alternate" type="text/html" title="{{ post.title | xml_escape }}" />
+      <link href="{{ post.absolute_url | default: post.url | absolute_url }}" rel="alternate" type="text/html" title="{{ post.title | xml_escape }}" />
       <published>{{ post.date | date_to_xmlschema }}</published>
       <updated>{{ post.last_modified_at | default: post.date | date_to_xmlschema }}</updated>
       <id>{{ post.id | absolute_url | xml_escape }}</id>
       {% assign excerpt_only = post.feed.excerpt_only | default: site.feed.excerpt_only %}
       {% unless excerpt_only %}
-        <content type="html" xml:base="{{ post.relative_url | default: post.url | absolute_url | xml_escape }}">{{ post.content | strip | xml_escape }}</content>
+        <content type="html" xml:base="{{ post.absolute_url | default: post.url | absolute_url | xml_escape }}">{{ post.content | strip | xml_escape }}</content>
       {% endunless %}
 
       {% assign post_author = post.author | default: post.authors[0] | default: site.metadata.author %}

data/lib/bridgetown-feed/generator.rb

@@ -13,7 +13,7 @@ module BridgetownFeed
           path = feed_path(collection: name, category: category)
           next if file_exists?(path)
 
-          @site.pages << make_page(path, collection: name, category: category)
+          @site.generated_pages << make_page(path, collection: name, category: category)
         end
       end
     end
@@ -89,6 +89,7 @@ module BridgetownFeed
         file.content = feed_template
         file.data.merge!(
           "layout"          => "none",
+          "permalink"       => file_path,
           "template_engine" => "liquid",
           "sitemap"         => false,
           "xsl"             => file_exists?("feed.xslt.xml"),

data/lib/bridgetown-feed/version.rb

@@ -2,6 +2,6 @@
 
 module Bridgetown
   module Feed
-    VERSION = "2.0.1"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-feed
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 1.0.0.alpha5
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 1.0.0.alpha5
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement