meta-tags 2.11.1 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3f02cd65ae6c44a66cb24946f5198d04769eb24125ec48a0fcbb10af8cd7eac
-  data.tar.gz: 621a8fc87dd414609a35787c41c4520fb3ef5f622fe80435885d832641e27147
+  metadata.gz: ae6b586b3caea1141de4d7cfb8b9416225cdfda41984b7701252ca24dc3f72b7
+  data.tar.gz: ca6f213ed867a6e823a313f71bea1f19df6276455363e4ff294282f127e65e67
 SHA512:
-  metadata.gz: 2247883ab51dbeaf6878fc111ef7bdbe5a05aed2072621fc8ab9ef8d8ac4628c80300f7d6c6897e5785c68a8d75dcda2b1e0c7ef90a76fc33435b09f598da5f7
-  data.tar.gz: 0165a44b70582be3beee1addbd085e4fe21fc4b35467e74f311d1ef33a5e73856e7d9120ed023031ebb1d2782370ae8ae3f87a3939f4ed8055314d03ffb4ff45
+  metadata.gz: ff1e6c26b63aa876c92034f4846a4058da17b2e6ae49e07640b75a9f6a2cf97eaf0bff6c48a715c13798c5de8e3334781c6f11313e19a9edd084e8fa84272c20
+  data.tar.gz: efc21b0da382e96fca80c78fdfaac56c3e3320e38223bd07f0157f85e91bf1aed92df090721d67600871e705a1718779b45fc01daf4cabf2bc6180b82bd9de76

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.12.0 (September 10, 2019) [☰](https://github.com/kpumuk/meta-tags/compare/v2.11.1...v2.12.0)
+
+Features:
+  - Indexing directives (`noindex`, `nofollow`, etc. now support an array of robot names as a value).
+  - Added support for `link[rel='manifest']` ([199](https://github.com/kpumuk/meta-tags/pull/199))
+
+Bugfixes:
+  - When `noindex` uses "robots" as a value, `nofollow` ignores a custom robot name, and switches to "robots" as well
+
 ## 2.11.1 (January 19, 2019) [☰](https://github.com/kpumuk/meta-tags/compare/v2.11.0...v2.11.1)
 
 Features:

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in meta-tags.gemspec
 gemspec
@@ -13,7 +13,9 @@ 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'
+  gem 'rubocop', '~> 0.74.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.

data/README.md

@@ -36,7 +36,7 @@ truncation have recommended values, you can change them to reflect your own
 preferences. Keywords are converted to lowercase by default, but this is also
 configurable.
 
-To overide the defaults, create an initializer
+To override the defaults, create an initializer
 `config/initializers/meta_tags.rb` using the following command:
 
 ```bash
@@ -164,11 +164,11 @@ Use these options to customize the title format:
 | `:suffix`      | text between separator and page title |
 | `:lowercase`   | when true, the page name will be lowercase |
 | `:reverse`     | when true, the page and site names will be reversed |
-| `:noindex`     | add noindex meta tag; when true, 'robots' will be used, otherwise the string will be used |
-| `:index`       | add index meta tag; when true, 'robots' will be used, otherwise the string will be used |
-| `:nofollow`    | add nofollow meta tag; when true, 'robots' will be used, otherwise the string will be used |
-| `:follow`      | add follow meta tag; when true, 'robots' will be used, otherwise the string will be used |
-| `:noarchive`   | add noarchive meta tag; when true, 'robots' will be used, otherwise the string will be used |
+| `:noindex`     | add noindex meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings |
+| `:index`       | add index meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings |
+| `:nofollow`    | add nofollow meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings |
+| `:follow`      | add follow meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings |
+| `:noarchive`   | add noarchive meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings |
 | `:canonical`   | add canonical link tag |
 | `:prev`        | add prev link tag |
 | `:next`        | add next link tag |

data/lib/meta_tags/meta_tags_collection.rb

@@ -142,28 +142,20 @@ module MetaTags
     #
     # @return [Hash<String,String>] noindex attributes.
     #
-    def extract_noindex
-      noindex_name, noindex_value = extract_noindex_attribute(:noindex)
-      index_name, index_value = extract_noindex_attribute(:index)
-
-      nofollow_name, nofollow_value = extract_noindex_attribute(:nofollow)
-      follow_name, follow_value = extract_noindex_attribute(:follow)
-
-      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],
-                             ]
-                           else
-                             [
-                               [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
+    def extract_robots
+      result = Hash.new { |h, k| h[k] = [] }
+
+      [
+        # noindex has higher priority than index
+        [:noindex, :index],
+        # follow has higher priority than nofollow
+        [:follow, :nofollow],
+        :noarchive,
+      ].each do |attributes|
+        calculate_robots_attributes(result, attributes)
+      end
+
+      result.transform_values { |v| v.join(', ') }
     end
 
     protected
@@ -190,43 +182,37 @@ module MetaTags
       meta_tags[name] == false ? '' : (meta_tags[name] || default)
     end
 
-    # Extracts noindex attribute name and value without deleting it from meta tags list.
+    # Extracts robots attribute (noindex, nofollow, etc) name and value.
     #
     # @param [String, Symbol] name noindex attribute name.
     # @return [Array<String>] pair of noindex attribute name and value.
     #
-    def extract_noindex_attribute(name)
+    def extract_robots_attribute(name)
       noindex       = extract(name)
-      noindex_name  = noindex.kind_of?(String) ? noindex : 'robots'
+      noindex_name  = noindex.kind_of?(String) || noindex.kind_of?(Array) ? noindex : 'robots'
       noindex_value = noindex ? name.to_s : nil
 
       [ noindex_name, noindex_value ]
     end
 
-    # Append noarchive attribute if it present.
-    #
-    # @param [Hash<String, String>] noindex noindex attributes.
-    # @return [Hash<String, String>] modified noindex attributes.
-    #
-    def append_noarchive_attribute(noindex)
-      noarchive_name, noarchive_value = extract_noindex_attribute :noarchive
-      if noarchive_value
-        if noindex[noarchive_name].blank?
-          noindex[noarchive_name] = noarchive_value
-        else
-          noindex[noarchive_name] += ", #{noarchive_value}"
+    def calculate_robots_attributes(result, attributes)
+      processed = Set.new
+      Array(attributes).each do |attribute|
+        names, value = extract_robots_attribute(attribute)
+        next unless value
+
+        Array(names).each do |name|
+          apply_robots_value(result, name, value, processed)
         end
       end
-      noindex
     end
 
-    # Convert array of arrays to hashes and concatenate values
-    #
-    # @param [Array<Array>] attributes list of noindex keys and values
-    # @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).tap(&:compact!).join(', ')] }]
+    def apply_robots_value(result, name, value, processed)
+      name = name.to_s
+      return if processed.include?(name)
+
+      result[name] << value
+      processed << name
     end
   end
 end

data/lib/meta_tags/renderer.rb

@@ -97,7 +97,7 @@ module MetaTags
     # @param [Array<Tag>] tags a buffer object to store tag in.
     #
     def render_noindex(tags)
-      meta_tags.extract_noindex.each do |name, content|
+      meta_tags.extract_robots.each do |name, content|
         tags << Tag.new(:meta, name: name, content: content) if content.present?
       end
     end
@@ -150,7 +150,7 @@ module MetaTags
     # @param [Array<Tag>] tags a buffer object to store tag in.
     #
     def render_links(tags)
-      [ :amphtml, :canonical, :prev, :next, :image_src ].each do |tag_name|
+      [ :amphtml, :canonical, :prev, :next, :image_src, :manifest ].each do |tag_name|
         href = meta_tags.extract(tag_name)
         if href.present?
           @normalized_meta_tags[tag_name] = href

data/lib/meta_tags/text_normalizer.rb

@@ -3,7 +3,7 @@
 module MetaTags
   # Module contains helpers that normalize text meta tag values.
   module TextNormalizer
-    extend self # rubocop:disable Style/ModuleFunction
+    extend self
 
     # Normalize title value.
     #

data/lib/meta_tags/version.rb

@@ -2,5 +2,6 @@
 
 module MetaTags
   # Gem version.
-  VERSION = '2.11.1'
+  VERSION = '2.12.0'
+  public_constant :VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta-tags
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.12.0
 platform: ruby
 authors:
 - Dmytro Shteflyuk
@@ -29,7 +29,7 @@ cert_chain:
   j0ZkOZOMk6hzny9+AnYZ7eiUqp/XX7Hn+hqtl/AebKhbFapnTu0n7KcfM0oDaLUr
   Fc+FAHErSClMb7YN
   -----END CERTIFICATE-----
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -141,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Collection of SEO helpers for Ruby on Rails.