bridgetown-feed 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f131469df79b55a8819c8786c67a43dee989af1f25a17eac87be38d4b716855
-  data.tar.gz: e4947533d8fcd65a9039ea3887a5feda1d4eaece77ca3ea9b48cd9027ec098f1
+  metadata.gz: 663c0250112d2f0867a077cecdd9c2a4b01bee052c4a58606d1dca4a0f773903
+  data.tar.gz: cf0692b787e2ad54da92c691b59740babe091e87160512f8f30545cc620028be
 SHA512:
-  metadata.gz: 5cef92281ae526b0bc5e7390d267aafc7f7253afaf672a5168f743bfe58856e49d49075141f50a1841d69bdbec61d6bfc764b3baf50d7988da84c5761885d00a
-  data.tar.gz: 51484a2e4497f8279b6bfe7e2e1973befbb38e682de5451da947c5e253df90463f1e0e662b4c98df5626e66ebeaebe8532a8b4e34b0506ded2d0b7a377cc02ee
+  metadata.gz: 8f030483288682b967d6afd8d666c30a2c9bc5ddd5dbca92e30978c8236ab5b4c4267c66cf6a46d2a253d0c572aa07aa498633d6bd2fa52b9e2093dd79827bb8
+  data.tar.gz: ac41b9e0db35fafabcadeda6ae5cf65fff893c0246aa7db7a1e5dd0ca69ca715a93d7a52619f8d08295ec9a8a9f7533eac39888433e3f47d6c36eeab9021bf69

data/.rubocop.yml

@@ -5,8 +5,6 @@ inherit_gem:
 
 AllCops:
   TargetRubyVersion: 2.5
-  Include:
-    - lib/**/*.rb
 
   Exclude:
     - .gitignore
@@ -14,6 +12,8 @@ AllCops:
     - .rubocop.yml
     - .travis.yml
 
+    - Rakefile
+    - "*.gemspec"
     - Gemfile.lock
     - History.markdown
     - LICENSE.txt
@@ -21,4 +21,5 @@ AllCops:
 
     - script/**/*
     - vendor/**/*
+    - spec/**/*
 

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

@@ -15,13 +15,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r!^spec/!)
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_dependency "bridgetown", ">= 0.20", "< 2.0"
+  spec.add_dependency "bridgetown", ">= 1.2.0.beta2", "< 2.0"
 
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rss"
   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/builder.rb

@@ -45,5 +45,3 @@ module BridgetownFeed
     end
   end
 end
-
-BridgetownFeed::Builder.register

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
@@ -52,7 +52,7 @@ module BridgetownFeed
     def collections
       return @collections if defined?(@collections)
 
-      @collections = if config["collections"].is_a?(Array)
+      @collections = if config["collections"].is_a?(Array) # rubocop:disable Style/CaseLikeIf
                        config["collections"].map { |c| [c, {}] }.to_h
                      elsif config["collections"].is_a?(Hash)
                        config["collections"]
@@ -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 = "3.0.0"
   end
 end

data/lib/bridgetown-feed.rb

@@ -4,3 +4,7 @@ require "bridgetown"
 require "fileutils"
 require "bridgetown-feed/builder"
 require "bridgetown-feed/generator"
+
+Bridgetown.initializer :"bridgetown-feed" do |config|
+  config.builder BridgetownFeed::Builder
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-feed
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Bridgetown Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2022-10-09 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.2.0.beta2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 1.2.0.beta2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rss
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +78,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
@@ -120,7 +134,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 
+description:
 email: maintainers@bridgetownrb.com
 executables: []
 extensions: []
@@ -144,7 +158,7 @@ homepage: https://github.com/bridgetownrb/bridgetown-feed
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,15 +166,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A Bridgetown plugin to generate an Atom feed of your Bridgetown posts
 test_files: []