meta-tags 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c62e4368df6664d294c8a771a4fda243ef66408b017689742f5ceb5434963b6e
-  data.tar.gz: cfeb9bb181302099866df2d52cf46a9f8b413a0989e66408c987a648564c20a0
+  metadata.gz: 827318e8c08dab5cef3d26fb5b3be72c2c181c503d7d3c784c0175b6d0a4d8dd
+  data.tar.gz: 57aba518f8fae0222b7a7f88610de04504f9b8c09e617106b7f83856f33bca36
 SHA512:
-  metadata.gz: 9aa85cb08c594b6dde4e10e4d304d6336574f9dae2ee8556f129be282ef8bc41fe59ea9c307998eb3e94d3f96f4d5c70d3f779a849ef6a4b7a6199512c269272
-  data.tar.gz: 6e256b83bdf38ccad564ff572d970912d2feb29eac3097633691e2903b3873fd6841bbd1dff3f7b7c98dbc7fc781019fe5217ad7ab1e27d42a58b8591b4df7eb
+  metadata.gz: fd1ce5878ae54cf7b99c2815623a896fe34a03aba1c72f8914a7a617a508baee705cdeb64b8c3d325c5408029681db1c0015b17baf96c081da18161a93658b57
+  data.tar.gz: eb609dcf0374e880ff75eb664467f04f80367d605ef7bd84fc4446b3df579bbf6fd5ed5925485b5f39ce400e8328a6ccebf056a047a5bc7f11614694e0dfd9c5

checksums.yaml.gz.sig

@@ -1 +1 @@
-479��X��Q���+�9"�_r@	���`jTx�{���0U@��Ip���T槗Q�A��3�QіO\�<�_�X�_֐d ������3V�F�+�ݹ�dt����{E:0u�m��<4�&oFV����@��|��'I�ӹh��f @�GH��Џf��]ނj0��\$�uX��b��Sf�Se&쵈x<q���Ca��vX�Hb����>88�@avU!��Z/��720����X֯=U|JnP��B)j���
+g��H���0�Ξ��i�"x�i��܄Q��j��/�u���q�j)���
��,~�8uK7��6��e��0�/͞c�ě��P���jc��g�ՠT7͜�;&����~��rY+�0�}V���͟?Ꙑ}��i�M�sf��`BA3&P��QҠ���3�R�1�5�wAz5�זW����)�$R�6���M���4J�d$�\��Z�EvR��u�2���U#��>���C�<��0
fi].�f[��n��

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.11.0 (November 16, 2018) [☰](https://github.com/kpumuk/meta-tags/compare/v2.10.0...v2.11.0)
+
+Features:
+  - Added a configuration option `minify_output` to remove new line characters between meta tags ([182](https://github.com/kpumuk/meta-tags/pull/182))
+  – Title, description, and keywords can be an object responding to `#to_str` ([183](https://github.com/kpumuk/meta-tags/pull/183))
+
+Bugfixes:
+  - Truncate title before escaping HTML characters ([180](https://github.com/kpumuk/meta-tags/pull/180))
+
 ## 2.10.0 (June 8, 2018) [☰](https://github.com/kpumuk/meta-tags/compare/v2.9.0...v2.10.0)
 
 Features:

data/Gemfile

@@ -1,11 +1,21 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
 # Specify your gem's dependencies in meta-tags.gemspec
 gemspec
 
-gem 'actionpack', "~> #{ENV['RAILS_VERSION']}" if ENV['RAILS_VERSION']
+if ENV['RAILS_VERSION']
+  # Install specified version of actionpack if requested
+  gem 'actionpack', "~> #{ENV['RAILS_VERSION']}"
+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', '0.60.0'
+  # We use this gem on CI to calculate code coverage.
   gem 'simplecov'
+  # Format RSpec output for CircleCI
   gem 'rspec_junit_formatter'
 end

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
@@ -6,3 +8,11 @@ RSpec::Core::RakeTask.new(:spec)
 
 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

data/certs/kpumuk.pem

@@ -1,21 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZrcHVt
-dWsxFjAUBgoJkiaJk/IsZAEZFgZrcHVtdWsxFDASBgoJkiaJk/IsZAEZFgRpbmZv
-MB4XDTE3MDgyNDE2MDUzOVoXDTE4MDgyNDE2MDUzOVowPzEPMA0GA1UEAwwGa3B1
-bXVrMRYwFAYKCZImiZPyLGQBGRYGa3B1bXVrMRQwEgYKCZImiZPyLGQBGRYEaW5m
-bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALw2YroZc+IT+rs8NuPu
-c13DelrxrpAgPEu1zuRb3l7WaHRNWA4TyS8Z6Aa1G2O+FdUZNMW1n7IwP/QMJ9Mz
-ahRBiTmhik5kasJ9s0h1lq5/hZiycm0o5OtGioUzCkvk+UEMpzMHbLmVSZCzYciy
-NDRDbXB0rLLu1eJk+gKgn6Qf5vj93h1w28BdWdaA7YegtbmipZ+pjmzCQAfPActT
-6uXHG4dSo7Lz9jiFRI5dUizFbGXcRqkQ2b5AB8FFmfcvbqERvzQKBICnybjsKP0N
-pJ3vGgO2sh5GvJFOPk1Vlur2nX9ZFznPEP1CEAQ+NFrmKRt355Z5sgOkAojSGnIL
-/1sCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFPa4
-VFc1YOlV1u/7EGTwMCAk8YE9MB0GA1UdEQQWMBSBEmtwdW11a0BrcHVtdWsuaW5m
-bzAdBgNVHRIEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wDQYJKoZIhvcNAQEFBQAD
-ggEBADVN1hwt6ryAPcL8DBB7wM/cYy3oVpYDO1rLGfrdEOgI/Kz+qYbp+6cx9RCY
-DOY6N3GVifGBlFEuyfY3Nubx9mG0FzyBytU7Cb+u+HF3Aw/MnGRoUuY3bzxy3sVE
-t9uyKLaSN0e70mipmWWHhzIZg9sXFfNNt1vLipuw8ZScyoJAa1p5AK4syX6ZAL9G
-g8psHzMWdefrDNJaB8PG8BI2Nb0sIKs8HdACKZo+qDO6b+oi4Wk0nLbRH7qnJcww
-QwaoNrsQi488Dsk54YiNQWVouzfjRqEa4uUxSyKmRfQp7MNILESAOCXM+wZIxanu
-C9c9eUxgNTnHhsR3sK0QCIMwtUI=
+MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhrcHVt
+dWsvREM9a3B1bXVrL0RDPWluZm8wHhcNMTgxMTE2MTgxOTIzWhcNMTkxMTE2MTgx
+OTIzWjAjMSEwHwYDVQQDDBhrcHVtdWsvREM9a3B1bXVrL0RDPWluZm8wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8NmK6GXPiE/q7PDbj7nNdw3pa8a6Q
+IDxLtc7kW95e1mh0TVgOE8kvGegGtRtjvhXVGTTFtZ+yMD/0DCfTM2oUQYk5oYpO
+ZGrCfbNIdZauf4WYsnJtKOTrRoqFMwpL5PlBDKczB2y5lUmQs2HIsjQ0Q21wdKyy
+7tXiZPoCoJ+kH+b4/d4dcNvAXVnWgO2HoLW5oqWfqY5swkAHzwHLU+rlxxuHUqOy
+8/Y4hUSOXVIsxWxl3EapENm+QAfBRZn3L26hEb80CgSAp8m47Cj9DaSd7xoDtrIe
+RryRTj5NVZbq9p1/WRc5zxD9QhAEPjRa5ikbd+eWebIDpAKI0hpyC/9bAgMBAAGj
+dzB1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBT2uFRXNWDpVdbv
++xBk8DAgJPGBPTAdBgNVHREEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wHQYDVR0S
+BBYwFIESa3B1bXVrQGtwdW11ay5pbmZvMA0GCSqGSIb3DQEBCwUAA4IBAQB9bd46
+p2C6r49hmuxMrIFRi05MS0Nze6GvlYvF5mb2+KS9YCLWLFb1G+0zttX51qVdO3nc
+uw1O5ku+Up47jv5ClyguHinCntFCA5hupyYkbpnFuURZE3QIY6UZQyJ2xuIPFfnR
+Q8sXb5/btWSNhKXx29TL35SkEH5fzPA90DljUPGp3lLEK0+7FQk0OkRVumdyanEE
+LUchqnAWHnNCdQhEhsnbYhSvG0NE2uzMWeUd6uDONYsRFNRXaRwj8tykWgKZvIod
+j0ZkOZOMk6hzny9+AnYZ7eiUqp/XX7Hn+hqtl/AebKhbFapnTu0n7KcfM0oDaLUr
+Fc+FAHErSClMb7YN
 -----END CERTIFICATE-----

data/lib/generators/meta_tags/install_generator.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module MetaTags
   module Generators
     class InstallGenerator < Rails::Generators::Base
       desc "Copy MetaTags default files"
-      source_root File.expand_path('../templates', __FILE__)
+      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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Use this setup block to configure all options available in MetaTags.
 MetaTags.configure do |config|
   # How many characters should the title meta tag have at most. Default is 70.
@@ -22,6 +24,10 @@ MetaTags.configure do |config|
   # appear on the page as is. Default is true.
   # config.keywords_lowercase = true
 
+  # When true, the output will not include new line characters between meta tags.
+  # Default is false.
+  # config.minify_output = false
+
   # When false, generated meta tags will be self-closing (<meta ... />) instead
   # of open (`<meta ...>`). Default is true.
   # config.open_meta_tags = true

data/lib/meta-tags.rb

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

data/lib/meta_tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'English'
 require 'action_controller'
 require 'action_view'
@@ -7,7 +9,7 @@ module MetaTags
   # Returns MetaTags gem configuration.
   #
   def self.config
-    @@config ||= Configuration.new
+    @config ||= Configuration.new
   end
 
   # Configures MetaTags gem.
@@ -34,5 +36,5 @@ require 'meta_tags/content_tag'
 require 'meta_tags/text_normalizer'
 require 'meta_tags/view_helper'
 
-ActionView::Base.send :include, MetaTags::ViewHelper
-ActionController::Base.send :include, MetaTags::ControllerHelper
+ActionView::Base.include MetaTags::ViewHelper
+ActionController::Base.include MetaTags::ControllerHelper

data/lib/meta_tags/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaTags
   # MetaTags configuration.
   class Configuration
@@ -23,6 +25,10 @@ module MetaTags
     # Default is true, which means "open".
     attr_accessor :open_meta_tags
 
+    # When true, the output will not include new line characters between meta tags.
+    # Default is false.
+    attr_accessor :minify_output
+
     # Custom meta tags that should use `property` attribute instead of `name`
     # - an array of strings or symbols representing their names or name-prefixes.
     attr_reader :property_tags
@@ -70,6 +76,7 @@ module MetaTags
       @keywords_lowercase = true
       @property_tags = default_property_tags.dup
       @open_meta_tags = true
+      @minify_output = false
     end
   end
 end

data/lib/meta_tags/content_tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaTags
   # Represents an HTML meta tag with content (<tag></tag>).
   # Content should be passed as a `:content` attribute.

data/lib/meta_tags/controller_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaTags
   # Contains methods to use in controllers.
   #
@@ -13,9 +15,9 @@ 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)
-      self.meta_tags[:title]       = @page_title       if @page_title
-      self.meta_tags[:keywords]    = @page_keywords    if @page_keywords
-      self.meta_tags[:description] = @page_description if @page_description
+      meta_tags[:title]       = @page_title       if @page_title
+      meta_tags[:keywords]    = @page_keywords    if @page_keywords
+      meta_tags[:description] = @page_description if @page_description
 
       super
     end
@@ -23,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)
+    def set_meta_tags(meta_tags) # rubocop:disable Naming/AccessorMethodName
       self.meta_tags.update(meta_tags)
     end
     protected :set_meta_tags

data/lib/meta_tags/meta_tags_collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaTags
   # Class represents a collection of meta tags. Basically a wrapper around
   # HashWithIndifferentAccess, with some additional helper methods.
@@ -47,7 +49,7 @@ module MetaTags
     #
     def with_defaults(defaults = {})
       old_meta_tags = @meta_tags
-      @meta_tags = normalize_open_graph(defaults).deep_merge!(self.meta_tags)
+      @meta_tags = normalize_open_graph(defaults).deep_merge!(@meta_tags)
       yield
     ensure
       @meta_tags = old_meta_tags
@@ -113,7 +115,8 @@ module MetaTags
       return unless title
 
       title = Array(title)
-      title.each(&:downcase!) if extract(:lowercase) == true
+      return title.map(&:downcase) if extract(:lowercase) == true
+
       title
     end
 
@@ -148,9 +151,17 @@ module MetaTags
 
       noindex_attributes = if noindex_name == follow_name && (noindex_value || follow_value)
                              # noindex has higher priority than index and follow has higher priority than nofollow
-                             [[noindex_name, noindex_value || index_value], [follow_name, follow_value || nofollow_value]]
+                             [
+                               [noindex_name, noindex_value || index_value],
+                               [follow_name, follow_value || nofollow_value],
+                             ]
                            else
-                             [[index_name, index_value], [follow_name, follow_value], [noindex_name, noindex_value], [nofollow_name, nofollow_value]]
+                             [
+                               [index_name, index_value],
+                               [follow_name, follow_value],
+                               [noindex_name, noindex_value],
+                               [nofollow_name, nofollow_value],
+                             ]
                            end
       append_noarchive_attribute group_attributes_by_key noindex_attributes
     end
@@ -215,7 +226,7 @@ module MetaTags
     # @return [Hash<String, String>] hash of grouped noindex keys and values
     #
     def group_attributes_by_key(attributes)
-      Hash[attributes.group_by(&:first).map { |k, v| [k, v.map(&:last).compact.join(', ')] }]
+      Hash[attributes.group_by(&:first).map { |k, v| [k, v.map(&:last).tap(&:compact!).join(', ')] }]
     end
   end
 end

data/lib/meta_tags/renderer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaTags
   # This class is used by MetaTags gems to render HTML meta tags into page.
   class Renderer
@@ -32,7 +34,8 @@ module MetaTags
       render_hashes(tags)
       render_custom(tags)
 
-      tags.compact.map { |tag| tag.render(view) }.join("\n").html_safe
+      tags.tap(&:compact!).map! { |tag| tag.render(view) }
+      view.safe_join tags, MetaTags.config.minify_output ? "" : "\n"
     end
 
     protected
@@ -66,14 +69,14 @@ module MetaTags
       icon = meta_tags.extract(:icon)
       return unless icon
 
-      if icon.kind_of?(String)
-        tags << Tag.new(:link, rel: 'icon', href: icon, type: 'image/x-icon')
-      else
-        icon = [icon] if icon.kind_of?(Hash)
-        icon.each do |icon_params|
-          icon_params = { rel: 'icon', type: 'image/x-icon' }.with_indifferent_access.merge(icon_params)
-          tags << Tag.new(:link, icon_params)
-        end
+      # String? Value is an href
+      icon = [{ href: icon }] if icon.kind_of?(String)
+      # Hash? Single icon instead of a list of icons
+      icon = [icon] if icon.kind_of?(Hash)
+
+      icon.each do |icon_params|
+        icon_params = { rel: 'icon', type: 'image/x-icon' }.with_indifferent_access.merge(icon_params)
+        tags << Tag.new(:link, icon_params)
       end
     end
 
@@ -160,9 +163,9 @@ module MetaTags
     #
     # @param [Array<Tag>] tags a buffer object to store tag in.
     #
-    def render_hashes(tags, options = {})
-      meta_tags.meta_tags.keys.each do |property|
-        render_hash(tags, property, options)
+    def render_hashes(tags, **opts)
+      meta_tags.meta_tags.each_key do |property|
+        render_hash(tags, property, **opts)
       end
     end
 
@@ -170,11 +173,11 @@ module MetaTags
     #
     # @param [Array<Tag>] tags a buffer object to store tag in.
     #
-    def render_hash(tags, key, options = {})
+    def render_hash(tags, key, **opts)
       data = meta_tags.meta_tags[key]
       return unless data.kind_of?(Hash)
 
-      process_hash(tags, key, data, options)
+      process_hash(tags, key, data, **opts)
       meta_tags.extract(key)
     end
 
@@ -198,7 +201,7 @@ module MetaTags
     # @param [Hash, Array, String, Symbol] content text content or a symbol reference to
     # top-level meta tag.
     #
-    def process_tree(tags, property, content, options = {})
+    def process_tree(tags, property, content, **opts)
       method = case content
                when Hash
                  :process_hash
@@ -207,7 +210,7 @@ module MetaTags
                else
                  :render_tag
                end
-      send(method, tags, property, content, options)
+      __send__(method, tags, property, content, **opts)
     end
 
     # Recursive method to process a hash with meta tags
@@ -216,11 +219,11 @@ module MetaTags
     # @param [String, Symbol] property a Hash or a String to render as meta tag.
     # @param [Hash] content nested meta tag attributes.
     #
-    def process_hash(tags, property, content, options = {})
+    def process_hash(tags, property, content, **opts)
       content.each do |key, value|
         key = key.to_s == '_' ? property : "#{property}:#{key}"
         value = normalized_meta_tags[value] if value.kind_of?(Symbol)
-        process_tree(tags, key, value, options)
+        process_tree(tags, key, value, **opts)
       end
     end
 
@@ -230,8 +233,8 @@ module MetaTags
     # @param [String, Symbol] property a Hash or a String to render as meta tag.
     # @param [Array] content array of nested meta tag attributes or values.
     #
-    def process_array(tags, property, content, options = {})
-      content.each { |v| process_tree(tags, property, v, options) }
+    def process_array(tags, property, content, **opts)
+      content.each { |v| process_tree(tags, property, v, **opts) }
     end
 
     # Recursive method to process a hash with meta tags
@@ -241,10 +244,9 @@ module MetaTags
     # @param [String, Symbol] value text content or a symbol reference to
     # top-level meta tag.
     #
-    def render_tag(tags, name, value, options = {})
-      name_key = options.fetch(:name_key, configured_name_key(name))
-      value_key = options.fetch(:value_key, :content)
-      tags << Tag.new(:meta, name_key => name.to_s, value_key => value) unless value.blank?
+    def render_tag(tags, name, value, name_key: nil, value_key: :content)
+      name_key ||= configured_name_key(name)
+      tags << Tag.new(:meta, name_key => name.to_s, value_key => value) if value.present?
     end
 
     # Returns meta tag property name for a give meta tag based on the

data/lib/meta_tags/tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaTags
   # Represents an HTML meta tag with no content (<tag />).
   class Tag

data/lib/meta_tags/text_normalizer.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module MetaTags
   # Module contains helpers that normalize text meta tag values.
   module TextNormalizer
-    extend self
+    extend self # rubocop:disable Style/ModuleFunction
 
     # Normalize title value.
     #
@@ -12,11 +14,11 @@ module MetaTags
     # @return [Array<String>] array of title parts with tags removed.
     #
     def normalize_title(site_title, title, separator, reverse = false)
-      title = Array(title).flatten.map(&method(:strip_tags)).reject(&:blank?)
+      title = cleanup_strings(title)
       title.reverse! if reverse
 
-      site_title = strip_tags(site_title)
-      separator = strip_tags(separator)
+      site_title = cleanup_string(site_title)
+      separator = cleanup_string(separator, strip: false)
 
       # Truncate title and site title
       site_title, title = truncate_title(site_title, title, separator)
@@ -38,8 +40,12 @@ module MetaTags
     # to 200 characters.
     #
     def normalize_description(description)
-      return '' if description.blank?
+      # description could be another object not a string, but since it probably
+      # 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?
+
       truncate(description, MetaTags.config.description_limit)
     end
 
@@ -49,10 +55,11 @@ module MetaTags
     # @return [String] list of keywords joined with comma, with tags removed.
     #
     def normalize_keywords(keywords)
-      return '' if keywords.blank?
       keywords = cleanup_strings(keywords)
+      return '' if keywords.blank?
+
       keywords.each(&:downcase!) if MetaTags.config.keywords_lowercase
-      separator = strip_tags MetaTags.config.keywords_separator
+      separator = cleanup_string MetaTags.config.keywords_separator, strip: false
 
       keywords = truncate_array(keywords, MetaTags.config.keywords_limit, separator)
       safe_join(keywords, separator)
@@ -74,10 +81,9 @@ module MetaTags
     def strip_tags(string)
       if defined?(Loofah)
         # Instead of strip_tags we will use Loofah to strip tags from now on
-        stripped_unescaped = Loofah.fragment(string).text(encode_special_chars: false)
-        ERB::Util.html_escape stripped_unescaped
+        Loofah.fragment(string).text(encode_special_chars: false)
       else
-        ERB::Util.html_escape helpers.strip_tags(string)
+        helpers.strip_tags(string)
       end
     end
 
@@ -100,8 +106,14 @@ module MetaTags
     # @return [String] input string with no HTML tags and consequent white
     # space characters squashed into a single space.
     #
-    def cleanup_string(string)
-      strip_tags(string).gsub(/\s+/, ' ').strip.html_safe
+    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)
+
+      strip_tags(string.to_str).tap do |s|
+        s.gsub!(/\s+/, ' ')
+        s.strip! if strip
+      end
     end
 
     # Cleans multiple strings up.
@@ -110,8 +122,10 @@ module MetaTags
     # @return [Array<String>] clean strings.
     # @see cleanup_string
     #
-    def cleanup_strings(strings)
-      Array(strings).flatten.map(&method(:cleanup_string))
+    def cleanup_strings(strings, strip: true)
+      strings = Array(strings).flatten.map! { |s| cleanup_string(s, strip: strip) }
+      strings.reject!(&:blank?)
+      strings
     end
 
     # Truncates a string to a specific limit. Return string without truncation when limit 0 or nil
@@ -122,8 +136,15 @@ module MetaTags
     # @return [String] truncated string.
     #
     def truncate(string, limit = nil, natural_separator = ' ')
-      return string if limit.to_i == 0
-      helpers.truncate(string, length: limit, separator: natural_separator, omission: '', escape: false)
+      return string if limit.to_i == 0 # rubocop:disable Lint/NumberConversion
+
+      helpers.truncate(
+        string,
+        length:    limit,
+        separator: natural_separator,
+        omission:  '',
+        escape:    true,
+      )
     end
 
     # Truncates a string to a specific limit.
@@ -165,7 +186,7 @@ module MetaTags
     end
 
     def truncate_title(site_title, title, separator)
-      if MetaTags.config.title_limit.to_i > 0
+      if MetaTags.config.title_limit.to_i > 0 # rubocop:disable Lint/NumberConversion
         site_title_limited_length, title_limited_length = calculate_title_limits(site_title, title, separator)
 
         title = title_limited_length > 0 ? truncate_array(title, title_limited_length, separator) : []

data/lib/meta_tags/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module MetaTags
   # Gem version.
-  VERSION = '2.10.0'.freeze
+  VERSION = '2.11.0'
 end

data/lib/meta_tags/view_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaTags
   # Contains methods to use in views and helpers.
   #
@@ -25,7 +27,7 @@ module MetaTags
     #
     # @see #display_meta_tags
     #
-    def set_meta_tags(meta_tags = {})
+    def set_meta_tags(meta_tags = {}) # rubocop:disable Naming/AccessorMethodName
       self.meta_tags.update(meta_tags)
     end
 
@@ -55,7 +57,7 @@ module MetaTags
     #
     def title(title = nil, headline = '')
       set_meta_tags(title: title) unless title.nil?
-      headline.blank? ? meta_tags[:title] : headline
+      headline.presence || meta_tags[:title]
     end
 
     # Set the page keywords.
@@ -149,13 +151,17 @@ module MetaTags
     # @option default [String] :title ("") page title;
     # @option default [String] :description (nil) page description;
     # @option default [String] :keywords (nil) page keywords;
-    # @option default [String, Boolean] :prefix (" ") text between site name and separator; when +false+, no prefix will be rendered;
+    # @option default [String, Boolean] :prefix (" ") text between site name and separator;
+    #                                   when +false+, no prefix will be rendered;
     # @option default [String] :separator ("|") text used to separate website name from page title;
-    # @option default [String, Boolean] :suffix (" ") text between separator and page title; when +false+, no suffix will be rendered;
+    # @option default [String, Boolean] :suffix (" ") text between separator and page title;
+    #                                   when +false+, no suffix will be rendered;
     # @option default [Boolean] :lowercase (false) when true, the page title will be lowercase;
     # @option default [Boolean] :reverse (false) when true, the page and site names will be reversed;
-    # @option default [Boolean, String] :noindex (false) add noindex meta tag; when true, 'robots' will be used, otherwise the string will be used;
-    # @option default [Boolean, String] :nofollow (false) add nofollow meta tag; when true, 'robots' will be used, otherwise the string will be used;
+    # @option default [Boolean, String] :noindex (false) add noindex meta tag; when true, 'robots' will be used,
+    #                                   otherwise the string will be used;
+    # @option default [Boolean, String] :nofollow (false) add nofollow meta tag; when true, 'robots' will be used,
+    #                                   otherwise the string will be used;
     # @option default [String] :canonical (nil) add canonical link tag.
     # @option default [Hash] :alternate ({}) add alternate link tag.
     # @option default [String] :prev (nil) add prev link tag;
@@ -172,7 +178,7 @@ module MetaTags
     #   </head>
     #
     def display_meta_tags(defaults = {})
-      self.meta_tags.with_defaults(defaults) { Renderer.new(meta_tags).render(self) }
+      meta_tags.with_defaults(defaults) { Renderer.new(meta_tags).render(self) }
     end
 
     # Returns full page title as a string without surrounding <title> tag.
@@ -185,9 +191,11 @@ module MetaTags
     # @param [Hash] defaults list of meta tags.
     # @option default [String] :site (nil) site title;
     # @option default [String] :title ("") page title;
-    # @option default [String, Boolean] :prefix (" ") text between site name and separator; when +false+, no prefix will be rendered;
+    # @option default [String, Boolean] :prefix (" ") text between site name and separator; when +false+,
+    #                                   no prefix will be rendered;
     # @option default [String] :separator ("|") text used to separate website name from page title;
-    # @option default [String, Boolean] :suffix (" ") text between separator and page title; when +false+, no suffix will be rendered;
+    # @option default [String, Boolean] :suffix (" ") text between separator and page title; when +false+,
+    #                                   no suffix will be rendered;
     # @option default [Boolean] :lowercase (false) when true, the page name will be lowercase;
     # @option default [Boolean] :reverse (false) when true, the page and site names will be reversed;
     #

data/meta-tags.gemspec

@@ -1,4 +1,6 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'meta_tags/version'
 
@@ -22,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "actionpack", ">= 3.2.0", "< 5.3"
 
   spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3.6.0"
+  spec.add_development_dependency "rspec", "~> 3.8.0"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.9.1"
 
   spec.cert_chain    = ["certs/kpumuk.pem"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta-tags
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Dmytro Shteflyuk
@@ -10,27 +10,26 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZrcHVt
-  dWsxFjAUBgoJkiaJk/IsZAEZFgZrcHVtdWsxFDASBgoJkiaJk/IsZAEZFgRpbmZv
-  MB4XDTE3MDgyNDE2MDUzOVoXDTE4MDgyNDE2MDUzOVowPzEPMA0GA1UEAwwGa3B1
-  bXVrMRYwFAYKCZImiZPyLGQBGRYGa3B1bXVrMRQwEgYKCZImiZPyLGQBGRYEaW5m
-  bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALw2YroZc+IT+rs8NuPu
-  c13DelrxrpAgPEu1zuRb3l7WaHRNWA4TyS8Z6Aa1G2O+FdUZNMW1n7IwP/QMJ9Mz
-  ahRBiTmhik5kasJ9s0h1lq5/hZiycm0o5OtGioUzCkvk+UEMpzMHbLmVSZCzYciy
-  NDRDbXB0rLLu1eJk+gKgn6Qf5vj93h1w28BdWdaA7YegtbmipZ+pjmzCQAfPActT
-  6uXHG4dSo7Lz9jiFRI5dUizFbGXcRqkQ2b5AB8FFmfcvbqERvzQKBICnybjsKP0N
-  pJ3vGgO2sh5GvJFOPk1Vlur2nX9ZFznPEP1CEAQ+NFrmKRt355Z5sgOkAojSGnIL
-  /1sCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFPa4
-  VFc1YOlV1u/7EGTwMCAk8YE9MB0GA1UdEQQWMBSBEmtwdW11a0BrcHVtdWsuaW5m
-  bzAdBgNVHRIEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wDQYJKoZIhvcNAQEFBQAD
-  ggEBADVN1hwt6ryAPcL8DBB7wM/cYy3oVpYDO1rLGfrdEOgI/Kz+qYbp+6cx9RCY
-  DOY6N3GVifGBlFEuyfY3Nubx9mG0FzyBytU7Cb+u+HF3Aw/MnGRoUuY3bzxy3sVE
-  t9uyKLaSN0e70mipmWWHhzIZg9sXFfNNt1vLipuw8ZScyoJAa1p5AK4syX6ZAL9G
-  g8psHzMWdefrDNJaB8PG8BI2Nb0sIKs8HdACKZo+qDO6b+oi4Wk0nLbRH7qnJcww
-  QwaoNrsQi488Dsk54YiNQWVouzfjRqEa4uUxSyKmRfQp7MNILESAOCXM+wZIxanu
-  C9c9eUxgNTnHhsR3sK0QCIMwtUI=
+  MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhrcHVt
+  dWsvREM9a3B1bXVrL0RDPWluZm8wHhcNMTgxMTE2MTgxOTIzWhcNMTkxMTE2MTgx
+  OTIzWjAjMSEwHwYDVQQDDBhrcHVtdWsvREM9a3B1bXVrL0RDPWluZm8wggEiMA0G
+  CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8NmK6GXPiE/q7PDbj7nNdw3pa8a6Q
+  IDxLtc7kW95e1mh0TVgOE8kvGegGtRtjvhXVGTTFtZ+yMD/0DCfTM2oUQYk5oYpO
+  ZGrCfbNIdZauf4WYsnJtKOTrRoqFMwpL5PlBDKczB2y5lUmQs2HIsjQ0Q21wdKyy
+  7tXiZPoCoJ+kH+b4/d4dcNvAXVnWgO2HoLW5oqWfqY5swkAHzwHLU+rlxxuHUqOy
+  8/Y4hUSOXVIsxWxl3EapENm+QAfBRZn3L26hEb80CgSAp8m47Cj9DaSd7xoDtrIe
+  RryRTj5NVZbq9p1/WRc5zxD9QhAEPjRa5ikbd+eWebIDpAKI0hpyC/9bAgMBAAGj
+  dzB1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBT2uFRXNWDpVdbv
+  +xBk8DAgJPGBPTAdBgNVHREEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wHQYDVR0S
+  BBYwFIESa3B1bXVrQGtwdW11ay5pbmZvMA0GCSqGSIb3DQEBCwUAA4IBAQB9bd46
+  p2C6r49hmuxMrIFRi05MS0Nze6GvlYvF5mb2+KS9YCLWLFb1G+0zttX51qVdO3nc
+  uw1O5ku+Up47jv5ClyguHinCntFCA5hupyYkbpnFuURZE3QIY6UZQyJ2xuIPFfnR
+  Q8sXb5/btWSNhKXx29TL35SkEH5fzPA90DljUPGp3lLEK0+7FQk0OkRVumdyanEE
+  LUchqnAWHnNCdQhEhsnbYhSvG0NE2uzMWeUd6uDONYsRFNRXaRwj8tykWgKZvIod
+  j0ZkOZOMk6hzny9+AnYZ7eiUqp/XX7Hn+hqtl/AebKhbFapnTu0n7KcfM0oDaLUr
+  Fc+FAHErSClMb7YN
   -----END CERTIFICATE-----
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -72,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement