meta-tags 2.18.0 → 2.20.0

data/Rakefile

@@ -1,22 +1,15 @@
 # frozen_string_literal: true
 
-require 'bundler'
+require "bundler"
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
+desc "Run RSpec tests"
 task test: :spec
 task default: :spec
 
-desc 'Rebuild Circle CI configuration based on the build matrix template .circleci/config.yml.erb'
-task :circleci do
-  require 'erb'
-  template_path = File.expand_path('.circleci/config.yml.erb', __dir__)
-  config_path = File.expand_path('.circleci/config.yml', __dir__)
-  File.write config_path, ERB.new(File.read(template_path)).result
-end
-
 module SteepRunner
   def self.run(*command)
     require "steep"
@@ -26,24 +19,30 @@ module SteepRunner
   end
 end
 
-task :steep do
-  SteepRunner.run("check")
-end
+desc "Check type information"
+task steep: "steep:check"
 
 namespace :steep do
+  desc "Check type information"
+  task :check do
+    SteepRunner.run("check")
+  end
+
+  desc "Print type statistics"
   task :stats do
     SteepRunner.run("stats", "--log-level=fatal")
   end
 end
 
 namespace :rbs do
+  desc "Run RSpec tests with RBS enabled to test type signatures"
   task :spec do
     exec(
       {
-        'RBS_TEST_TARGET' => 'MetaTags::*',
-        'RUBYOPT'         => '-rrbs/test/setup',
+        "RBS_TEST_TARGET" => "MetaTags::*",
+        "RUBYOPT" => "-rrbs/test/setup"
       },
-      'bundle exec rspec',
+      "bundle exec rspec"
     )
   end
 end

data/certs/kpumuk.pem

@@ -1,20 +1,21 @@
 -----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-----

data/lib/generators/meta_tags/install_generator.rb

@@ -4,7 +4,7 @@ module MetaTags
   module Generators
     class InstallGenerator < Rails::Generators::Base
       desc "Copy MetaTags default files"
-      source_root File.expand_path('templates', __dir__)
+      source_root File.expand_path("templates", __dir__)
 
       def copy_config
         template "config/initializers/meta_tags.rb"

data/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb

@@ -9,6 +9,12 @@ MetaTags.configure do |config|
   # When true, site title will be truncated instead of title. Default is false.
   # config.truncate_site_title_first = false
 
+  # Add HTML attributes to the <title> HTML tag. Default is {}.
+  # config.title_tag_attributes = {}
+
+  # Add HTML attributes to the <title> HTML tag. Default is {}.
+  # config.title_tag_attributes = {}
+
   # Maximum length of the page description. Default is 300.
   # Set to nil or 0 to remove limits.
   # config.description_limit = 300

data/lib/meta-tags.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'meta_tags'
+require "meta_tags"

data/lib/meta_tags/configuration.rb

@@ -6,9 +6,15 @@ module MetaTags
     # How many characters to truncate title to.
     attr_accessor :title_limit
 
+    # HTML attributes for the title tag.
+    attr_accessor :title_tag_attributes
+
     # Truncate site_title instead of title.
     attr_accessor :truncate_site_title_first
 
+    # A string or regexp separator to truncate text at a natural break.
+    attr_accessor :truncate_on_natural_separator
+
     # How many characters to truncate description to.
     attr_accessor :description_limit
 
@@ -47,25 +53,25 @@ module MetaTags
     def default_property_tags
       [
         # App Link metadata https://developers.facebook.com/docs/applinks/metadata-reference
-        'al',
+        "al",
         # Open Graph Markup https://developers.facebook.com/docs/sharing/webmasters#markup
-        'fb',
-        'og',
+        "fb",
+        "og",
         # Facebook OpenGraph Object Types https://developers.facebook.com/docs/reference/opengraph
         # Note that these tags are used in a regex, so including e.g. 'restaurant' will affect
         # 'restaurant:category', 'restaurant:price_rating', and anything else under that namespace.
-        'article',
-        'book',
-        'books',
-        'business',
-        'fitness',
-        'game',
-        'music',
-        'place',
-        'product',
-        'profile',
-        'restaurant',
-        'video',
+        "article",
+        "book",
+        "books",
+        "business",
+        "fitness",
+        "game",
+        "music",
+        "place",
+        "product",
+        "profile",
+        "restaurant",
+        "video"
       ].freeze
     end
 
@@ -76,9 +82,11 @@ module MetaTags
     def reset_defaults!
       @title_limit = 70
       @truncate_site_title_first = false
+      @truncate_on_natural_separator = " "
+      @title_tag_attributes = {}
       @description_limit = 300
       @keywords_limit = 255
-      @keywords_separator = ', '
+      @keywords_separator = ", "
       @keywords_lowercase = true
       @property_tags = default_property_tags.dup
       @open_meta_tags = true

data/lib/meta_tags/controller_helper.rb

@@ -15,8 +15,8 @@ module MetaTags
     # Processes the <tt>@page_title</tt>, <tt>@page_keywords</tt>, and
     # <tt>@page_description</tt> instance variables and calls +render+.
     def render(*args, &block)
-      meta_tags[:title]       = @page_title       if defined?(@page_title) && @page_title
-      meta_tags[:keywords]    = @page_keywords    if defined?(@page_keywords) && @page_keywords
+      meta_tags[:title] = @page_title if defined?(@page_title) && @page_title
+      meta_tags[:keywords] = @page_keywords if defined?(@page_keywords) && @page_keywords
       meta_tags[:description] = @page_description if defined?(@page_description) && @page_description
 
       super
@@ -25,7 +25,7 @@ module MetaTags
     # Set meta tags for the page.
     #
     # See <tt>MetaTags::ViewHelper#set_meta_tags</tt> for details.
-    def set_meta_tags(meta_tags) # rubocop:disable Naming/AccessorMethodName
+    def set_meta_tags(meta_tags)
       self.meta_tags.update(meta_tags)
     end
     protected :set_meta_tags

data/lib/meta_tags/meta_tags_collection.rb

@@ -39,12 +39,12 @@ module MetaTags
     #
     def update(object = {})
       meta_tags = if object.respond_to?(:to_meta_tags)
-                    # @type var object: (_MetaTagish & Object)
-                    object.to_meta_tags
-                  else
-                    # @type var object: Hash[String | Symbol, untyped]
-                    object
-                  end
+        # @type var object: _MetaTagish & Object
+        object.to_meta_tags
+      else
+        # @type var object: Hash[String | Symbol, untyped]
+        object
+      end
       @meta_tags.deep_merge! normalize_open_graph(meta_tags)
     end
 
@@ -79,7 +79,7 @@ module MetaTags
       old_site = @meta_tags[:site]
       @meta_tags[:site] = nil
       full_title = with_defaults(defaults) { extract_full_title }
-      full_title.presence || old_site || ''
+      full_title.presence || old_site || ""
     ensure
       @meta_tags[:site] = old_site
     end
@@ -106,10 +106,10 @@ module MetaTags
     # @return [String] page title.
     #
     def extract_full_title
-      site_title = extract(:site) || ''
-      title      = extract_title
-      separator  = extract_separator
-      reverse    = extract(:reverse) == true
+      site_title = extract(:site) || ""
+      title = extract_title
+      separator = extract_separator
+      reverse = extract(:reverse) == true
 
       TextNormalizer.normalize_title(site_title, title, separator, reverse)
     end
@@ -136,15 +136,15 @@ module MetaTags
     def extract_separator
       if meta_tags[:separator] == false
         # Special case: if separator is hidden, do not display suffix/prefix
-        prefix = separator = suffix = ''
+        prefix = separator = suffix = ""
       else
-        prefix    = extract_separator_section(:prefix, ' ')
-        separator = extract_separator_section(:separator, '|')
-        suffix    = extract_separator_section(:suffix, ' ')
+        prefix = extract_separator_section(:prefix, " ")
+        separator = extract_separator_section(:separator, "|")
+        suffix = extract_separator_section(:suffix, " ")
       end
       delete(:separator, :prefix, :suffix)
 
-      TextNormalizer.safe_join([prefix, separator, suffix], '')
+      TextNormalizer.safe_join([prefix, separator, suffix], "")
     end
 
     # Extracts noindex settings as a Hash mapping noindex tag name to value.
@@ -159,12 +159,12 @@ module MetaTags
         [:noindex, :index],
         # follow has higher priority than nofollow
         [:follow, :nofollow],
-        :noarchive,
+        :noarchive
       ].each do |attributes|
         calculate_robots_attributes(result, attributes)
       end
 
-      result.transform_values { |v| v.join(', ') }
+      result.transform_values { |v| v.join(", ") }
     end
 
     protected
@@ -188,7 +188,7 @@ module MetaTags
     # @return [String] separator segment value.
     #
     def extract_separator_section(name, default)
-      meta_tags[name] == false ? '' : (meta_tags[name] || default)
+      (meta_tags[name] == false) ? "" : (meta_tags[name] || default)
     end
 
     # Extracts robots attribute (noindex, nofollow, etc) name and value.
@@ -197,11 +197,11 @@ module MetaTags
     # @return [Array<String>] pair of noindex attribute name and value.
     #
     def extract_robots_attribute(name)
-      noindex       = extract(name)
-      noindex_name  = noindex.kind_of?(String) || noindex.kind_of?(Array) ? noindex : 'robots'
+      noindex = extract(name)
+      noindex_name = (noindex.is_a?(String) || noindex.is_a?(Array)) ? noindex : "robots"
       noindex_value = noindex ? name.to_s : nil
 
-      [ noindex_name, noindex_value ]
+      [noindex_name, noindex_value]
     end
 
     def calculate_robots_attributes(result, attributes)

data/lib/meta_tags/railtie.rb

@@ -2,15 +2,15 @@
 
 module MetaTags
   class Railtie < Rails::Railtie
-    initializer 'meta_tags.setup_action_controller' do
+    initializer "meta_tags.setup_action_controller" do
       ActiveSupport.on_load :action_controller do
-        ActionController::Base.include MetaTags::ControllerHelper
+        include MetaTags::ControllerHelper
       end
     end
 
-    initializer 'meta_tags.setup_action_view' do
+    initializer "meta_tags.setup_action_view" do
       ActiveSupport.on_load :action_view do
-        ActionView::Base.include MetaTags::ViewHelper
+        include MetaTags::ViewHelper
       end
     end
   end

data/lib/meta_tags/renderer.rb

@@ -59,7 +59,11 @@ module MetaTags
       normalized_meta_tags[:site] = meta_tags[:site]
       title = meta_tags.extract_full_title
       normalized_meta_tags[:full_title] = title
-      tags << ContentTag.new(:title, content: title) if title.present?
+      default_attributes = MetaTags.config.title_tag_attributes || {}
+
+      if title.present?
+        tags << ContentTag.new(:title, {content: title}.with_defaults(default_attributes))
+      end
     end
 
     # Renders icon(s) tag.
@@ -71,12 +75,12 @@ module MetaTags
       return unless icon
 
       # String? Value is an href
-      icon = [{ href: icon }] if icon.kind_of?(String)
+      icon = [{href: icon}] if icon.is_a?(String)
       # Hash? Single icon instead of a list of icons
-      icon = [icon] if icon.kind_of?(Hash)
+      icon = [icon] if icon.is_a?(Hash)
 
       icon.each do |icon_params|
-        icon_params = { rel: 'icon', type: 'image/x-icon' }.with_indifferent_access.merge(icon_params)
+        icon_params = {rel: "icon", type: "image/x-icon"}.with_indifferent_access.merge(icon_params)
         tags << Tag.new(:link, icon_params)
       end
     end
@@ -88,7 +92,7 @@ module MetaTags
     # @see TextNormalizer
     #
     def render_with_normalization(tags, name)
-      value = TextNormalizer.public_send("normalize_#{name}", meta_tags.extract(name))
+      value = TextNormalizer.public_send(:"normalize_#{name}", meta_tags.extract(name))
       normalized_meta_tags[name] = value
       tags << Tag.new(:meta, name: name, content: value) if value.present?
     end
@@ -109,7 +113,7 @@ module MetaTags
     #
     def render_refresh(tags)
       refresh = meta_tags.extract(:refresh)
-      tags << Tag.new(:meta, 'http-equiv' => 'refresh', content: refresh.to_s) if refresh.present?
+      tags << Tag.new(:meta, "http-equiv" => "refresh", :content => refresh.to_s) if refresh.present?
     end
 
     # Renders alternate link tags.
@@ -120,13 +124,13 @@ module MetaTags
       alternate = meta_tags.extract(:alternate)
       return unless alternate
 
-      if alternate.kind_of?(Hash)
+      if alternate.is_a?(Hash)
         alternate.each do |hreflang, href|
-          tags << Tag.new(:link, rel: 'alternate', href: href, hreflang: hreflang) if href.present?
+          tags << Tag.new(:link, rel: "alternate", href: href, hreflang: hreflang) if href.present?
         end
-      elsif alternate.kind_of?(Array)
+      elsif alternate.is_a?(Array)
         alternate.each do |link_params|
-          tags << Tag.new(:link, { rel: 'alternate' }.with_indifferent_access.merge(link_params))
+          tags << Tag.new(:link, {rel: "alternate"}.with_indifferent_access.merge(link_params))
         end
       end
     end
@@ -143,7 +147,7 @@ module MetaTags
       title = open_search[:title]
 
       type = "application/opensearchdescription+xml"
-      tags << Tag.new(:link, rel: 'search', type: type, href: href, title: title) if href.present?
+      tags << Tag.new(:link, rel: "search", type: type, href: href, title: title) if href.present?
     end
 
     # Renders links.
@@ -151,7 +155,7 @@ module MetaTags
     # @param [Array<Tag>] tags a buffer object to store tag in.
     #
     def render_links(tags)
-      [ :amphtml, :prev, :next, :image_src, :manifest ].each do |tag_name|
+      [:amphtml, :prev, :next, :image_src, :manifest].each do |tag_name|
         href = meta_tags.extract(tag_name)
         if href.present?
           @normalized_meta_tags[tag_name] = href
@@ -189,7 +193,7 @@ module MetaTags
     #
     def render_hash(tags, key, **opts)
       data = meta_tags.meta_tags[key]
-      return unless data.kind_of?(Hash)
+      return unless data.is_a?(Hash)
 
       process_hash(tags, key, data, **opts)
       meta_tags.extract(key)
@@ -202,7 +206,7 @@ module MetaTags
     def render_custom(tags)
       meta_tags.meta_tags.each do |name, data|
         Array(data).each do |val|
-          tags << Tag.new(:meta, configured_name_key(name) => name, content: val)
+          tags << Tag.new(:meta, configured_name_key(name) => name, :content => val)
         end
         meta_tags.extract(name)
       end
@@ -217,14 +221,14 @@ module MetaTags
     #
     def process_tree(tags, property, content, itemprop: nil, **opts)
       method = case content
-               when Hash
-                 :process_hash
-               when Array
-                 :process_array
-               else
-                 iprop = itemprop
-                 :render_tag
-               end
+      when Hash
+        :process_hash
+      when Array
+        :process_array
+      else
+        iprop = itemprop
+        :render_tag
+      end
       __send__(method, tags, property, content, itemprop: iprop, **opts)
     end
 
@@ -237,18 +241,18 @@ module MetaTags
     def process_hash(tags, property, content, **opts)
       itemprop = content.delete(:itemprop)
       content.each do |key, value|
-        if key.to_s == '_'
+        if key.to_s == "_"
           iprop = itemprop
           key = property
         else
           key = "#{property}:#{key}"
         end
 
-        normalized_value = if value.kind_of?(Symbol)
-                             normalized_meta_tags[value]
-                           else
-                             value
-                           end
+        normalized_value = if value.is_a?(Symbol)
+          normalized_meta_tags[value]
+        else
+          value
+        end
         process_tree(tags, key, normalized_value, **opts.merge(itemprop: iprop))
       end
     end
@@ -273,7 +277,7 @@ module MetaTags
     #
     def render_tag(tags, name, value, itemprop: nil)
       name_key ||= configured_name_key(name)
-      tags << Tag.new(:meta, name_key => name.to_s, content: value, itemprop: itemprop) if value.present?
+      tags << Tag.new(:meta, name_key => name.to_s, :content => value, :itemprop => itemprop) if value.present?
     end
 
     # Returns meta tag property name for a give meta tag based on the

data/lib/meta_tags/text_normalizer.rb

@@ -44,7 +44,7 @@ module MetaTags
       # serves the same purpose we could just as it to convert itself to str
       # and continue from there
       description = cleanup_string(description)
-      return '' if description.blank?
+      return "" if description.blank?
 
       truncate(description, MetaTags.config.description_limit)
     end
@@ -56,7 +56,7 @@ module MetaTags
     #
     def normalize_keywords(keywords)
       keywords = cleanup_strings(keywords)
-      return '' if keywords.blank?
+      return "" if keywords.blank?
 
       keywords.each(&:downcase!) if MetaTags.config.keywords_lowercase
       separator = cleanup_string MetaTags.config.keywords_separator, strip: false
@@ -107,12 +107,12 @@ module MetaTags
     # space characters squashed into a single space.
     #
     def cleanup_string(string, strip: true)
-      return '' if string.nil?
-      raise ArgumentError, 'Expected a string or an object that implements #to_str' unless string.respond_to?(:to_str)
+      return "" if string.nil?
+      raise ArgumentError, "Expected a string or an object that implements #to_str" unless string.respond_to?(:to_str)
 
       s = strip_tags(string.to_str)
       s = s.dup if s.frozen?
-      s.gsub!(/\s+/, ' ')
+      s.gsub!(/\s+/, " ")
       s.strip! if strip
 
       s
@@ -134,18 +134,17 @@ module MetaTags
     #
     # @param [String] string input strings.
     # @param [Integer,nil] limit characters number to truncate to.
-    # @param [String] natural_separator natural separator to truncate at.
     # @return [String] truncated string.
     #
-    def truncate(string, limit = nil, natural_separator = ' ')
-      return string if limit.to_i == 0 # rubocop:disable Lint/NumberConversion
+    def truncate(string, limit = nil)
+      return string if limit.to_i == 0
 
       helpers.truncate(
         string,
-        length:    limit,
-        separator: natural_separator,
-        omission:  '',
-        escape:    true,
+        length: limit,
+        separator: MetaTags.config.truncate_on_natural_separator,
+        omission: "",
+        escape: true
       )
     end
 
@@ -154,10 +153,9 @@ module MetaTags
     # @param [Array<String>] string_array input strings.
     # @param [Integer,nil] limit characters number to truncate to.
     # @param [String] separator separator that will be used to join array later.
-    # @param [String] natural_separator natural separator to truncate at.
     # @return [Array<String>] truncated array of strings.
     #
-    def truncate_array(string_array, limit = nil, separator = '', natural_separator = ' ')
+    def truncate_array(string_array, limit = nil, separator = "")
       return string_array if limit.nil? || limit <= 0
 
       length = 0
@@ -167,7 +165,7 @@ module MetaTags
         limit_left = calculate_limit_left(limit, length, result, separator)
 
         if string.length > limit_left
-          result << truncate(string, limit_left, natural_separator)
+          result << truncate(string, limit_left)
           break string_array
         end
 
@@ -188,14 +186,14 @@ module MetaTags
     end
 
     def truncate_title(site_title, title, separator)
-      global_limit = MetaTags.config.title_limit.to_i # rubocop:disable Lint/NumberConversion
+      global_limit = MetaTags.config.title_limit.to_i
       if global_limit > 0
         site_title_limited_length, title_limited_length = calculate_title_limits(
-          site_title, title, separator, global_limit,
+          site_title, title, separator, global_limit
         )
 
-        title = title_limited_length > 0 ? truncate_array(title, title_limited_length, separator) : []
-        site_title = site_title_limited_length > 0 ? truncate(site_title, site_title_limited_length) : nil
+        title = (title_limited_length > 0) ? truncate_array(title, title_limited_length, separator) : []
+        site_title = (site_title_limited_length > 0) ? truncate(site_title, site_title_limited_length) : nil
       end
 
       [site_title, title]
@@ -208,13 +206,13 @@ module MetaTags
       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)
+      secondary_limited_length = global_limit - ((main_length > 0) ? main_length + separator.length : 0)
       secondary_limited_length = [0, secondary_limited_length].max
 
       if MetaTags.config.truncate_site_title_first
-        [ secondary_limited_length, main_limited_length ]
+        [secondary_limited_length, main_limited_length]
       else
-        [ main_limited_length, secondary_limited_length ]
+        [main_limited_length, secondary_limited_length]
       end
     end
   end

data/lib/meta_tags/version.rb

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

data/lib/meta_tags/view_helper.rb

@@ -55,7 +55,7 @@ module MetaTags
     #
     # @see #display_meta_tags
     #
-    def title(title = nil, headline = '')
+    def title(title = nil, headline = "")
       set_meta_tags(title: title) unless title.nil?
       headline.presence || meta_tags[:title]
     end
@@ -203,7 +203,7 @@ module MetaTags
     #   <div data-page-container="true" title="<%= display_title title: 'My Page', site: 'PJAX Site' %>">
     #
     def display_title(defaults = {})
-      @meta_tags.full_title(defaults)
+      meta_tags.full_title(defaults)
     end
   end
 end