meta-tags 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a951b5f1a98a69eeea2e13cc53fcea808f44ef08
-  data.tar.gz: b9bf8e2f0ca386108cb7108d13b8909ba2ccc1b3
+  metadata.gz: bcbe8d42f7548699bb2a370c45a5a0bd28bda93c
+  data.tar.gz: 490acebe6d35cd7890787012e4b9eea11f567c0a
 SHA512:
-  metadata.gz: 588b6a8f83d32e391b72b063f17983509821e4ad896be1ece4698f00f40d6aee2dd93cb8cf82b796201d52e796451a9ac0f657c42168b6c36612b1949cb6d1c6
-  data.tar.gz: a05a64fa12af04a87a5161b60b1874c3715b6d98b4df6eacbfa8d7f752bb23401a39f8eb10258edad59928f3dadfee07bcc8c7e9f2488f218f6e4dc7fef02b2a
+  metadata.gz: f644c35dd746b09bfdb3c2c25d656d43ced607b91b30327d165952f49c3a569b5def2f8af0fbb20a455fd81faf3114089a579206e6289fdfaf08ce96e480c1dc
+  data.tar.gz: 7fe7416185f75d3d5bc04a3dceafe77944e41d2a57639ebeb5c4ace7035b59ec1b951d865f4490353cd38b36ab81a43460bea196199e405f05c6c013e3b5ad8e

data/.rubocop.yml

@@ -719,7 +719,7 @@ Style/LineEndConcatenation:
                  line end.
   Enabled: false
 
-Style/MethodCallWithoutArgsParentheses:
+Style/MethodCallParentheses:
   Description: 'Do not use parentheses for method calls with no arguments.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
   Enabled: true
@@ -838,7 +838,7 @@ Style/ParallelAssignment:
                   matches on both sides of the assignment.
                   This also provides performance benefits
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parallel-assignment'
-  Enabled: true
+  Enabled: false
 
 Style/ParenthesesAroundCondition:
   Description: >-

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 2.6.0 (August 24, 2017) [☰](https://github.com/kpumuk/meta-tags/compare/v2.5.0...v2.6.0)
+
+Features:
+  - Optionally avoid downcasing keywords
+  - Added Rails generator to create an initializer with the default settings.
+  - Added a configuration option `truncate_site_title_first` which enables site title truncation when title limit is reached.
+  - When `Time`, `Date`, or `DateTime` passed as a meta tag value, it will be formatted according to ISO 8601.
+
+Bugfixes:
+  - When title limit reached with `reverse` set to `true`, properly truncate the last item of the title array instead of the first one.
+  - Do not merge title and site title for OpenGraph, site title is available for reference as `:site`, and full title as `:full_title`.
+
+Changes:
+  - Removed Google "author" and "publisher" links, as Google deprecated these options (https://support.google.com/webmasters/answer/6083347?hl=en)
+
 ## 2.5.0 (August 23, 2017) [☰](https://github.com/kpumuk/meta-tags/compare/v2.4.1...v2.5.0)
 
 Features:
@@ -27,8 +42,6 @@ Changes:
 Features:
   - Added support for article meta tags
 
-Bugfixes:
-
 ## 2.2.0 (August 24, 2016) [☰](https://github.com/kpumuk/meta-tags/compare/v2.1.0...v2.2.0)
 
 Changes:

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at kpumuk@kpumuk.info. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/CONTRIBUTING.md

@@ -0,0 +1,52 @@
+# 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).
+
+## Configuring Development Environment
+
+Fork, then clone the repo:
+
+    git clone git@github.com:your-username/meta-tags.git
+
+Set up your machine:
+
+    ./bin/setup
+
+Make sure the tests pass:
+
+    rake
+
+## Contributing a Code Change
+
+Make your change. Add tests for your change. Make the tests pass:
+
+    rake
+
+## Fixing a Meta Tag to Use `property` Argument
+
+[HTML standard](https://www.w3schools.com/TAgs/tag_meta.asp) states that the
+argument for the meta tag name should be `name`:
+
+```html
+<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)
+and submit a pull request.
+
+## Raising a Pull Request
+
+Push to your fork and [submit a pull request](https://github.com/kpumuk/meta-tags/compare/).
+
+At this point you're waiting on us. We like to at least comment on pull requests
+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).

data/Gemfile

@@ -3,7 +3,9 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in meta-tags.gemspec
 gemspec
 
-if ENV['RAILS_VERSION']
+if ENV['RAILS_VERSION'] == 'edge'
+  gem 'actionpack', git: 'https://github.com/rails/rails.git'
+elsif ENV['RAILS_VERSION']
   gem 'actionpack', "~> #{ENV['RAILS_VERSION']}"
 end
 

data/README.md

@@ -4,6 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/meta-tags.svg)](https://badge.fury.io/rb/meta-tags)
 [![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)
 
 Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 
@@ -31,19 +32,14 @@ And run `bundle install` command.
 
 MetaTags follows best-practices for meta tags. Although default limits for
 truncation have recommended values, you can change them to reflect your own
-preferences. In order to do that, you can create an initializer
-`config/initializers/meta_tags.rb`, with following code:
-
-```ruby
-MetaTags.configure do |c|
-  c.title_limit          = 70
-  c.description_limit    = 160
-  c.keywords_limit       = 255
-  c.keywords_separator   = ', '
-  c.property_tags.push(
-    'x-hearthstone:deck',
-  )
-end
+preferences. Keywords are converted to lowercase by default, but this is also
+configurable.
+
+To overide the defaults, create an initializer
+`config/initializers/meta_tags.rb` using the following command:
+
+```bash
+rails generate meta_tags:install
 ```
 
 By default meta tags are rendered with the key `name`. Since, some meta tags are
@@ -52,10 +48,6 @@ allows to configure which tags to render with `property` attribute. By default
 the pre-configured list includes all possible Facebook Open Graph object types, but
 you can add your own in case you need it.
 
-**Please note**: Use `c.property_tags.push` instead of `c.property_tags =`, so you
-do not reset the list of default tags, which would lead to invalid Open Graph
-meta tags.
-
 ## MetaTags Usage
 
 First, add this code to your main layout:
@@ -112,7 +104,7 @@ To set meta tags you can use following methods:
 ```erb
 <% title 'Member Login' %>
 <% description 'Member login page.' %>
-<% keywords 'Member login page.' %>
+<% keywords 'Site, Login, Members' %>
 <% nofollow %>
 <% noindex %>
 <% refresh 3 %>
@@ -157,8 +149,6 @@ Use these options to customize the title format:
 * `: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;
 * `:canonical` — add canonical link tag;
-* `:author` — add author link tag;
-* `:publisher` — add publisher link tag;
 * `:prev` — add prev link tag;
 * `:next` — add next link tag;
 * `:image_src`  — add image_src link tag;
@@ -207,7 +197,8 @@ Say, you have the following in your application layout:
 
 ```ruby
 display_meta_tags og: {
-  title: :title
+  title: :title,
+  site_name: :site,
 }
 ```
 
@@ -224,6 +215,9 @@ You get this open graph meta tag for free:
 <meta property="og:title" content="my great view"></meta>
 ```
 
+Please note, that title does not include site. If you need to reference the exact
+value rendered in the `<title>` meta tag, use `:full_title`.
+
 ### Using with Turbolinks
 
 [Turbolinks](https://github.com/turbolinks/turbolinks) is a simple solution for getting
@@ -290,6 +284,10 @@ set_meta_tags site: 'Site Title', title: 'Member Login', reverse: true
 
 Recommended title tag length: up to <b>70 characters</b>, <b>10 words</b>.
 
+Further reading:
+
+* [Title Tag](https://moz.com/learn/seo/title-tag)
+
 ### Description
 
 Description tags are called meta tags as they are not displayed by the
@@ -304,6 +302,10 @@ set_meta_tags description: "All text about keywords, other keywords"
 
 Recommended description tag length: up to <b>160 characters</b>.
 
+Further reading:
+
+* [Meta Description](https://moz.com/learn/seo/meta-description)
+
 ### Keywords
 
 Meta keywords tag are used to place your keywords that you think a
@@ -317,6 +319,9 @@ set_meta_tags keywords: %w[keyword1 Keyword2 KeyWord3]
 
 Recommended keywords tag length: up to <b>255 characters</b>, <b>20 words</b>.
 
+**Please note**, that both Google and Bing publicly indicated that keywords
+meta tags is completely ignored.
+
 ### Noindex
 
 By using the noindex meta tag, you can signal to search engines to not
@@ -407,30 +412,6 @@ Further reading:
 * [Favicon](https://www.wikiwand.com/en/Favicon)
 * [Touch Icons](https://mathiasbynens.be/notes/touch-icons)
 
-### Author links
-
-Link to your Google+ profile using rel="author"
-
-```ruby
-set_meta_tags author: "http://yourgplusprofile.com/profile/url"
-# <link rel="author" href="http://yourgplusprofile.com/profile/url" />
-```
-
-Further reading:
-
-* [About rel="author"](https://support.google.com/webmasters/answer/2539557?hl=en)
-
-### Publisher links
-
-Link to your Google+ profile using rel="publisher"
-
-```ruby
-set_meta_tags publisher: "http://yourgplusprofile.com/profile/url"
-# <link rel="publisher" href="http://yourgplusprofile.com/profile/url" />
-```
-
-* [Link to your website](https://support.google.com/plus/answer/1713826?hl=en)
-* [The Difference Between rel=author & rel=publisher](http://www.websitemagazine.com/content/blogs/posts/archive/2013/02/05/the-difference-between-rel-author-amp-rel-publisher.aspx)
 
 ### Multi-regional and multilingual URLs, RSS and mobile links
 
@@ -730,6 +711,6 @@ set_meta_tags author: [ "Dmytro Shteflyuk", "John Doe" ]
 # <meta name="author" content="John Doe"/>
 ```
 
-## Author
+## Maintainers
 
 [Dmytro Shteflyuk](https://github.com/kpumuk), [https://kpumuk.info](http://kpumuk.info/)

data/certs/kpumuk.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
 MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZrcHVt
 dWsxFjAUBgoJkiaJk/IsZAEZFgZrcHVtdWsxFDASBgoJkiaJk/IsZAEZFgRpbmZv
-MB4XDTE2MDgyNDAxMDYwOFoXDTE3MDgyNDAxMDYwOFowPzEPMA0GA1UEAwwGa3B1
+MB4XDTE3MDgyNDE2MDUzOVoXDTE4MDgyNDE2MDUzOVowPzEPMA0GA1UEAwwGa3B1
 bXVrMRYwFAYKCZImiZPyLGQBGRYGa3B1bXVrMRQwEgYKCZImiZPyLGQBGRYEaW5m
 bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALw2YroZc+IT+rs8NuPu
 c13DelrxrpAgPEu1zuRb3l7WaHRNWA4TyS8Z6Aa1G2O+FdUZNMW1n7IwP/QMJ9Mz
@@ -12,10 +12,10 @@ pJ3vGgO2sh5GvJFOPk1Vlur2nX9ZFznPEP1CEAQ+NFrmKRt355Z5sgOkAojSGnIL
 /1sCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFPa4
 VFc1YOlV1u/7EGTwMCAk8YE9MB0GA1UdEQQWMBSBEmtwdW11a0BrcHVtdWsuaW5m
 bzAdBgNVHRIEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wDQYJKoZIhvcNAQEFBQAD
-ggEBAKOnJYyA5Aq2BPQTSd9uxUzoYL010HsxIz2xFPNRxcI9wvgy6tE7noUD6yu5
-k/IXjQOiqMag0zGF3rdEbDFHsvDhos9xZeGUaM3YIfoYg4YF7P7HgRCQFYL7G3va
-h++H5FhlqFOF8g4lvYZ80AMNBO/tDfGuIzaJFbv+1mlHc2Szd3t7Mt2kNae92OYJ
-x9+w3/LzxW8XariFP1RBseVgHdH9JwbranEqRJ51WwJ0zTGgDnvGxOxigExXEfYE
-He5T3dBG5WWdIclQcE+JgohBpQ78TcVs1pFNjFmW9pC/P7Rm2GlYqOPHBQG1/Qx9
-ySbbrGHRLVz8DCxQbhKw+mdT5bg=
+ggEBADVN1hwt6ryAPcL8DBB7wM/cYy3oVpYDO1rLGfrdEOgI/Kz+qYbp+6cx9RCY
+DOY6N3GVifGBlFEuyfY3Nubx9mG0FzyBytU7Cb+u+HF3Aw/MnGRoUuY3bzxy3sVE
+t9uyKLaSN0e70mipmWWHhzIZg9sXFfNNt1vLipuw8ZScyoJAa1p5AK4syX6ZAL9G
+g8psHzMWdefrDNJaB8PG8BI2Nb0sIKs8HdACKZo+qDO6b+oi4Wk0nLbRH7qnJcww
+QwaoNrsQi488Dsk54YiNQWVouzfjRqEa4uUxSyKmRfQp7MNILESAOCXM+wZIxanu
+C9c9eUxgNTnHhsR3sK0QCIMwtUI=
 -----END CERTIFICATE-----

data/lib/generators/meta_tags/install_generator.rb

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

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

@@ -0,0 +1,30 @@
+# 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.
+  # Set to nil or 0 to remove limits.
+  # config.title_limit = 70
+
+  # When true, site title will be truncated instead of title. Default is false.
+  # config.truncate_site_title_first = false
+
+  # Maximum length of the page description. Default is 160.
+  # Set to nil or 0 to remove limits.
+  # config.description_limit = 160
+
+  # Maxumum length of the keywords meta tag. Default is 255.
+  # config.keywords_limit = 255
+
+  # Default separator for keywords meta tag (used when an Array passed with
+  # the list of keywords). Default is ", ".
+  # config.keywords_separator = ', '
+
+  # When true, keywords will be converted to lowercase, otherwise they will
+  # appear on the page as is. Default is true.
+  # config.keywords_lowercase = true
+
+  # List of additional meta tags that should use "property" attribute instead
+  # of "name" attribute in <meta> tags.
+  # config.property_tags.push(
+  #   'x-hearthstone:deck',
+  # )
+end

data/lib/meta_tags/configuration.rb

@@ -3,15 +3,25 @@ module MetaTags
   class Configuration
     # How many characters to truncate title to.
     attr_accessor :title_limit
+
+    # Truncate site_title instead of title.
+    attr_accessor :truncate_site_title_first
+
     # How many characters to truncate description to.
     attr_accessor :description_limit
+
     # How many characters to truncate keywords to.
     attr_accessor :keywords_limit
+
     # Keywords separator - a string to join keywords with.
     attr_accessor :keywords_separator
+
+    # Should keywords forced into lowercase?
+    attr_accessor :keywords_lowercase
+
     # Custom meta tags that should use `property` attribute instead of `name`
     # - an array of strings or symbols representing their names or name-prefixes.
-    attr_accessor :property_tags
+    attr_reader :property_tags
 
     # Initializes a new instance of Configuration class.
     def initialize
@@ -56,9 +66,11 @@ module MetaTags
 
     def reset_defaults!
       @title_limit = 70
+      @truncate_site_title_first = false
       @description_limit = 160
       @keywords_limit = 255
       @keywords_separator = ', '
+      @keywords_lowercase = true
       @property_tags = default_property_tags.dup
     end
   end

data/lib/meta_tags/content_tag.rb

@@ -8,7 +8,7 @@ module MetaTags
     # @return [String] HTML string for the tag.
     #
     def render(view)
-      view.content_tag(name, attributes[:content], attributes.except(:content))
+      view.content_tag(name, attributes[:content], prepare_attributes(attributes.except(:content)))
     end
   end
 end

data/lib/meta_tags/meta_tags_collection.rb

@@ -60,6 +60,17 @@ module MetaTags
       with_defaults(defaults) { extract_full_title }
     end
 
+    # Constructs the title without site title (for normalized parameters).
+    #
+    # @return [String] page title.
+    #
+    def page_title(defaults = {})
+      old_site, @meta_tags[:site] = @meta_tags[:site], nil
+      with_defaults(defaults) { extract_full_title }
+    ensure
+      @meta_tags[:site] = old_site
+    end
+
     # Deletes and returns a meta tag value by name.
     #
     # @param [String, Symbol] name meta tag name.

data/lib/meta_tags/renderer.rb

@@ -51,8 +51,10 @@ module MetaTags
     # @param [Array<Tag>] tags a buffer object to store tag in.
     #
     def render_title(tags)
+      normalized_meta_tags[:title] = meta_tags.page_title
+      normalized_meta_tags[:site] = meta_tags[:site]
       title = meta_tags.extract_full_title
-      normalized_meta_tags[:title] = title
+      normalized_meta_tags[:full_title] = title
       tags << ContentTag.new(:title, content: title) if title.present?
     end
 
@@ -145,7 +147,7 @@ module MetaTags
     # @param [Array<Tag>] tags a buffer object to store tag in.
     #
     def render_links(tags)
-      [ :amphtml, :canonical, :prev, :next, :author, :publisher, :image_src ].each do |tag_name|
+      [ :amphtml, :canonical, :prev, :next, :image_src ].each do |tag_name|
         href = meta_tags.extract(tag_name)
         if href.present?
           @normalized_meta_tags[tag_name] = href

data/lib/meta_tags/tag.rb

@@ -19,7 +19,15 @@ module MetaTags
     # @return [String] HTML string for the tag.
     #
     def render(view)
-      view.tag(name, attributes)
+      view.tag(name, prepare_attributes(attributes))
+    end
+
+    protected
+
+    def prepare_attributes(attributes)
+      attributes.each do |key, value|
+        attributes[key] = value.iso8601 if value.respond_to?(:iso8601)
+      end
     end
   end
 end

data/lib/meta_tags/text_normalizer.rb

@@ -1,6 +1,8 @@
 module MetaTags
   # Module contains helpers that normalize text meta tag values.
   module TextNormalizer
+    extend self
+
     # Normalize title value.
     #
     # @param [String] site_title site title.
@@ -9,25 +11,23 @@ module MetaTags
     # @param [true,false] reverse whether title should be reversed.
     # @return [Array<String>] array of title parts with tags removed.
     #
-    def self.normalize_title(site_title, title, separator, reverse = false)
+    def normalize_title(site_title, title, separator, reverse = false)
       title = Array(title).flatten.map(&method(:strip_tags)).reject(&:blank?)
+      title.reverse! if reverse
+
       site_title = strip_tags(site_title)
       separator = strip_tags(separator)
 
-      if MetaTags.config.title_limit
-        limit = calculate_limit(site_title, separator)
+      # Truncate title and site title
+      site_title, title = truncate_title(site_title, title, separator)
 
-        if limit > site_title.length
-          title = truncate_array(title, limit - site_title.length, separator)
+      if site_title.present?
+        if reverse
+          title.push(site_title)
         else
-          site_title = truncate(site_title, limit)
-          # Site title is too long, we have to skip page title
-          title = []
+          title.unshift(site_title)
         end
       end
-
-      title.unshift(site_title) if site_title.present?
-      title.reverse! if reverse
       safe_join(title, separator)
     end
 
@@ -37,7 +37,7 @@ module MetaTags
     # @return [String] text with tags removed, squashed spaces, truncated
     # to 200 characters.
     #
-    def self.normalize_description(description)
+    def normalize_description(description)
       return '' if description.blank?
       description = cleanup_string(description)
       truncate(description, MetaTags.config.description_limit)
@@ -48,9 +48,10 @@ module MetaTags
     # @param [String, Array<String>] keywords list of keywords as a string or Array.
     # @return [String] list of keywords joined with comma, with tags removed.
     #
-    def self.normalize_keywords(keywords)
+    def normalize_keywords(keywords)
       return '' if keywords.blank?
-      keywords = cleanup_strings(keywords).each(&:downcase!)
+      keywords = cleanup_strings(keywords)
+      keywords.each(&:downcase!) if MetaTags.config.keywords_lowercase
       separator = strip_tags MetaTags.config.keywords_separator
 
       keywords = truncate_array(keywords, MetaTags.config.keywords_limit, separator)
@@ -61,7 +62,7 @@ module MetaTags
     #
     # @return [ActionView::Base] proxy object to access Rails helpers.
     #
-    def self.helpers
+    def helpers
       ActionController::Base.helpers
     end
 
@@ -70,7 +71,7 @@ module MetaTags
     # @param [String] string HTML string.
     # @return [String] html_safe string with no HTML tags.
     #
-    def self.strip_tags(string)
+    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)
@@ -89,7 +90,7 @@ module MetaTags
     # @param [String] sep separator to join strings with.
     # @return [String] input strings joined together using a given separator.
     #
-    def self.safe_join(array, sep = $OFS)
+    def safe_join(array, sep = $OFS)
       helpers.safe_join(array, sep)
     end
 
@@ -99,7 +100,7 @@ module MetaTags
     # @return [String] input string with no HTML tags and consequent white
     # space characters squashed into a single space.
     #
-    def self.cleanup_string(string)
+    def cleanup_string(string)
       strip_tags(string).gsub(/\s+/, ' ').strip.html_safe
     end
 
@@ -109,7 +110,7 @@ module MetaTags
     # @return [Array<String>] clean strings.
     # @see cleanup_string
     #
-    def self.cleanup_strings(strings)
+    def cleanup_strings(strings)
       Array(strings).flatten.map(&method(:cleanup_string))
     end
 
@@ -120,7 +121,7 @@ module MetaTags
     # @param [String] natural_separator natural separator to truncate at.
     # @return [String] truncated string.
     #
-    def self.truncate(string, limit = nil, natural_separator = ' ')
+    def truncate(string, limit = nil, natural_separator = ' ')
       string = helpers.truncate(string, length: limit, separator: natural_separator, omission: '', escape: false) if limit
       string.html_safe
     end
@@ -133,8 +134,8 @@ module MetaTags
     # @param [String] natural_separator natural separator to truncate at.
     # @return [String] truncated string.
     #
-    def self.truncate_array(string_array, limit = nil, separator = '', natural_separator = ' ')
-      return string_array if limit.nil? || limit.zero?
+    def truncate_array(string_array, limit = nil, separator = '', natural_separator = ' ')
+      return string_array if limit.nil? || limit <= 0
 
       length = 0
       result = []
@@ -157,14 +158,38 @@ module MetaTags
       result
     end
 
-    def self.calculate_limit_left(limit, length, result, separator)
+    private
+
+    def calculate_limit_left(limit, length, result, separator)
       limit - length - (result.any? ? separator.length : 0)
     end
 
-    def self.calculate_limit(site_title, separator)
-      return MetaTags.config.title_limit unless site_title.present?
+    def truncate_title(site_title, title, separator)
+      if MetaTags.config.title_limit && MetaTags.config.title_limit > 0
+        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) : []
+        site_title = site_title_limited_length > 0 ? truncate(site_title, site_title_limited_length) : nil
+      end
 
-      MetaTags.config.title_limit - separator.length
+      [site_title, title]
+    end
+
+    def calculate_title_limits(site_title, title, separator)
+      # What should we truncate first: site title or page title?
+      main_title = MetaTags.config.truncate_site_title_first ? title : [site_title]
+
+      main_length = main_title.map(&:length).sum + (main_title.size - 1) * separator.length
+      main_limited_length = MetaTags.config.title_limit
+
+      secondary_limited_length = MetaTags.config.title_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 ]
+      else
+        [ main_limited_length, secondary_limited_length ]
+      end
     end
   end
 end

data/lib/meta_tags/version.rb

@@ -1,4 +1,5 @@
 module MetaTags
   # Gem version.
-  VERSION = '2.5.0'
+
+  VERSION = '2.6.0'
 end

data/lib/meta_tags/view_helper.rb

@@ -160,8 +160,6 @@ module MetaTags
     # @option default [Hash] :alternate ({}) add alternate link tag.
     # @option default [String] :prev (nil) add prev link tag;
     # @option default [String] :next (nil) add next link tag.
-    # @option default [String] :author (nil) add author link tag;
-    # @option default [String] :publisher (nil) add publisher link tag.
     # @option default [String, Integer] :refresh (nil) meta refresh tag;
     # @option default [Hash] :open_graph ({}) add Open Graph meta tags.
     # @option default [Hash] :open_search ({}) add Open Search link tag.

data/meta-tags.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "actionpack", ">= 3.2.0", "< 5.2"
+  spec.add_dependency "actionpack", ">= 3.2.0", "< 5.3"
 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.5.0"
-  spec.add_development_dependency "rspec-html-matchers", "~> 0.8.0"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rspec", "~> 3.6.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 =~ /gem\z/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta-tags
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Dmytro Shteflyuk
@@ -12,7 +12,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZrcHVt
   dWsxFjAUBgoJkiaJk/IsZAEZFgZrcHVtdWsxFDASBgoJkiaJk/IsZAEZFgRpbmZv
-  MB4XDTE2MDgyNDAxMDYwOFoXDTE3MDgyNDAxMDYwOFowPzEPMA0GA1UEAwwGa3B1
+  MB4XDTE3MDgyNDE2MDUzOVoXDTE4MDgyNDE2MDUzOVowPzEPMA0GA1UEAwwGa3B1
   bXVrMRYwFAYKCZImiZPyLGQBGRYGa3B1bXVrMRQwEgYKCZImiZPyLGQBGRYEaW5m
   bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALw2YroZc+IT+rs8NuPu
   c13DelrxrpAgPEu1zuRb3l7WaHRNWA4TyS8Z6Aa1G2O+FdUZNMW1n7IwP/QMJ9Mz
@@ -23,14 +23,14 @@ cert_chain:
   /1sCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFPa4
   VFc1YOlV1u/7EGTwMCAk8YE9MB0GA1UdEQQWMBSBEmtwdW11a0BrcHVtdWsuaW5m
   bzAdBgNVHRIEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wDQYJKoZIhvcNAQEFBQAD
-  ggEBAKOnJYyA5Aq2BPQTSd9uxUzoYL010HsxIz2xFPNRxcI9wvgy6tE7noUD6yu5
-  k/IXjQOiqMag0zGF3rdEbDFHsvDhos9xZeGUaM3YIfoYg4YF7P7HgRCQFYL7G3va
-  h++H5FhlqFOF8g4lvYZ80AMNBO/tDfGuIzaJFbv+1mlHc2Szd3t7Mt2kNae92OYJ
-  x9+w3/LzxW8XariFP1RBseVgHdH9JwbranEqRJ51WwJ0zTGgDnvGxOxigExXEfYE
-  He5T3dBG5WWdIclQcE+JgohBpQ78TcVs1pFNjFmW9pC/P7Rm2GlYqOPHBQG1/Qx9
-  ySbbrGHRLVz8DCxQbhKw+mdT5bg=
+  ggEBADVN1hwt6ryAPcL8DBB7wM/cYy3oVpYDO1rLGfrdEOgI/Kz+qYbp+6cx9RCY
+  DOY6N3GVifGBlFEuyfY3Nubx9mG0FzyBytU7Cb+u+HF3Aw/MnGRoUuY3bzxy3sVE
+  t9uyKLaSN0e70mipmWWHhzIZg9sXFfNNt1vLipuw8ZScyoJAa1p5AK4syX6ZAL9G
+  g8psHzMWdefrDNJaB8PG8BI2Nb0sIKs8HdACKZo+qDO6b+oi4Wk0nLbRH7qnJcww
+  QwaoNrsQi488Dsk54YiNQWVouzfjRqEa4uUxSyKmRfQp7MNILESAOCXM+wZIxanu
+  C9c9eUxgNTnHhsR3sK0QCIMwtUI=
   -----END CERTIFICATE-----
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -41,7 +41,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,49 +51,49 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
 description: Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 email:
 - kpumuk@kpumuk.info
@@ -109,6 +109,8 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -116,6 +118,8 @@ files:
 - bin/console
 - bin/setup
 - certs/kpumuk.pem
+- lib/generators/meta_tags/install_generator.rb
+- lib/generators/meta_tags/templates/config/initializers/meta_tags.rb
 - lib/meta-tags.rb
 - lib/meta_tags.rb
 - lib/meta_tags/configuration.rb