meta-tags 2.1.0 → 2.2.0

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2
+2.3.1

data/.travis.yml

@@ -1,16 +1,25 @@
+sudo: false
+cache: bundler
+
 rvm:
   - 2.0.0
   - 2.1.7
-  - 2.2.3
+  - 2.2.4
+  - 2.3.1
 
 env:
-  - "RAILS_VERSION=3.1.0"
   - "RAILS_VERSION=3.2.0"
   - "RAILS_VERSION=4.0.0"
   - "RAILS_VERSION=4.1.0"
   - "RAILS_VERSION=4.2.0"
+  - "RAILS_VERSION=5.0.0"
 
 matrix:
+  exclude:
+    - rvm: 2.0.0
+      env: "RAILS_VERSION=5.0.0"
+    - rvm: 2.1.7
+      env: "RAILS_VERSION=5.0.0"
 
 notifications:
   recipients:

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 2.2.0 (August 24, 2016)
+
+Changes:
+
+  - Rails < 3.2 is not longer supported
+
+Features:
+
+  - Added support for `<link rel="image_src" href="...">` tag
+  - Added support for App Links
+  - Added support for `follow` meta tag
+
+Bugfixes:
+
+  - Fixed double escaping for ampersands (thanks to @srecnig)
+  - Removed usage of `alias_method_chain` to fix deprecation warnings with Rails 5
+  - Fixed the issue when title was truncated in some cases, when site_title was blank
+  - Fixed meta tag attributes for `fb:` meta tags
+
 ## 2.1.0 (October 6, 2015)
 
 Changes:

data/README.md

@@ -9,8 +9,8 @@ Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 
 ## Ruby on Rails
 
-MetaTags master branch now fully supports Rails 3.0+ and is not backward
-compatible. Latest version fully compatible with 2.x is 1.2.3.
+MetaTags master branch now fully supports Rails 3.2+, and is tested against all
+major Rails releases up to 5.0.1.
 
 Ruby versions older than 2.0.0 are no longer officially supported.
 
@@ -110,6 +110,16 @@ Further reading:
 * [About rel="nofollow"](http://www.google.com/support/webmasters/bin/answer.py?answer=96569)
 * [Meta tags](http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=79812)
 
+### Follow
+
+Follow will work with Noindex  meta tag
+
+    set_meta_tags noindex: true, follow: true
+    # <meta name="robots" content="noindex, follow" />
+
+It will not look at this page but will crawl through the rest of the pages on
+your website.
+
 ### Canonical URL
 
 Canonical link element tells a search engine what is the canonical or main URL
@@ -177,7 +187,7 @@ translated or targeted to users in a certain region.
 
     set_meta_tags alternate: { "fr" => "http://yoursite.fr/alternate/url",
                                "de" => "http://yoursite.de/alternate/url" }
-    # <link rel="alternate" href="http://yoursite.fr/alternate/url" hreflang="en" />
+    # <link rel="alternate" href="http://yoursite.fr/alternate/url" hreflang="fr" />
     # <link rel="alternate" href="http://yoursite.de/alternate/url" hreflang="de" />
 
 If you need more than just multi-lingual links, you can use an alternative syntax:
@@ -210,6 +220,13 @@ Further reading:
 * [Pagination](http://support.google.com/webmasters/bin/answer.py?hl=en&answer=1663744)
 * [Pagination with rel="next" and rel="prev"](http://googlewebmastercentral.blogspot.ca/2011/09/pagination-with-relnext-and-relprev.html)
 
+### image_src links
+
+Basically, when you submit/share this to Facebook , this helps Facebook determine which image to put next to the link. If this is not present, Facebook tries to put in the first image it finds on the page, which may not be the best one to represent your site.
+
+    set_meta_tags image_src: "http://yoursite.com/icons/icon_32.png"
+    # <link rel="image_src" href="http://yoursite.com/icons/icon_32.png" />
+
 ### Refresh interval and redirect URL
 
 Meta refresh is a method of instructing a web browser to automatically
@@ -357,6 +374,25 @@ Further reading:
 
 * [Twitter Cards Documentation](https://dev.twitter.com/docs/cards/)
 
+### App Links
+
+App Links is an open cross platform solution for deep linking to content in your mobile app. Here's an example for iOS app integration:
+
+    set_meta_tags al: {
+      ios: {
+        url: "example://applinks",
+        app_store_id: 12345,
+        app_name: "Example App"
+      }
+    }
+    # <meta property="al:ios:url" content="example://applinks" />
+    # <meta property="al:ios:app_store_id" content="12345" />
+    # <meta property="al:ios:app_name" content="Example App" />
+
+Further reading:
+
+* [App Links Documentation](https://developers.facebook.com/docs/applinks)
+
 ### Custom meta tags
 
 Starting from version 1.3.1, you can specify arbitrary meta tags, and they will
@@ -455,11 +491,13 @@ Use these options to customize the title format:
 * `: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;
 * `: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;
 * `:og` — add Open Graph tags (Hash);
 * `:twitter` — add Twitter tags (Hash);
 * `:refresh` — refresh interval and optionally url to redirect to.
@@ -546,4 +584,4 @@ And in your pjax templates:
 
 ## Author
 
-[Dmytro Shteflyuk](https://github.com/kpumuk), [http://kpumuk.info](http://kpumuk.info/)
+[Dmytro Shteflyuk](https://github.com/kpumuk), [https://kpumuk.info](http://kpumuk.info/)

data/certs/kpumuk.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZrcHVt
+dWsxFjAUBgoJkiaJk/IsZAEZFgZrcHVtdWsxFDASBgoJkiaJk/IsZAEZFgRpbmZv
+MB4XDTE2MDgyNDAxMDYwOFoXDTE3MDgyNDAxMDYwOFowPzEPMA0GA1UEAwwGa3B1
+bXVrMRYwFAYKCZImiZPyLGQBGRYGa3B1bXVrMRQwEgYKCZImiZPyLGQBGRYEaW5m
+bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALw2YroZc+IT+rs8NuPu
+c13DelrxrpAgPEu1zuRb3l7WaHRNWA4TyS8Z6Aa1G2O+FdUZNMW1n7IwP/QMJ9Mz
+ahRBiTmhik5kasJ9s0h1lq5/hZiycm0o5OtGioUzCkvk+UEMpzMHbLmVSZCzYciy
+NDRDbXB0rLLu1eJk+gKgn6Qf5vj93h1w28BdWdaA7YegtbmipZ+pjmzCQAfPActT
+6uXHG4dSo7Lz9jiFRI5dUizFbGXcRqkQ2b5AB8FFmfcvbqERvzQKBICnybjsKP0N
+pJ3vGgO2sh5GvJFOPk1Vlur2nX9ZFznPEP1CEAQ+NFrmKRt355Z5sgOkAojSGnIL
+/1sCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFPa4
+VFc1YOlV1u/7EGTwMCAk8YE9MB0GA1UdEQQWMBSBEmtwdW11a0BrcHVtdWsuaW5m
+bzAdBgNVHRIEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wDQYJKoZIhvcNAQEFBQAD
+ggEBAKOnJYyA5Aq2BPQTSd9uxUzoYL010HsxIz2xFPNRxcI9wvgy6tE7noUD6yu5
+k/IXjQOiqMag0zGF3rdEbDFHsvDhos9xZeGUaM3YIfoYg4YF7P7HgRCQFYL7G3va
+h++H5FhlqFOF8g4lvYZ80AMNBO/tDfGuIzaJFbv+1mlHc2Szd3t7Mt2kNae92OYJ
+x9+w3/LzxW8XariFP1RBseVgHdH9JwbranEqRJ51WwJ0zTGgDnvGxOxigExXEfYE
+He5T3dBG5WWdIclQcE+JgohBpQ78TcVs1pFNjFmW9pC/P7Rm2GlYqOPHBQG1/Qx9
+ySbbrGHRLVz8DCxQbhKw+mdT5bg=
+-----END CERTIFICATE-----

data/lib/meta_tags/controller_helper.rb

@@ -10,22 +10,15 @@ module MetaTags
   # as {ViewHelper#set_meta_tags}.
   #
   module ControllerHelper
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :render, :meta_tags
-    end
-
     # Processes the <tt>@page_title</tt>, <tt>@page_keywords</tt>, and
     # <tt>@page_description</tt> instance variables and calls +render+.
-    def render_with_meta_tags(*args, &block)
+    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
 
-      render_without_meta_tags(*args, &block)
+      super
     end
-    protected :render_with_meta_tags
 
     # Set meta tags for the page.
     #

data/lib/meta_tags/meta_tags_collection.rb

@@ -128,8 +128,11 @@ module MetaTags
     def extract_noindex
       noindex_name,  noindex_value  = extract_noindex_attribute(:noindex)
       nofollow_name, nofollow_value = extract_noindex_attribute(:nofollow)
+      follow_name,   follow_value   = extract_noindex_attribute(:follow)
 
-      if noindex_name == nofollow_name
+      if noindex_name == follow_name && (follow_value && noindex_value)
+        { noindex_name => [noindex_value, follow_value].compact.join(', ') }
+      elsif noindex_name == nofollow_name
         { noindex_name => [noindex_value, nofollow_value].compact.join(', ') }
       else
         { noindex_name => noindex_value, nofollow_name => nofollow_value }

data/lib/meta_tags/renderer.rb

@@ -30,6 +30,8 @@ module MetaTags
       render_links(tags)
 
       render_hash(tags, :og, name_key: :property)
+      render_hash(tags, :al, name_key: :property)
+      render_hash(tags, :fb, name_key: :property)
       render_hashes(tags)
       render_custom(tags)
 
@@ -147,7 +149,7 @@ module MetaTags
     # @param [Array<Tag>] tags a buffer object to store tag in.
     #
     def render_links(tags)
-      [ :canonical, :prev, :next, :author, :publisher ].each do |tag_name|
+      [ :canonical, :prev, :next, :author, :publisher, :image_src ].each do |tag_name|
         href = meta_tags.extract(tag_name)
         if href.present?
           @normalized_meta_tags[tag_name] = href
@@ -203,13 +205,13 @@ module MetaTags
     #
     def process_tree(tags, property, content, options = {})
       method = case content
-      when Hash
-        :process_hash
-      when Array
-        :process_array
-      else
-        :render_tag
-      end
+               when Hash
+                 :process_hash
+               when Array
+                 :process_array
+               else
+                 :render_tag
+               end
       send(method, tags, property, content, options)
     end
 

data/lib/meta_tags/text_normalizer.rb

@@ -16,7 +16,13 @@ module MetaTags
       separator = strip_tags(separator)
 
       if MetaTags.config.title_limit
-        limit = MetaTags.config.title_limit - separator.length
+        limit = if site_title.present?
+          MetaTags.config.title_limit - separator.length
+        else
+          # separtor won't be used: ignore its length
+          MetaTags.config.title_limit
+        end
+
         if limit > site_title.length
           title = truncate_array(title, limit - site_title.length, separator)
         else
@@ -68,10 +74,16 @@ module MetaTags
     # Strips all HTML tags from the +html+, including comments.
     #
     # @param [String] string HTML string.
-    # @return [String] string with no HTML tags.
+    # @return [String] html_safe string with no HTML tags.
     #
     def self.strip_tags(string)
-      ERB::Util.html_escape helpers.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
+      else
+        ERB::Util.html_escape helpers.strip_tags(string)
+      end
     end
 
     # This method returns a html safe string similar to what <tt>Array#join</tt>
@@ -115,8 +127,8 @@ module MetaTags
     # @return [String] truncated string.
     #
     def self.truncate(string, limit = nil, natural_separator = ' ')
-      string = helpers.truncate(string, length: limit, separator: natural_separator, omission: '') if limit
-      string
+      string = helpers.truncate(string, length: limit, separator: natural_separator, omission: '', escape: false) if limit
+      string.html_safe
     end
 
     # Truncates a string to a specific limit.

data/lib/meta_tags/version.rb

@@ -1,4 +1,4 @@
 module MetaTags
   # Gem version.
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/meta-tags.gemspec

@@ -6,13 +6,14 @@ Gem::Specification.new do |s|
   s.name        = 'meta-tags'
   s.version     = MetaTags::VERSION
   s.platform    = Gem::Platform::RUBY
+  s.license     = "MIT"
   s.authors     = ['Dmytro Shteflyuk']
   s.email       = ['kpumuk@kpumuk.info']
   s.homepage    = 'http://github.com/kpumuk/meta-tags'
   s.summary     = %q{Collection of SEO helpers for Ruby on Rails.}
   s.description = %q{Search Engine Optimization (SEO) plugin for Ruby on Rails applications.}
 
-  s.add_dependency 'actionpack', '>= 3.0.0'
+  s.add_dependency 'actionpack', '>= 3.2.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.3.0'
@@ -20,6 +21,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'bluecloth'
 
+  s.cert_chain    = ['certs/kpumuk.pem']
+  s.signing_key   = File.expand_path("~/.ssh/gem-kpumuk.pem") if $0 =~ /gem\z/
+
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/spec/controller_helper_spec.rb

@@ -1,24 +1,27 @@
 require 'spec_helper'
 
 class MetaTagsController < ActionController::Base
-  attr_reader :rendered
-
-  def render_without_meta_tags
-    @rendered = true
-  end
-
   def index
     @page_title       = 'title'
     @page_keywords    = 'key1, key2, key3'
     @page_description = 'description'
-    render
+
+    if Gem.loaded_specs["actionpack"].version > Gem::Version.new('4.2.0')
+      render plain: '_rendered_'
+    else
+      render text: '_rendered_'
+    end
   end
 
   public :set_meta_tags, :meta_tags
 end
 
 describe MetaTags::ControllerHelper do
-  subject { MetaTagsController.new }
+  subject {
+    MetaTagsController.new.tap do |c|
+      c.response = ActionDispatch::TestResponse.new
+    end
+  }
 
   context 'module' do
     it 'should be mixed into ActionController::Base' do
@@ -33,7 +36,7 @@ describe MetaTags::ControllerHelper do
   describe '.render' do
     it 'should set meta tags from instance variables' do
       subject.index
-      expect(subject.rendered).to be_truthy
+      expect(subject.response.body).to eq('_rendered_')
       expect(subject.meta_tags.meta_tags).to eq('title' => 'title', 'keywords' => 'key1, key2, key3', 'description' => 'description')
     end
   end

data/spec/text_normalizer/normalize_title_spec.rb

@@ -14,6 +14,11 @@ describe MetaTags::TextNormalizer, '.normalize_title' do
     it 'should reverse title parts when reverse is true' do
       expect(subject.normalize_title('', %w[title subtitle], '-', true)).to eq('subtitle-title')
     end
+
+    it 'should not truncate title when limit is equal to the title length' do
+      title = 'b' * MetaTags.config.title_limit
+      expect(subject.normalize_title('', title, '-')).to eq(title)
+    end
   end
 
   context 'when site_title is specified' do

data/spec/view_helper/links_spec.rb

@@ -122,4 +122,25 @@ describe MetaTags::ViewHelper do
       end
     end
   end
+
+  context 'displaying image_src url' do
+    it 'should not display image_src url by default' do
+      subject.display_meta_tags(site: 'someSite').tap do |meta|
+        expect(meta).to_not have_tag('link', with: { href: "http://example.com/base/url", rel: "image_src" })
+      end
+    end
+
+    it 'should display image_src url when "set_meta_tags" used' do
+      subject.set_meta_tags(image_src: 'http://example.com/base/url')
+      subject.display_meta_tags(site: 'someSite').tap do |meta|
+        expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "image_src" })
+      end
+    end
+
+    it 'should display default image_src url' do
+      subject.display_meta_tags(site: 'someSite', image_src: 'http://example.com/base/url').tap do |meta|
+        expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "image_src" })
+      end
+    end
+  end
 end

data/spec/view_helper/title_spec.rb

@@ -28,13 +28,41 @@ describe MetaTags::ViewHelper do
       expect(subject.display_meta_tags).to eq('<title>someTitle</title>')
     end
 
-    it 'should display title when "set_meta_tags" used' do
+    it 'should display title when "set_meta_tags" is used' do
       subject.set_meta_tags(title: 'someTitle')
       subject.display_meta_tags(site: 'someSite').tap do |meta|
         expect(meta).to eq('<title>someSite | someTitle</title>')
       end
     end
 
+    it 'should escape the title when "set_meta_tags" is used' do
+      subject.set_meta_tags(title: 'someTitle & somethingElse')
+      subject.display_meta_tags(site: 'someSite').tap do |meta|
+        expect(meta).to eq('<title>someSite | someTitle &amp; somethingElse</title>')
+      end
+    end
+
+    it 'should escape a very long title when "set_meta_tags" is used' do
+      subject.set_meta_tags(title: 'Kombucha kale chips forage try-hard & green juice. IPhone marfa PBR&B venmo listicle, irony kitsch thundercats.')
+      subject.display_meta_tags(site: 'someSite').tap do |meta|
+        expect(meta).to eq('<title>someSite | Kombucha kale chips forage try-hard &amp; green juice.</title>')
+      end
+    end
+
+    it 'should strip tags in the title' do
+      subject.set_meta_tags(title: '<b>hackxor</b>')
+      subject.display_meta_tags(site: 'someSite').tap do |meta|
+        expect(meta).to eq('<title>someSite | hackxor</title>')
+      end
+    end
+
+    it 'should strip tags from very long titles' do
+      subject.set_meta_tags(title: 'Kombucha <b>kale</b> chips forage try-hard & green juice. IPhone marfa PBR&B venmo listicle, irony kitsch thundercats.')
+      subject.display_meta_tags(site: 'someSite').tap do |meta|
+        expect(meta).to eq('<title>someSite | Kombucha kale chips forage try-hard &amp; green juice.</title>')
+      end
+    end
+
     it 'should display custom title if given' do
       subject.title('someTitle')
       subject.display_meta_tags(site: 'someSite', title: 'defaultTitle').tap do |meta|