bridgetown-seo-tag 4.0.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb7aa6ad690aea0cc55f5e18a9dd7be9c1461f4b6d7b57977abfc568ae0f09d
-  data.tar.gz: 27388ed583fc7d3cce45d5eab085bf87d5a30320192a844a97541bb71fbf28da
+  metadata.gz: 700724012209f996a9aafe12a6fea52c050e39e0f6afba904e6ea41c5205f6dd
+  data.tar.gz: 383ad71d2b5dd8923f40bc8c5e01d7f437ebbce97b3c80d0c84847c2c1895d8a
 SHA512:
-  metadata.gz: faa21316c33fd7e2bf19228dcc848b147b5b40ba03f1d12da9229b9b7f665fd9f0b5279198fa43644a67fe67374d2554d61cdb5def9ee12a5d1ad3b8a2f6d420
-  data.tar.gz: e95daef1af9a8447ac7248fc39b6b9246910150995073b4f8b61160cbf60ac07e48fd3cf721be13310e28eb3cb53d4a1624ea323a0e5d191c6221a509b3758b9
+  metadata.gz: 31d8e25501780ce3b73f9b8d9abfff7efa8ddfe1b0f547627742d606458483f454e029b30c1c2cf7cea1040633f347f569198cfdd40dcafd516e3ba0c999395c
+  data.tar.gz: cdf16c8875a8b632cc59707fa251a1428f8b64e51871eac6db143615b681f98d8b935e8749edd1d41f02e15dd36bd8c830682d3114890b00b55bbdc1da0fb5c9

data/.rubocop.yml

@@ -17,3 +17,10 @@ Layout/LineLength:
 Metrics/BlockLength:
   Exclude:
     - spec/**/*
+
+Lint/MissingSuper:
+  Enabled: false
+
+Performance/CollectionLiteralInLoop:
+  Exclude:
+    - spec/**/*

data/CHANGELOG.md

@@ -1,31 +1,37 @@
 # Changelog
 
+## 5.0.0 / 2021-10-17
+
+- Change "Site Title | Site Tagline" format to "Site Title: Site Tagline"
+  - also handle Bridgetown 1.0 templates where the homepage title defaults to `Index`
+  - upgrade rubocop-bridgetown gem to 0.3
+
 ## 4.0.1 / 2021-06-04
 
-* Fix bug where resources' relative URLs weren't included properly
+- Fix bug where resources' relative URLs weren't included properly
 
 ## 4.0.0 / 2021-04-17
 
-* New release with helper to support Ruby templates like ERB
+- New release with helper to support Ruby templates like ERB
 
 ## 3.0.5  / 2020-06-18
 
-* Final release
+- Final release
 
 ## 3.0.5.beta1 / 2020-05-31
 
-* Fix bugs due to Bridgetown 0.15 switch to `render` tag.
-* Switch to using Rubocop Bridgetown gem.
+- Fix bugs due to Bridgetown 0.15 switch to `render` tag.
+- Switch to using Rubocop Bridgetown gem.
 
 ## 3.0.4 / 2020-05-01
 
-Update to require a minimum Ruby version of 2.5.
+- Update to require a minimum Ruby version of 2.5.
 
 ## 3.0.3 / 2020-04-19
 
-Allow `site.metadata.twitter` data if present. Look for `page.subtitle` if
+- Allow `site.metadata.twitter` data if present. Look for `page.subtitle` if
 `page.description` isn't present.
 
 ## 3.0.0 / 2020-04-14
 
-Use Bridgetown gem and rename to bridgetown-seo-tag.
+- Use Bridgetown gem and rename to bridgetown-seo-tag.

data/bridgetown-seo-tag.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "html-proofer", "~> 3.7"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "rubocop-bridgetown", "~> 0.2"
+  spec.add_development_dependency "rubocop-bridgetown", "~> 0.3"
 end

data/lib/bridgetown-seo-tag/author_drop.rb

@@ -41,8 +41,7 @@ module Bridgetown
 
       private
 
-      attr_reader :page
-      attr_reader :site
+      attr_reader :page, :site
 
       # Finds the page author in the page.author, page.authors, or site.author
       #
@@ -62,10 +61,9 @@ module Bridgetown
       # Returns a hash representing additional metadata or an empty hash
       def site_data_hash
         @site_data_hash ||= begin
-          return {} unless resolved_author.is_a?(String)
-          return {} unless site.data["authors"].is_a?(Hash)
-
-          author_hash = site.data["authors"][resolved_author]
+          author_hash = if site.data.authors.is_a?(Hash) && resolved_author.is_a?(String)
+                          site.data.authors[resolved_author]
+                        end
           author_hash.is_a?(Hash) ? author_hash : {}
         end
       end
@@ -74,15 +72,14 @@ module Bridgetown
       # including site-wide metadata if the author is provided as a string,
       # or an empty hash, if the author cannot be resolved
       def author_hash
-        @author_hash ||= begin
-          if resolved_author.is_a? Hash
-            resolved_author
-          elsif resolved_author.is_a? String
-            { "name" => resolved_author }.merge(site_data_hash)
-          else
-            {}
-          end
-        end
+        @author_hash ||= case resolved_author
+                         when Hash
+                           resolved_author
+                         when String
+                           { "name" => resolved_author }.merge(site_data_hash)
+                         else
+                           {}
+                         end
       end
 
       # Since author_hash is aliased to fallback_data, any values in the hash

data/lib/bridgetown-seo-tag/drop.rb

@@ -6,6 +6,7 @@ module Bridgetown
       include Bridgetown::SeoTag::UrlHelper
 
       TITLE_SEPARATOR = " | "
+      TAGLINE_SEPARATOR = ": "
       FORMAT_STRING_METHODS = [
         :markdownify, :strip_html, :normalize_whitespace, :escape_once,
       ].freeze
@@ -47,7 +48,14 @@ module Bridgetown
 
       # Page title without site title or description appended
       def page_title
-        @page_title ||= format_string(page["title"]) || site_title
+        @page_title ||= format_string(
+          if (page["title"] == "Index" || page["title"].blank?) &&
+              site_tagline_or_description
+            "#{site_title}#{TAGLINE_SEPARATOR}#{site_tagline_or_description}"
+          else
+            page["title"]
+          end
+        ) || site_title
       end
 
       def site_tagline_or_description
@@ -55,23 +63,18 @@ module Bridgetown
       end
 
       # Page title with site title or description appended
-      # rubocop:disable Metrics/CyclomaticComplexity
       def title
-        @title ||= begin
-          if site_title && page_title != site_title
-            page_title + TITLE_SEPARATOR + site_title
-          elsif site_description && site_title
-            site_title + TITLE_SEPARATOR + site_tagline_or_description
-          else
-            page_title || site_title
-          end
-        end
+        @title ||= if site_title && page_title != site_title &&
+            !format_string(page_title).start_with?(site_title + TAGLINE_SEPARATOR)
+                     page_title + TITLE_SEPARATOR + site_title
+                   else
+                     page_title || site_title
+                   end
 
         return page_number + @title if page_number
 
         @title
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
 
       def name
         return @name if defined?(@name)
@@ -88,11 +91,9 @@ module Bridgetown
       end
 
       def description
-        @description ||= begin
-          format_string(
-            page["description"] || page["subtitle"] || page["excerpt"]
-          ) || site_description
-        end
+        @description ||= format_string(
+          page["description"] || page["subtitle"] || page["excerpt"]
+        ) || site_description
       end
 
       # A drop representing the page author
@@ -125,39 +126,33 @@ module Bridgetown
       end
 
       def type
-        @type ||= begin
-          if page_seo["type"]
-            page_seo["type"]
-          elsif homepage_or_about?
-            "WebSite"
-          elsif page["date"]
-            "BlogPosting"
-          else
-            "WebPage"
-          end
-        end
+        @type ||= if page_seo["type"]
+                    page_seo["type"]
+                  elsif homepage_or_about?
+                    "WebSite"
+                  elsif page["date"]
+                    "BlogPosting"
+                  else
+                    "WebPage"
+                  end
       end
 
       def links
-        @links ||= begin
-          if page_seo["links"]
-            page_seo["links"]
-          elsif homepage_or_about? && site_social["links"]
-            site_social["links"]
-          end
-        end
+        @links ||= if page_seo["links"]
+                     page_seo["links"]
+                   elsif homepage_or_about? && site_social["links"]
+                     site_social["links"]
+                   end
       end
 
       def logo
-        @logo ||= begin
-          return unless site.data.dig("site_metadata", "logo")
-
-          if absolute_url? site.data.dig("site_metadata", "logo")
-            filters.uri_escape site.data.dig("site_metadata", "logo")
-          else
-            filters.uri_escape filters.absolute_url site.data.dig("site_metadata", "logo")
-          end
-        end
+        @logo ||= if !site.data.dig("site_metadata", "logo")
+                    nil
+                  elsif absolute_url? site.data.dig("site_metadata", "logo")
+                    filters.uri_escape site.data.dig("site_metadata", "logo")
+                  else
+                    filters.uri_escape filters.absolute_url site.data.dig("site_metadata", "logo")
+                  end
       end
 
       def page_lang
@@ -165,15 +160,15 @@ module Bridgetown
       end
 
       def canonical_url
-        @canonical_url ||= begin
-          if page["canonical_url"].to_s.present?
-            page["canonical_url"]
-          elsif page["url"].to_s.present?
-            filters.absolute_url(page["url"]).to_s.gsub(%r!/index\.html$!, "/")
-          else
-            filters.absolute_url(page["relative_url"]).to_s.gsub(%r!/index\.html$!, "/")
-          end
-        end
+        @canonical_url ||= if page["canonical_url"].to_s.present?
+                             page["canonical_url"]
+                           elsif page["url"].to_s.present?
+                             filters.absolute_url(page["url"]).to_s.gsub(%r!/index\.html$!, "/")
+                           else
+                             filters.absolute_url(page["relative_url"]).to_s.gsub(
+                               %r!/index\.html$!, "/"
+                             )
+                           end
       end
 
       private
@@ -227,7 +222,7 @@ module Bridgetown
       end
 
       def site_social
-        @site_social ||= sub_hash(site.data.dig("site_metadata"), "social")
+        @site_social ||= sub_hash(site.data["site_metadata"], "social")
       end
 
       # Safely returns a sub hash

data/lib/bridgetown-seo-tag/image_drop.rb

@@ -34,14 +34,14 @@ module Bridgetown
 
       private
 
-      attr_accessor :page
-      attr_accessor :context
+      attr_accessor :page, :context
 
       # The normalized image hash with a `path` key (which may be nil)
       def image_hash
-        @image_hash ||= if page["image"].is_a?(Hash)
+        @image_hash ||= case page["image"]
+                        when Hash
                           { "path" => nil }.merge(page["image"])
-                        elsif page["image"].is_a?(String)
+                        when String
                           { "path" => page["image"] }
                         else
                           { "path" => nil }
@@ -50,9 +50,7 @@ module Bridgetown
       alias_method :fallback_data, :image_hash
 
       def raw_path
-        @raw_path ||= begin
-          image_hash["path"] || image_hash["facebook"] || image_hash["twitter"]
-        end
+        @raw_path ||= image_hash["path"] || image_hash["facebook"] || image_hash["twitter"]
       end
 
       def absolute_url

data/lib/bridgetown-seo-tag/version.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Prevent bundler errors
-module Liquid; class Tag; end; end
+module Liquid; class Tag; end; end # rubocop:disable Lint/EmptyClass
 
 module Bridgetown
   class SeoTag < Liquid::Tag
-    VERSION = "4.0.1"
+    VERSION = "5.0.0"
   end
 end

data/lib/bridgetown-seo-tag.rb

@@ -81,15 +81,11 @@ module Bridgetown
       private
 
       def template_contents
-        @template_contents ||= begin
-          File.read(template_path).gsub(MINIFY_REGEX, "")
-        end
+        @template_contents ||= File.read(template_path).gsub(MINIFY_REGEX, "")
       end
 
       def template_path
-        @template_path ||= begin
-          File.expand_path "./template.html", File.dirname(__FILE__)
-        end
+        @template_path ||= File.expand_path "./template.html", File.dirname(__FILE__)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-seo-tag
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: 
 email: maintainers@bridgetownrb.com
 executables: []
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Bridgetown plugin to add metadata tags for search engines and social networks