Merge pull request #227 from kpumuk/prepare-2.15.0

Preparing version 2.15.0 release

.circleci/config.yml

@@ -84,22 +84,22 @@ jobs:
     working_directory: ~/meta-tags/ruby25-rails-5.1.7
     steps: *shared_build_steps
 
-  build-ruby25-rails-5.2.4.4:
+  build-ruby25-rails-5.2.6:
     docker:
       - image: circleci/ruby:2.5
         environment:
-          RAILS_VERSION: 5.2.4.4
+          RAILS_VERSION: 5.2.6
           ENABLE_CODE_COVERAGE: 1
-    working_directory: ~/meta-tags/ruby25-rails-5.2.4.4
+    working_directory: ~/meta-tags/ruby25-rails-5.2.6
     steps: *shared_build_steps
 
-  build-ruby25-rails-6.0.3.4:
+  build-ruby25-rails-6.0.4:
     docker:
       - image: circleci/ruby:2.5
         environment:
-          RAILS_VERSION: 6.0.3.4
+          RAILS_VERSION: 6.0.4
           ENABLE_CODE_COVERAGE: 1
-    working_directory: ~/meta-tags/ruby25-rails-6.0.3.4
+    working_directory: ~/meta-tags/ruby25-rails-6.0.4
     steps: *shared_build_steps
 
   build-ruby25-rails-6.1.0:
@@ -120,31 +120,31 @@ jobs:
     working_directory: ~/meta-tags/ruby26-rails-5.1.7
     steps: *shared_build_steps
 
-  build-ruby26-rails-5.2.4.4:
+  build-ruby26-rails-5.2.6:
     docker:
       - image: circleci/ruby:2.6
         environment:
-          RAILS_VERSION: 5.2.4.4
+          RAILS_VERSION: 5.2.6
           ENABLE_CODE_COVERAGE: 1
-    working_directory: ~/meta-tags/ruby26-rails-5.2.4.4
+    working_directory: ~/meta-tags/ruby26-rails-5.2.6
     steps: *shared_build_steps
 
-  build-ruby26-rails-6.0.3.4:
+  build-ruby26-rails-6.0.4:
     docker:
       - image: circleci/ruby:2.6
         environment:
-          RAILS_VERSION: 6.0.3.4
+          RAILS_VERSION: 6.0.4
           ENABLE_CODE_COVERAGE: 1
-    working_directory: ~/meta-tags/ruby26-rails-6.0.3.4
+    working_directory: ~/meta-tags/ruby26-rails-6.0.4
     steps: *shared_build_steps
 
-  build-ruby26-rails-6.1.0:
+  build-ruby26-rails-6.1.4:
     docker:
       - image: circleci/ruby:2.6
         environment:
-          RAILS_VERSION: 6.1.0
+          RAILS_VERSION: 6.1.4
           ENABLE_CODE_COVERAGE: 1
-    working_directory: ~/meta-tags/ruby26-rails-6.1.0
+    working_directory: ~/meta-tags/ruby26-rails-6.1.4
     steps: *shared_build_steps
 
   build-ruby27-rails-5.1.7:
@@ -156,37 +156,55 @@ jobs:
     working_directory: ~/meta-tags/ruby27-rails-5.1.7
     steps: *shared_build_steps
 
-  build-ruby27-rails-5.2.4.4:
+  build-ruby27-rails-5.2.6:
     docker:
       - image: circleci/ruby:2.7
         environment:
-          RAILS_VERSION: 5.2.4.4
+          RAILS_VERSION: 5.2.6
           ENABLE_CODE_COVERAGE: 1
-    working_directory: ~/meta-tags/ruby27-rails-5.2.4.4
+    working_directory: ~/meta-tags/ruby27-rails-5.2.6
     steps: *shared_build_steps
 
-  build-ruby27-rails-6.0.3.4:
+  build-ruby27-rails-6.0.4:
     docker:
       - image: circleci/ruby:2.7
         environment:
-          RAILS_VERSION: 6.0.3.4
+          RAILS_VERSION: 6.0.4
           ENABLE_CODE_COVERAGE: 1
-    working_directory: ~/meta-tags/ruby27-rails-6.0.3.4
+    working_directory: ~/meta-tags/ruby27-rails-6.0.4
     steps: *shared_build_steps
 
-  build-ruby27-rails-6.1.0:
+  build-ruby27-rails-6.1.4:
     docker:
       - image: circleci/ruby:2.7
         environment:
-          RAILS_VERSION: 6.1.0
+          RAILS_VERSION: 6.1.4
           ENABLE_CODE_COVERAGE: 1
-    working_directory: ~/meta-tags/ruby27-rails-6.1.0
+    working_directory: ~/meta-tags/ruby27-rails-6.1.4
+    steps: *shared_build_steps
+
+  build-ruby30-rails-6.0.4:
+    docker:
+      - image: circleci/ruby:3.0
+        environment:
+          RAILS_VERSION: 6.0.4
+          ENABLE_CODE_COVERAGE: 1
+    working_directory: ~/meta-tags/ruby30-rails-6.0.4
+    steps: *shared_build_steps
+
+  build-ruby30-rails-6.1.4:
+    docker:
+      - image: circleci/ruby:3.0
+        environment:
+          RAILS_VERSION: 6.1.4
+          ENABLE_CODE_COVERAGE: 1
+    working_directory: ~/meta-tags/ruby30-rails-6.1.4
     steps: *shared_build_steps
 
 
   upload-coverage:
     docker:
-      - image: circleci/ruby:2.7
+      - image: circleci/ruby:3.0
         environment:
           CC_TEST_REPORTER_ID: 8792cbc0d1780830ddd3dd7eb1c25f09f386ba8f04449ad830039469406a6ab3
     steps:
@@ -196,7 +214,7 @@ jobs:
       - run:
           name: Uploading Code Coverage
           command: |
-            cd /tmp/workspace/ruby27-rails-6.1.0
+            cd /tmp/workspace/ruby30-rails-6.1.4
             ./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true
   tests:
     docker:
@@ -213,57 +231,65 @@ workflows:
 
       - build-ruby25-rails-5.1.7
 
-      - build-ruby25-rails-5.2.4.4
+      - build-ruby25-rails-5.2.6
 
-      - build-ruby25-rails-6.0.3.4
+      - build-ruby25-rails-6.0.4
 
       - build-ruby25-rails-6.1.0
 
       - build-ruby26-rails-5.1.7
 
-      - build-ruby26-rails-5.2.4.4
+      - build-ruby26-rails-5.2.6
 
-      - build-ruby26-rails-6.0.3.4
+      - build-ruby26-rails-6.0.4
 
-      - build-ruby26-rails-6.1.0
+      - build-ruby26-rails-6.1.4
 
       - build-ruby27-rails-5.1.7
 
-      - build-ruby27-rails-5.2.4.4
+      - build-ruby27-rails-5.2.6
 
-      - build-ruby27-rails-6.0.3.4
+      - build-ruby27-rails-6.0.4
 
-      - build-ruby27-rails-6.1.0
+      - build-ruby27-rails-6.1.4
+
+      - build-ruby30-rails-6.0.4
+
+      - build-ruby30-rails-6.1.4
 
 
       - upload-coverage:
           requires:
-            - build-ruby27-rails-6.1.0
+            - build-ruby30-rails-6.1.4
 
       - tests:
           requires:
 
             - build-ruby25-rails-5.1.7
 
-            - build-ruby25-rails-5.2.4.4
+            - build-ruby25-rails-5.2.6
 
-            - build-ruby25-rails-6.0.3.4
+            - build-ruby25-rails-6.0.4
 
             - build-ruby25-rails-6.1.0
 
             - build-ruby26-rails-5.1.7
 
-            - build-ruby26-rails-5.2.4.4
+            - build-ruby26-rails-5.2.6
 
-            - build-ruby26-rails-6.0.3.4
+            - build-ruby26-rails-6.0.4
 
-            - build-ruby26-rails-6.1.0
+            - build-ruby26-rails-6.1.4
 
             - build-ruby27-rails-5.1.7
 
-            - build-ruby27-rails-5.2.4.4
+            - build-ruby27-rails-5.2.6
+
+            - build-ruby27-rails-6.0.4
+
+            - build-ruby27-rails-6.1.4
 
-            - build-ruby27-rails-6.0.3.4
+            - build-ruby30-rails-6.0.4
 
-            - build-ruby27-rails-6.1.0
+            - build-ruby30-rails-6.1.4
 

.circleci/config.yml.erb

@@ -6,21 +6,25 @@
   builds = [
     # 2.5
     ['2.5', '5.1.7'],
-    ['2.5', '5.2.4.4'],
-    ['2.5', '6.0.3.4'],
+    ['2.5', '5.2.6'],
+    ['2.5', '6.0.4'],
     ['2.5', '6.1.0'],
 
     # 2.6
     ['2.6', '5.1.7'],
-    ['2.6', '5.2.4.4'],
-    ['2.6', '6.0.3.4'],
-    ['2.6', '6.1.0'],
+    ['2.6', '5.2.6'],
+    ['2.6', '6.0.4'],
+    ['2.6', '6.1.4'],
 
     # 2.7
     ['2.7', '5.1.7'],
-    ['2.7', '5.2.4.4'],
-    ['2.7', '6.0.3.4'],
-    ['2.7', '6.1.0', true],
+    ['2.7', '5.2.6'],
+    ['2.7', '6.0.4'],
+    ['2.7', '6.1.4'],
+
+    # 3.0
+    ['3.0', '6.0.4'],
+    ['3.0', '6.1.4', true],
   ]
 
   cc_build = builds.find { |_, _, submit_cc| submit_cc }

.gitignore

@@ -9,3 +9,4 @@ pkg
 *.gem
 .idea
 log/
+tmp/

.rubocop.yml

@@ -14,7 +14,7 @@ AllCops:
   # We do not specify Ruby version, because CodeClimate should by default
   # read .ruby-version, and send it down to Rubocop
   # (see https://github.com/codeclimate/codeclimate-rubocop/pull/68)
-  # TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   # We will lock Rails version to the newest we have in the company, so we're
   # always looking to the future.
   TargetRailsVersion: 5.1
@@ -240,7 +240,3 @@ Bundler/GemVersion:
 # Developers can decide where to put their line breaks, thank you very much
 Layout/RedundantLineBreak:
   Enabled: false
-
-# Do not enforce Ruby version, as we're not ready to release a breaking change yet
-Gemspec/RequiredRubyVersion:
-  Enabled: false

CHANGELOG.md

@@ -1,3 +1,19 @@
+# Changelog
+
+## 2.15.0 (August 2, 2021) [☰](https://github.com/kpumuk/meta-tags/compare/v2.14.0...v2.15.0)
+
+Changes:
+
+- Added Ruby 3.0 to supported versions
+- Ruby 2.5 is now a required minimum version (we dropped official support for Ruby versions older than 2.5 about 8 months ago)
+- Added `skip_canonical_links_on_noindex` configuration variable that allows to disable canonical links of the pages that are excluded from indexing ([214](https://github.com/kpumuk/meta-tags/pull/214))
+- Added support for `itemprop` in `_` tag for custom tags ([203](https://github.com/kpumuk/meta-tags/pull/203))
+
+Bugfixes:
+
+- Fixed error "can't modify frozen String" in `strip_tags`.
+- Fixed Ruby warning about an instance variable that is not initialized.
+
 ## 2.14.0 (December 10, 2020) [☰](https://github.com/kpumuk/meta-tags/compare/v2.13.0...v2.14.0)
 
 Changes:

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Contributing
 
 We love pull requests from everyone. By participating in this project, you
-agree to abide by the [code of conduct](https://github.com/kpumuk/meta-tags/blob/master/CODE_OF_CONDUCT.md).
+agree to abide by the [code of conduct](https://github.com/kpumuk/meta-tags/blob/main/CODE_OF_CONDUCT.md).
 
 ## Configuring Development Environment
 
@@ -29,13 +29,13 @@ Make your change. Add tests for your change. Make the tests pass:
 argument for the meta tag name should be `name`:
 
 ```html
-<meta name="keywords" content="HTML,CSS,XML,JavaScript">
+<meta name="keywords" content="HTML,CSS,XML,JavaScript" />
 ```
 
 Some social networks require to use `property` argument instead (Facebook Open Graph).
 MetaTags supports the most popular meta tags, but there will be tags that are not covered
 by default. If you found one, and you feel like the community would benefit from
-MetaTags supporting it out of the box, feel free to add it to [the list](https://github.com/kpumuk/meta-tags/blob/master/lib/meta_tags/configuration.rb#L23-L57)
+MetaTags supporting it out of the box, feel free to add it to [the list](https://github.com/kpumuk/meta-tags/blob/main/lib/meta_tags/configuration.rb#L23-L57)
 and submit a pull request.
 
 ## Raising a Pull Request
@@ -47,6 +47,6 @@ within couple days. We may suggest some changes or improvements or alternatives.
 
 Some things that will increase the chance that your pull request is accepted:
 
-* Write tests.
-* Make sure [CodeClimate](https://codeclimate.com/github/kpumuk/meta-tags/builds) build is clean.
-* Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+- Write tests.
+- Make sure [CodeClimate](https://codeclimate.com/github/kpumuk/meta-tags/builds) build is clean.
+- Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).

README.md

@@ -5,13 +5,13 @@
 [![Code Climate](https://codeclimate.com/github/kpumuk/meta-tags/badges/gpa.svg)](https://codeclimate.com/github/kpumuk/meta-tags)
 [![Test Coverage](https://codeclimate.com/github/kpumuk/meta-tags/badges/coverage.svg)](https://codeclimate.com/github/kpumuk/meta-tags/coverage)
 [![Gem Downloads](https://img.shields.io/gem/dt/meta-tags.svg)](https://badge.fury.io/rb/meta-tags)
-[![Changelog](https://img.shields.io/badge/Changelog-latest-blue.svg)](https://github.com/kpumuk/meta-tags/blob/master/CHANGELOG.md)
+[![Changelog](https://img.shields.io/badge/Changelog-latest-blue.svg)](https://github.com/kpumuk/meta-tags/blob/main/CHANGELOG.md)
 
 Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 
 ## Ruby on Rails
 
-MetaTags master branch fully supports Ruby on Rails 5.1+, and is tested against all
+MetaTags main branch fully supports Ruby on Rails 5.1+, and is tested against all
 major Rails releases up to 6.1.
 
 Ruby versions older than 2.5 are no longer officially supported.
@@ -409,6 +409,9 @@ Canonical link element tells a search engine what is the canonical or main URL
 for a content which have multiple URLs. The search engine will always return
 that URL, and link popularity and authority will be applied to that URL.
 
+Note: If you like follow a hint of John Mueller that you shouldn't mix canonical with noindex, then you can
+set `MetaTags.config.skip_canonical_links_on_noindex = true` and we'll handle it for you.
+
 ```ruby
 set_meta_tags canonical: "http://yoursite.com/canonical/url"
 # <link rel="canonical" href="http://yoursite.com/canonical/url">
@@ -694,6 +697,24 @@ set_meta_tags twitter: {
 # <meta name="twitter:image:height" content="100">
 ```
 
+Special parameter `itemprop` can be used on a "anonymous" tag "\_" to generate "itemprop" HTML attribute:
+
+```ruby
+set_meta_tags twitter: {
+  card:  "photo",
+  image: {
+    _:        "http://example.com/1.png",
+    width:    100,
+    height:   100,
+    itemprop: "image",
+  }
+}
+# <meta name="twitter:card" content="photo">
+# <meta name="twitter:image" content="http://example.com/1.png" itemprop="image">
+# <meta name="twitter:image:width" content="100">
+# <meta name="twitter:image:height" content="100">
+```
+
 Further reading:
 
 - [Twitter Cards Documentation](https://dev.twitter.com/cards/)