meta-tags 2.16.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49694826540a1943557eb3ae5fa74f5405ad2649c300806ec1064e48842e99f4
-  data.tar.gz: 7687408b49c8791b2386152a50d8760f7f9b533ed4e222fa1c8588cb49f7c7d4
+  metadata.gz: ccc7036c95b58f9e1c33efd68f3b9dc16d64e9f4ad5d06296800a288f9f644da
+  data.tar.gz: c8fde1a652894101de4f146217b43326e81980c1bd760042a2dacbd194abb0a8
 SHA512:
-  metadata.gz: 1bef5f94ed23181efe26b22f498e6162059c6454676f20244cf8f0f62664fe87e10d5aa00a0e16e69ee8e3326f4f368ac008ad6c3d3a4d81b4f19f7fa9925c44
-  data.tar.gz: 3474171a2614d3064d90a10e4760e20b837f3c57acf253e907de990165e141a9cd0eb3f2b0baa0f1ffb04454e86abc3f713cca0f564e004b030825277f6cf161
+  metadata.gz: 2672417d1d988f072ccc11d12f7d4a536b3e00ee376098972a9d945c11fc6ac6109f8baa0f87e98c33f549860384d41caa47c00496a3199edae6b4d60d88f956
+  data.tar.gz: 83f2ff75eb5d41ec25b8c26932f718b186fa938f15b8fb5000840989ba5785a317d3337c1d363f3e3473a9c16d18e4b065272321c9a24172a763bfc74b8be2a5

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 2.18.0 (September 15, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.17.0...v2.18.0)
+
+Changes:
+
+- Fallback to site name when title is empty in mirrored tags ([243](https://github.com/kpumuk/meta-tags/pull/243))
+
+## 2.17.0 (July 5, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.16.0...v2.17.0)
+
+Changes:
+
+- Separate RBS files to _internal directory to avoid exposing RBS ([237](https://github.com/kpumuk/meta-tags/pull/237))
+- Added Ruby 3.1 to supported versions, Ruby 2.6 is minimum supported version ([235](https://github.com/kpumuk/meta-tags/pull/235/))
+
 ## 2.16.0 (September 24, 2021) [☰](https://github.com/kpumuk/meta-tags/compare/v2.15.0...v2.16.0)
 
 Changes:

data/Gemfile

@@ -10,19 +10,21 @@ if ENV['RAILS_VERSION']
   gem 'railties', "~> #{ENV['RAILS_VERSION']}"
 end
 
-# Ruby typings
-gem 'steep', platform: :mri unless ENV["NO_STEEP"] == '1'
+unless ENV["NO_STEEP"] == '1'
+  # Ruby typings
+  gem 'steep', '~> 1.0.1', platform: :mri
+end
 
 group :test do
   # Lock rubocop to a specific version we use on CI. If you update this,
   # don't forget to switch rubocop channel in the .codeclimate.yml
-  gem 'rubocop', '~> 1.18.0'
+  gem 'rubocop', '= 1.31.0'
   # Cops for rails apps
   gem 'rubocop-rails'
   # Apply RSpec rubocop cops
   gem 'rubocop-rspec', require: false
   # We use this gem on CI to calculate code coverage.
-  gem 'simplecov', '>= 0.17.0', '< 0.18'
+  gem 'simplecov', '~> 0.21.2'
   # Format RSpec output for CircleCI
   gem 'rspec_junit_formatter'
 end

data/README.md

@@ -12,12 +12,12 @@ Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 ## Ruby on Rails
 
 MetaTags main branch fully supports Ruby on Rails 5.1+, and is tested against all
-major Rails releases up to 6.1.
+major Rails releases up to 7.0.
 
-Ruby versions older than 2.5 are no longer officially supported.
+Ruby versions older than 2.6 are no longer officially supported.
 
-_Please note_ that we are no longer support Ruby versions older than 2.4.0 and
-Ruby on Rails older than 5.1, because they [reached their End of Life](https://github.com/kpumuk/meta-tags/pull/143).
+_Please note_ that we no longer support Ruby versions older than 2.6.0 and
+Ruby on Rails older than 5.1, because they reached their [End of Life](https://endoflife.date/ruby).
 
 ## Installation
 

data/Steepfile

@@ -10,4 +10,6 @@ target :lib do
   # (because we don't have RBS files for it)
   ignore "lib/meta_tags/railtie.rb"
   ignore "lib/generators"
+
+  library "set"
 end

data/certs/kpumuk.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
 MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhrcHVt
-dWsvREM9a3B1bXVrL0RDPWluZm8wHhcNMjAxMjEwMjA1MTE5WhcNMjExMjEwMjA1
-MTE5WjAjMSEwHwYDVQQDDBhrcHVtdWsvREM9a3B1bXVrL0RDPWluZm8wggEiMA0G
+dWsvREM9a3B1bXVrL0RDPWluZm8wHhcNMjIwNzA1MjIyODU4WhcNMjMwNzA1MjIy
+ODU4WjAjMSEwHwYDVQQDDBhrcHVtdWsvREM9a3B1bXVrL0RDPWluZm8wggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8NmK6GXPiE/q7PDbj7nNdw3pa8a6Q
 IDxLtc7kW95e1mh0TVgOE8kvGegGtRtjvhXVGTTFtZ+yMD/0DCfTM2oUQYk5oYpO
 ZGrCfbNIdZauf4WYsnJtKOTrRoqFMwpL5PlBDKczB2y5lUmQs2HIsjQ0Q21wdKyy
@@ -10,11 +10,11 @@ ZGrCfbNIdZauf4WYsnJtKOTrRoqFMwpL5PlBDKczB2y5lUmQs2HIsjQ0Q21wdKyy
 RryRTj5NVZbq9p1/WRc5zxD9QhAEPjRa5ikbd+eWebIDpAKI0hpyC/9bAgMBAAGj
 dzB1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBT2uFRXNWDpVdbv
 +xBk8DAgJPGBPTAdBgNVHREEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wHQYDVR0S
-BBYwFIESa3B1bXVrQGtwdW11ay5pbmZvMA0GCSqGSIb3DQEBCwUAA4IBAQBdcrpl
-32OlNaf68v38yzqYkviLELtbzRvEpRuQWZZyxOwU1OWSFAWkkALuseLWHDLYRDE8
-lOzQHewKodqaSPEo63vMZ28UQ3kDP1YE+cXR12fOg4YbCH8VETrTJa3X0AOOAbgA
-ZLMcZD6wu9Zu2rPhxLxs6Q/PaGGEc8bonOirCZrwVDzHFA1cPjcSoApdsyGdRiyj
-1f+XHXjCE5A1A6b8o4ffpAI6gkuaQOIrgGCyLS9oos6DSuofkvXI9g62G+2ZOmKJ
-U97JEQmXCpruLEeSVT2UqR+iJAWEAxPzqzDbTzZBTSPKn+nXeuF6h81e4hsJtkeJ
-HkYAoatF9iZrxT4E
+BBYwFIESa3B1bXVrQGtwdW11ay5pbmZvMA0GCSqGSIb3DQEBCwUAA4IBAQBa5fMh
+JcbhWBoP3kA32g3yM238fyJlre/ZeE6WIFxcuETff8AgPmk550qpAF/WBtP23X8Q
+khIFv+bFiuBURvNbuFevs23to7NeNA7XMmEJqjB6fRzO/i/a3bkLG07u+o74MyXe
+3/VAxl4Ce+C3aLwXccsbD+Fe3kQ6ku4ceIh2WebBSkpG3WRANReEAf7lcOt4aGEt
+nkYjyHgDz6/gYamK15XtOivglkTJDwAVGBzF9o6j5IQ9nXho8Vd2P+hiawx76CoT
+ANVO3I4ZwTKD12DMFqjalLwbSVVO4wpuMO3tcAgO4q7Fqh2tXTXom/YYl0SFvmx4
+evTPD0iY8lmGP3ZM
 -----END CERTIFICATE-----

data/lib/meta_tags/meta_tags_collection.rb

@@ -9,7 +9,7 @@ module MetaTags
     # Initializes a new instance of MetaTagsCollection.
     #
     def initialize
-      @meta_tags = HashWithIndifferentAccess.new
+      @meta_tags = ActiveSupport::HashWithIndifferentAccess.new
     end
 
     # Returns meta tag value by name.
@@ -70,14 +70,16 @@ module MetaTags
       with_defaults(defaults) { extract_full_title }
     end
 
-    # Constructs the title without site title (for normalized parameters).
+    # Constructs the title without site title (for normalized parameters). When title is empty,
+    # use the site title instead.
     #
     # @return [String] page title.
     #
     def page_title(defaults = {})
       old_site = @meta_tags[:site]
       @meta_tags[:site] = nil
-      with_defaults(defaults) { extract_full_title }
+      full_title = with_defaults(defaults) { extract_full_title }
+      full_title.presence || old_site || ''
     ensure
       @meta_tags[:site] = old_site
     end
@@ -170,10 +172,10 @@ module MetaTags
     # Converts input hash to HashWithIndifferentAccess and renames :open_graph to :og.
     #
     # @param [Hash] meta_tags list of meta tags.
-    # @return [HashWithIndifferentAccess] normalized meta tags list.
+    # @return [ActiveSupport::HashWithIndifferentAccess] normalized meta tags list.
     #
     def normalize_open_graph(meta_tags)
-      meta_tags = meta_tags.kind_of?(HashWithIndifferentAccess) ? meta_tags.dup : meta_tags.with_indifferent_access
+      meta_tags = meta_tags.with_indifferent_access
       meta_tags[:og] = meta_tags.delete(:open_graph) if meta_tags.key?(:open_graph)
       meta_tags
     end

data/lib/meta_tags/text_normalizer.rb

@@ -205,7 +205,7 @@ module MetaTags
       # What should we truncate first: site title or page title?
       main_title = MetaTags.config.truncate_site_title_first ? title : [site_title]
 
-      main_length = main_title.map(&:length).sum + (main_title.size - 1) * separator.length
+      main_length = main_title.map(&:length).sum + ((main_title.size - 1) * separator.length)
       main_limited_length = global_limit
 
       secondary_limited_length = global_limit - (main_length > 0 ? main_length + separator.length : 0)

data/lib/meta_tags/version.rb

@@ -2,6 +2,6 @@
 
 module MetaTags
   # Gem version.
-  VERSION = '2.16.0'
+  VERSION = '2.18.0'
   public_constant :VERSION
 end

data/lib/meta_tags/view_helper.rb

@@ -27,7 +27,7 @@ module MetaTags
     #
     # @see #display_meta_tags
     #
-    def set_meta_tags(meta_tags = {}) # rubocop:disable Naming/AccessorMethodName
+    def set_meta_tags(meta_tags = {})
       self.meta_tags.update(meta_tags)
     end
 

data/lib/meta_tags.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'set'
+require 'active_support/core_ext/hash/indifferent_access'
+
 # MetaTags gem namespace.
 module MetaTags
   # Returns MetaTags gem configuration.

data/meta-tags.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/kpumuk/meta-tags"
   spec.license       = "MIT"
   spec.platform      = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.|(bin|test|spec|features)/)}) }
   spec.bindir        = "exe"
@@ -26,17 +26,18 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "railties", ">= 3.2.0", "< 7.1"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.10.0"
+  spec.add_development_dependency "rspec", "~> 3.11.0"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.9.1"
 
   spec.cert_chain    = ["certs/kpumuk.pem"]
   spec.signing_key   = File.expand_path("~/.ssh/gem-kpumuk.pem") if $PROGRAM_NAME.end_with?('gem')
 
   spec.metadata = {
-    "bug_tracker_uri"   => "https://github.com/kpumuk/meta-tags/issues/",
-    "changelog_uri"     => "https://github.com/kpumuk/meta-tags/blob/main/CHANGELOG.md",
-    "documentation_uri" => "https://rubydoc.info/github/kpumuk/meta-tags/",
-    "homepage_uri"      => "https://github.com/kpumuk/meta-tags/",
-    "source_code_uri"   => "https://github.com/kpumuk/meta-tags/",
+    "bug_tracker_uri"       => "https://github.com/kpumuk/meta-tags/issues/",
+    "changelog_uri"         => "https://github.com/kpumuk/meta-tags/blob/main/CHANGELOG.md",
+    "documentation_uri"     => "https://rubydoc.info/github/kpumuk/meta-tags/",
+    "homepage_uri"          => "https://github.com/kpumuk/meta-tags/",
+    "source_code_uri"       => "https://github.com/kpumuk/meta-tags/",
+    "rubygems_mfa_required" => "true",
   }
 end

data/sig/lib/_internal/rails.rbs

@@ -0,0 +1,56 @@
+class ::Hash[unchecked out K, unchecked out V]
+  def with_indifferent_access: () -> ActiveSupport::HashWithIndifferentAccess[K, V]
+  def deep_merge!: (instance | ActiveSupport::HashWithIndifferentAccess[K, V] other) -> self
+end
+
+class ::Object
+  def presence: () -> self?
+  def blank?: () -> bool
+  def present?: () -> bool
+end
+
+class ::Loofah
+  module TextBehavior
+    def text: (?Hash[Symbol, untyped]? options) -> String
+  end
+
+  class DocumentFragment
+    include TextBehavior
+  end
+
+  def self.fragment: (String tags, ?String? encoding) -> DocumentFragment
+end
+
+class ::Rails
+end
+
+module ActionController
+  class Base
+    include _ActionControllerBase
+
+    def self.helpers: () -> _ActionViewBase
+  end
+end
+
+module ActiveSupport
+  class HashWithIndifferentAccess[unchecked out K, unchecked out V] < Hash[K, V]
+    def with_indifferent_access: () -> self
+    def deep_merge!: (instance | Hash[K, V] other) -> self
+  end
+end
+
+interface _ActionControllerBase
+  def render: (*untyped args) { () -> untyped } -> untyped
+end
+
+interface _ActionViewBase
+  def tag: (String name, ?Hash[String | Symbol, untyped] options, ?bool open) -> void
+
+  def content_tag: (String name, String content, ?Hash[String | Symbol, untyped] options, ?bool open) -> void
+
+  def safe_join: (Array[String], String) -> String
+
+  def truncate: (String text, ?Hash[Symbol, untyped] options) -> String
+
+  def strip_tags: (String html) -> String
+end

data/sig/lib/meta_tags/meta_tags_collection.rbs

@@ -28,7 +28,7 @@ module MetaTags
 
     def extract_robots: () -> Hash[String, String]
 
-    def normalize_open_graph: (Hash[String | Symbol, untyped] meta_tags) -> Hash[String | Symbol, untyped]
+    def normalize_open_graph: (Hash[String | Symbol, untyped] meta_tags) -> ActiveSupport::HashWithIndifferentAccess[String | Symbol, untyped]
 
     def extract_separator_section: (String | Symbol name, String default) -> String
 

data/sig/lib/meta_tags/text_normalizer.rbs

@@ -21,7 +21,7 @@ module MetaTags
 
     def cleanup_strings: (keywords? strings, ?strip: bool strip) -> Array[String]
 
-    def truncate: (String string, ?Integer limit, ?String natural_separator) -> String
+    def truncate: (String string, ?Integer? limit, ?String natural_separator) -> String
 
     def truncate_array: (Array[String] string_array, ?Integer? limit, ?String separator, ?String natural_separator) -> Array[String]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta-tags
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Dmytro Shteflyuk
@@ -11,8 +11,8 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhrcHVt
-  dWsvREM9a3B1bXVrL0RDPWluZm8wHhcNMjAxMjEwMjA1MTE5WhcNMjExMjEwMjA1
-  MTE5WjAjMSEwHwYDVQQDDBhrcHVtdWsvREM9a3B1bXVrL0RDPWluZm8wggEiMA0G
+  dWsvREM9a3B1bXVrL0RDPWluZm8wHhcNMjIwNzA1MjIyODU4WhcNMjMwNzA1MjIy
+  ODU4WjAjMSEwHwYDVQQDDBhrcHVtdWsvREM9a3B1bXVrL0RDPWluZm8wggEiMA0G
   CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8NmK6GXPiE/q7PDbj7nNdw3pa8a6Q
   IDxLtc7kW95e1mh0TVgOE8kvGegGtRtjvhXVGTTFtZ+yMD/0DCfTM2oUQYk5oYpO
   ZGrCfbNIdZauf4WYsnJtKOTrRoqFMwpL5PlBDKczB2y5lUmQs2HIsjQ0Q21wdKyy
@@ -21,15 +21,15 @@ cert_chain:
   RryRTj5NVZbq9p1/WRc5zxD9QhAEPjRa5ikbd+eWebIDpAKI0hpyC/9bAgMBAAGj
   dzB1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBT2uFRXNWDpVdbv
   +xBk8DAgJPGBPTAdBgNVHREEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wHQYDVR0S
-  BBYwFIESa3B1bXVrQGtwdW11ay5pbmZvMA0GCSqGSIb3DQEBCwUAA4IBAQBdcrpl
-  32OlNaf68v38yzqYkviLELtbzRvEpRuQWZZyxOwU1OWSFAWkkALuseLWHDLYRDE8
-  lOzQHewKodqaSPEo63vMZ28UQ3kDP1YE+cXR12fOg4YbCH8VETrTJa3X0AOOAbgA
-  ZLMcZD6wu9Zu2rPhxLxs6Q/PaGGEc8bonOirCZrwVDzHFA1cPjcSoApdsyGdRiyj
-  1f+XHXjCE5A1A6b8o4ffpAI6gkuaQOIrgGCyLS9oos6DSuofkvXI9g62G+2ZOmKJ
-  U97JEQmXCpruLEeSVT2UqR+iJAWEAxPzqzDbTzZBTSPKn+nXeuF6h81e4hsJtkeJ
-  HkYAoatF9iZrxT4E
+  BBYwFIESa3B1bXVrQGtwdW11ay5pbmZvMA0GCSqGSIb3DQEBCwUAA4IBAQBa5fMh
+  JcbhWBoP3kA32g3yM238fyJlre/ZeE6WIFxcuETff8AgPmk550qpAF/WBtP23X8Q
+  khIFv+bFiuBURvNbuFevs23to7NeNA7XMmEJqjB6fRzO/i/a3bkLG07u+o74MyXe
+  3/VAxl4Ce+C3aLwXccsbD+Fe3kQ6ku4ceIh2WebBSkpG3WRANReEAf7lcOt4aGEt
+  nkYjyHgDz6/gYamK15XtOivglkTJDwAVGBzF9o6j5IQ9nXho8Vd2P+hiawx76CoT
+  ANVO3I4ZwTKD12DMFqjalLwbSVVO4wpuMO3tcAgO4q7Fqh2tXTXom/YYl0SFvmx4
+  evTPD0iY8lmGP3ZM
   -----END CERTIFICATE-----
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -91,14 +91,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ files:
 - lib/meta_tags/version.rb
 - lib/meta_tags/view_helper.rb
 - meta-tags.gemspec
-- sig/lib/_rails.rbs
+- sig/lib/_internal/rails.rbs
 - sig/lib/meta_tags.rbs
 - sig/lib/meta_tags/configuration.rbs
 - sig/lib/meta_tags/content_tag.rbs
@@ -164,6 +164,7 @@ metadata:
   documentation_uri: https://rubydoc.info/github/kpumuk/meta-tags/
   homepage_uri: https://github.com/kpumuk/meta-tags/
   source_code_uri: https://github.com/kpumuk/meta-tags/
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -172,14 +173,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Collection of SEO helpers for Ruby on Rails.

data/sig/lib/_rails.rbs

@@ -1,26 +0,0 @@
-class ::Hash[unchecked out K, unchecked out V]
-  def with_indifferent_access: () -> instance
-  def deep_merge!: (instance other) -> self
-end
-
-class ::Object
-  def presence: () -> String?
-  def blank?: () -> bool
-  def present?: () -> bool
-end
-
-interface _ActionControllerBase
-  def render: (*untyped args) { () -> untyped } -> untyped
-end
-
-interface _ActionViewBase
-  def tag: (String name, ?Hash[String | Symbol, untyped] options, ?bool open) -> void
-
-  def content_tag: (String name, String content, ?Hash[String | Symbol, untyped] options, ?bool open) -> void
-
-  def safe_join: (Array[String], String) -> String
-
-  def truncate: (String text, ?Hash[Symbol, untyped] options) -> String
-
-  def strip_tags: (String html) -> String
-end