meta-tags 2.18.0 → 2.20.0

data/lib/meta_tags.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'set'
-require 'active_support/core_ext/hash/indifferent_access'
+require "set"
+require "active_support/core_ext/hash/indifferent_access"
 
 # MetaTags gem namespace.
 module MetaTags
@@ -24,15 +24,15 @@ module MetaTags
   end
 end
 
-require 'meta_tags/version'
+require "meta_tags/version"
 
-require 'meta_tags/configuration'
-require 'meta_tags/controller_helper'
-require 'meta_tags/meta_tags_collection'
-require 'meta_tags/renderer'
-require 'meta_tags/tag'
-require 'meta_tags/content_tag'
-require 'meta_tags/text_normalizer'
-require 'meta_tags/view_helper'
+require "meta_tags/configuration"
+require "meta_tags/controller_helper"
+require "meta_tags/meta_tags_collection"
+require "meta_tags/renderer"
+require "meta_tags/tag"
+require "meta_tags/content_tag"
+require "meta_tags/text_normalizer"
+require "meta_tags/view_helper"
 
-require 'meta_tags/railtie' if defined?(Rails)
+require "meta_tags/railtie" if defined?(Rails)

data/meta-tags.gemspec

@@ -1,43 +1,52 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'meta_tags/version'
+require "meta_tags/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "meta-tags"
-  spec.version       = MetaTags::VERSION
-  spec.authors       = ["Dmytro Shteflyuk"]
-  spec.email         = ["kpumuk@kpumuk.info"]
-
-  spec.summary       = "Collection of SEO helpers for Ruby on Rails."
-  spec.description   = "Search Engine Optimization (SEO) plugin for Ruby on Rails applications."
-  spec.homepage      = "https://github.com/kpumuk/meta-tags"
-  spec.license       = "MIT"
-  spec.platform      = Gem::Platform::RUBY
-  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"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.name = "meta-tags"
+  spec.version = MetaTags::VERSION
+  spec.authors = ["Dmytro Shteflyuk"]
+  spec.email = ["kpumuk@kpumuk.info"]
+
+  spec.summary = "Collection of SEO helpers for Ruby on Rails."
+  spec.description = "Search Engine Optimization (SEO) plugin for Ruby on Rails applications."
+  spec.homepage = "https://github.com/kpumuk/meta-tags"
+  spec.license = "MIT"
+  spec.platform = Gem::Platform::RUBY
+  spec.required_ruby_version = ">= 2.7.0"
+
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.|Gemfile|Appraisals|Steepfile|(bin|spec|gemfiles)/)}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "actionpack", ">= 3.2.0", "< 7.1"
+  spec.add_runtime_dependency "actionpack", ">= 6.0.0", "< 7.2"
 
-  spec.add_development_dependency "railties", ">= 3.2.0", "< 7.1"
+  spec.add_development_dependency "railties", ">= 3.2.0", "< 7.2"
   spec.add_development_dependency "rake", "~> 13.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.add_development_dependency "rspec", "~> 3.12.0"
+  spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0"
+  spec.add_development_dependency "appraisal", "~> 2.5.0"
+  spec.add_development_dependency "simplecov", "~> 0.22.0"
+  # Code style
+  spec.add_development_dependency "standard", "~> 1.31"
+  spec.add_development_dependency "rubocop-rails", "~> 2.23.0"
+  spec.add_development_dependency "rubocop-rake", "~> 0.6.0"
+  spec.add_development_dependency "rubocop-rspec", "~> 2.25.0"
+  # Format RSpec output for CircleCI
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0"
+
+  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/",
-    "rubygems_mfa_required" => "true",
+    "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

@@ -1,9 +1,12 @@
 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
+  def with_defaults: (instance | ActiveSupport::HashWithIndifferentAccess[K, V] other) -> self
 end
 
 class ::Object
+  $OFS: String
+
   def presence: () -> self?
   def blank?: () -> bool
   def present?: () -> bool

data/sig/lib/meta_tags/configuration.rbs

@@ -1,7 +1,14 @@
 module MetaTags
   class Configuration
+    type html_tag_key = String | Symbol
+    type html_tag_value = Hash[html_tag_key, html_tag_value] | html_tag_content
+    type html_tag_content = String? | Symbol | (_Stringish & Object)
+
+
     attr_accessor title_limit: Integer?
     attr_accessor truncate_site_title_first: bool
+    attr_accessor truncate_on_natural_separator: String?|Regexp
+    attr_accessor title_tag_attributes: Hash[html_tag_key, html_tag_value]?
     attr_accessor description_limit: Integer
     attr_accessor keywords_limit: Integer
     attr_accessor keywords_separator: String

data/sig/lib/meta_tags/controller_helper.rbs

@@ -1,5 +1,6 @@
 module MetaTags
   module ControllerHelper : _ActionControllerBase
+    @meta_tags: MetaTagsCollection?
     @page_title: String?
     @page_description: String?
     @page_keywords: String? | Array[String]

data/sig/lib/meta_tags/text_normalizer.rbs

@@ -21,9 +21,9 @@ 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
 
-    def truncate_array: (Array[String] string_array, ?Integer? limit, ?String separator, ?String natural_separator) -> Array[String]
+    def truncate_array: (Array[String] string_array, ?Integer? limit, ?String separator) -> Array[String]
 
     private
 

data/sig/lib/meta_tags/view_helper.rbs

@@ -1,5 +1,7 @@
 module MetaTags
   module ViewHelper : Module, _ActionViewBase
+    @meta_tags: MetaTagsCollection?
+
     # type meta_tags = {
     #     site: String?,
     #     title: Array[String] | String?,

data/sig/lib/meta_tags.rbs

@@ -1,4 +1,6 @@
 module MetaTags
+  self.@config: Configuration
+
   def self.config: () -> Configuration
   def self.configure: () { (Configuration) -> void } -> void
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta-tags
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Dmytro Shteflyuk
@@ -10,26 +10,27 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhrcHVt
-  dWsvREM9a3B1bXVrL0RDPWluZm8wHhcNMjIwNzA1MjIyODU4WhcNMjMwNzA1MjIy
-  ODU4WjAjMSEwHwYDVQQDDBhrcHVtdWsvREM9a3B1bXVrL0RDPWluZm8wggEiMA0G
-  CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8NmK6GXPiE/q7PDbj7nNdw3pa8a6Q
-  IDxLtc7kW95e1mh0TVgOE8kvGegGtRtjvhXVGTTFtZ+yMD/0DCfTM2oUQYk5oYpO
-  ZGrCfbNIdZauf4WYsnJtKOTrRoqFMwpL5PlBDKczB2y5lUmQs2HIsjQ0Q21wdKyy
-  7tXiZPoCoJ+kH+b4/d4dcNvAXVnWgO2HoLW5oqWfqY5swkAHzwHLU+rlxxuHUqOy
-  8/Y4hUSOXVIsxWxl3EapENm+QAfBRZn3L26hEb80CgSAp8m47Cj9DaSd7xoDtrIe
-  RryRTj5NVZbq9p1/WRc5zxD9QhAEPjRa5ikbd+eWebIDpAKI0hpyC/9bAgMBAAGj
-  dzB1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBT2uFRXNWDpVdbv
-  +xBk8DAgJPGBPTAdBgNVHREEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wHQYDVR0S
-  BBYwFIESa3B1bXVrQGtwdW11ay5pbmZvMA0GCSqGSIb3DQEBCwUAA4IBAQBa5fMh
-  JcbhWBoP3kA32g3yM238fyJlre/ZeE6WIFxcuETff8AgPmk550qpAF/WBtP23X8Q
-  khIFv+bFiuBURvNbuFevs23to7NeNA7XMmEJqjB6fRzO/i/a3bkLG07u+o74MyXe
-  3/VAxl4Ce+C3aLwXccsbD+Fe3kQ6ku4ceIh2WebBSkpG3WRANReEAf7lcOt4aGEt
-  nkYjyHgDz6/gYamK15XtOivglkTJDwAVGBzF9o6j5IQ9nXho8Vd2P+hiawx76CoT
-  ANVO3I4ZwTKD12DMFqjalLwbSVVO4wpuMO3tcAgO4q7Fqh2tXTXom/YYl0SFvmx4
-  evTPD0iY8lmGP3ZM
+  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MQ8wDQYDVQQDDAZrcHVt
+  dWsxFjAUBgoJkiaJk/IsZAEZFgZrcHVtdWsxFDASBgoJkiaJk/IsZAEZFgRpbmZv
+  MB4XDTIzMDcwNjEyMjY0MVoXDTI0MDcwNTEyMjY0MVowPzEPMA0GA1UEAwwGa3B1
+  bXVrMRYwFAYKCZImiZPyLGQBGRYGa3B1bXVrMRQwEgYKCZImiZPyLGQBGRYEaW5m
+  bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALw2YroZc+IT+rs8NuPu
+  c13DelrxrpAgPEu1zuRb3l7WaHRNWA4TyS8Z6Aa1G2O+FdUZNMW1n7IwP/QMJ9Mz
+  ahRBiTmhik5kasJ9s0h1lq5/hZiycm0o5OtGioUzCkvk+UEMpzMHbLmVSZCzYciy
+  NDRDbXB0rLLu1eJk+gKgn6Qf5vj93h1w28BdWdaA7YegtbmipZ+pjmzCQAfPActT
+  6uXHG4dSo7Lz9jiFRI5dUizFbGXcRqkQ2b5AB8FFmfcvbqERvzQKBICnybjsKP0N
+  pJ3vGgO2sh5GvJFOPk1Vlur2nX9ZFznPEP1CEAQ+NFrmKRt355Z5sgOkAojSGnIL
+  /1sCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFPa4
+  VFc1YOlV1u/7EGTwMCAk8YE9MB0GA1UdEQQWMBSBEmtwdW11a0BrcHVtdWsuaW5m
+  bzAdBgNVHRIEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wDQYJKoZIhvcNAQELBQAD
+  ggEBALwivjTzGErFzBtgPEQe7uO6DMysgm/OIF5jLFkvRiuFbuueHM2cUZZBx2Rd
+  2R5uQS4uiZ5KA+3SkgWQOFOzpFlo7ywS5264ULCcvfix6NQpb2aIDsZuzWGBIDbs
+  ixS+8wYslrzsOgUSn/RjF0sVB0dw4wv6G8YnVrR/Jf2SaO+Q2lYuKEOKfj52I+Yt
+  TdFiOjR+WwXSxs/XdSdFtqK2q/THbZdk+HkAe8guvXYtD/fzO2mBlk2AQ0hV1Pxu
+  ovz1LEphwrX/6v635mteXvl+OKWrNo1Q78sU364BgY5MvJMxFytmUrKMgO6RAiIM
+  N9+lhJiLa7+h0LrvPPDZRhV8ze0=
   -----END CERTIFICATE-----
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -37,20 +38,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +61,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +71,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,28 +92,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.31'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.31'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.23.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.23.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.25.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.25.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.6.0
 description: Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 email:
 - kpumuk@kpumuk.info
@@ -123,11 +222,9 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
-- Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- Steepfile
 - certs/kpumuk.pem
 - lib/generators/meta_tags/install_generator.rb
 - lib/generators/meta_tags/templates/config/initializers/meta_tags.rb
@@ -173,14 +270,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Collection of SEO helpers for Ruby on Rails.

data/Gemfile

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in meta-tags.gemspec
-gemspec
-
-if ENV['RAILS_VERSION']
-  # Install specified version of actionpack if requested
-  gem 'railties', "~> #{ENV['RAILS_VERSION']}"
-end
-
-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.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.21.2'
-  # Format RSpec output for CircleCI
-  gem 'rspec_junit_formatter'
-end

data/Steepfile

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-target :lib do
-  signature "sig"
-
-  check "lib"
-  # check "Gemfile"
-
-  # We don't want to type check Rails/RSpec related code
-  # (because we don't have RBS files for it)
-  ignore "lib/meta_tags/railtie.rb"
-  ignore "lib/generators"
-
-  library "set"
-end