meta-tags 1.5.0 → 1.6.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTVhZmJkYjIxODQ5MTRjZjkxOGY0ODQwYmYwYmVjM2E0ZmYyNWI2NQ==
+  data.tar.gz: !binary |-
+    MjQyMDNhYWNmOGNhMjBkN2RmZWZiODY5NGEzYTQ0NzdmMmFkNjhmMw==
+SHA512:
+  metadata.gz: !binary |-
+    YzAzNDRlZGEwMDIxYWVjOTZhODY2NWZkYWJhMjMyMjNlNjZmYzkzMzc0NmQw
+    MjAzOTNlYjQ3MjE1ZjY0ZGU0NDA0MDlhZTQ2YTBiZjEzZDdjZjQ0M2Q5YTVk
+    OTI0NjMwM2MxMjU4Mjc0ZGRiNjI3MmUzMGRmYTdlODY2YmY0YWE=
+  data.tar.gz: !binary |-
+    YzA3YzcyN2NjMTg3MWE3YzYzZWVlNTQ5ZDk0M2ZkM2FjNjU5NDc1MTJkNmYy
+    MzUwNzA0NjUzMTM4YWUzZDJkN2UxNzM3ZDA2MTVlZWMwZmVkY2QxODMxM2I0
+    NWZmNWM3ZTcwOGVmNDY4NDQ2YzVlNTc3MzA1ZjA3NTU4NGY0M2I=

data/.gitignore

@@ -1,7 +1,6 @@
 .yardoc
 .DS_Store
 .bundle
-.rvmrc
 Gemfile.lock
 doc
 pkg

data/.ruby-gemset

@@ -0,0 +1 @@
+meta-tags

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.1

data/.travis.yml

@@ -3,6 +3,24 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+
+env:
+  - "RAILS_VERSION=3.1.0"
+  - "RAILS_VERSION=3.2.0"
+  - "RAILS_VERSION=4.0.0"
+  - "RAILS_VERSION=4.1.0"
+
+matrix:
+  exclude:
+    - rvm: ree
+      env: "RAILS_VERSION=4.0.0"
+    - rvm: ree
+      env: "RAILS_VERSION=4.1.0"
+    - rvm: 1.8.7
+      env: "RAILS_VERSION=4.0.0"
+    - rvm: 1.8.7
+      env: "RAILS_VERSION=4.1.0"
 
 notifications:
   recipients:

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.6.0 (April 14, 2014)
+
+Features:
+
+  - Added "alternate" links support
+  - Added Google "author" and "publisher" links
+  - Implemented mirrored values inside namespaces declared as hashes
+
+Breaking changes:
+
+  - Removed support of Rails older than 3.0.0 due to the bug in `Hash#deep_merge` (does not support `HashWithIndifferentAccess`)
+
 ## 1.5.0 (May 7, 2013)
 
 Features:

data/Gemfile

@@ -2,3 +2,7 @@ source 'http://rubygems.org'
 
 # Specify your gem's dependencies in meta-tags.gemspec
 gemspec
+
+if ENV['RAILS_VERSION']
+  gem 'actionpack', "~> #{ENV['RAILS_VERSION']}"
+end

data/README.md

@@ -4,16 +4,16 @@
 
 Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 
-## Rails 3
+## Ruby on Rails
 
-MetaTags master branch now fully supports Rails 3 and is backward
-compatible.
+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.
 
 ## Installation
 
 Add the "meta-tags" gem to your `Gemfile`.
 
-    gem 'meta-tags', :require => 'meta_tags'
+    gem 'meta-tags'
 
 And run `bundle install` command.
 
@@ -105,6 +105,45 @@ Further reading:
 * [About rel="canonical"](http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=139394)
 * [Canonicalization](http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=139066)
 
+### Author links
+
+Link to your Google+ profile using rel="author"
+
+    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"
+
+    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
+
+Alternate link elements tell a search engine when there is content that's translated or targeted to
+users in a certain region.
+
+    set_meta_tags :alternate => { "fr" => "http://yoursite.fr/alternate/url" }
+    # <link rel="alternate" href="http://yoursite.fr/alternate/url" hreflang="fr" />
+
+    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.de/alternate/url" hreflang="de" />
+
+Further reading:
+
+* [Multi-regional and multilingual sites](https://support.google.com/webmasters/answer/182192)
+* [About rel="alternate" hreflang="x"](http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=189077)
+
 ### Pagination links
 
 Previous and next links indicate indicate the relationship between individual
@@ -308,8 +347,10 @@ Use these options to customize the title format:
 * `: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;
 * `:canonical` — add canonical link tag;
+* `:author` — add author link tag;
+* `:publisher` — add publisher link tag;
 * `:prev` — add prev link tag;
-* `:prev` — add next link tag;
+* `:next` — add next link tag;
 * `:og` — add Open Graph tags (Hash);
 * `:twitter` — add Twitter tags (Hash);
 * `:refresh` — refresh interval and optionally url to redirect to.
@@ -321,6 +362,7 @@ And here are a few examples to give you ideas.
     <%= display_meta_tags :lowercase => true %>
     <%= display_meta_tags :reverse => true, :prefix => false %>
     <%= display_meta_tags :og => { :title => 'The Rock', :type => 'video.movie' } %>
+    <%= display_meta_tags :alternate => { 'zh-Hant' => 'http://example.com.tw/base/url' } %>
 
 ### Allowed values
 
@@ -338,6 +380,27 @@ Keywords can be passed as string of comma-separated values, or as an array:
 
 Description is a string (HTML will be stripped from output string).
 
+### Mirrored values
+
+Sometimes, it is desirable to mirror meta tag values down into namespaces. A
+common use case is when you want open graph's `og:title` to be identical to
+the `title`.
+
+Say, you have the following in your application layout:
+
+    display_meta_tags :og => {
+      :title => :title
+    }
+
+The value of `og[:title]` is a symbol and therefore references the value of the
+top level `title` meta tag. With the following in any view:
+
+    title 'my great view'
+
+You get this open graph meta tag for free:
+
+    <meta property="og:title" content="my great view"></meta>
+
 ### Using with pjax
 
 [jQuery.pjax](https://github.com/defunkt/jquery-pjax) is a nice solution for navigation

data/lib/meta-tags.rb

@@ -0,0 +1 @@
+require 'meta_tags'

data/lib/meta_tags/version.rb

@@ -1,3 +1,3 @@
 module MetaTags
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/lib/meta_tags/view_helper.rb

@@ -158,6 +158,7 @@ module MetaTags
     # @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;
     # @option default [String] :next (nil) add next link tag.
     # @option default [String, Integer] :refresh (nil) meta refresh tag;
@@ -203,7 +204,14 @@ module MetaTags
 
       # refresh
       if refresh = meta_tags.delete(:refresh)
-        result << tag(:meta, 'http-equiv' => 'refresh', :content => refresh.to_s) unless refresh.blank?
+        result << tag(:meta, 'http-equiv' => 'refresh', :content => refresh.to_s) if refresh.present?
+      end
+
+      # alternate
+      if alternate = meta_tags.delete(:alternate)
+        alternate.each do |hreflang, href|
+          result << tag(:link, :rel => 'alternate', :href => href, :hreflang => hreflang) if href.present?
+        end
       end
 
       # hashes
@@ -214,8 +222,8 @@ module MetaTags
         end
       end
 
-      # canonical, prev and next
-      [ :canonical, :prev, :next ].each do |tag_name|
+      # canonical, prev, next and author, :publisher
+      [ :canonical, :prev, :next, :author, :publisher ].each do |tag_name|
         next unless href = meta_tags.delete(tag_name)
         result << tag(:link, :rel => tag_name, :href => href)
       end
@@ -229,13 +237,13 @@ module MetaTags
       end
 
       result = result.join("\n")
-      result.respond_to?(:html_safe) ? result.html_safe : result
+      result.html_safe
     end
 
     # Returns full page title as a string without surrounding <title> tag.
     #
     # The only case when you may need this helper is when you use pjax. This means
-    # that your layour file (with display_meta_tags helper) will not be rendered,
+    # that your layout file (with display_meta_tags helper) will not be rendered,
     # so you have to pass default arguments like site title in here. You probably
     # want to define helper with default options to minimize code duplication.
     #
@@ -267,7 +275,7 @@ module MetaTags
         result = []
         if content.is_a?(Hash)
           content.each do |key, value|
-            result.concat process_tree("#{property}:#{key}", value)
+            result.concat process_tree("#{property}:#{key}", value.is_a?(Symbol) ? meta_tags[value] : value)
           end
         else
           Array(content).each do |c|
@@ -293,7 +301,7 @@ module MetaTags
       def normalize_keywords(keywords)
         return '' if keywords.blank?
         keywords = keywords.flatten.join(', ') if Array === keywords
-        strip_tags(keywords).mb_chars.downcase
+        strip_tags(keywords).downcase
       end
 
       def normalize_open_graph(meta_tags)
@@ -336,10 +344,9 @@ module MetaTags
           title.reverse! if meta_tags.delete(:reverse) === true
           sep = h(prefix) + h(separator) + h(suffix)
           title = title.join(sep)
-          # We escaped every chunk of the title, so the whole title should be HTML safe
-          title = title.html_safe if title.respond_to?(:html_safe)
           meta_tags.delete(:site)
-          title
+          # We escaped every chunk of the title, so the whole title should be HTML safe
+          title.html_safe
         end
       end
   end

data/meta-tags.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   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'
+  s.add_dependency 'actionpack', '>= 3.0.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

data/spec/meta_tags_spec.rb

@@ -151,15 +151,15 @@ describe MetaTags::ViewHelper do
                               :reverse => true).should eq('<title>sometitle -:+ someSite</title>')
     end
 
-    it 'shold allow Arrays in title' do
+    it 'should allow Arrays in title' do
       subject.display_meta_tags(:site => 'someSite', :title => ['someTitle', 'anotherTitle']).should eq('<title>someSite | someTitle | anotherTitle</title>')
     end
 
-    it 'shold allow Arrays in title with :lowercase' do
+    it 'should allow Arrays in title with :lowercase' do
       subject.display_meta_tags(:site => 'someSite', :title => ['someTitle', 'anotherTitle'], :lowercase => true).should eq('<title>someSite | sometitle | anothertitle</title>')
     end
 
-    it 'shold build title in reverse order if :reverse' do
+    it 'should build title in reverse order if :reverse' do
       subject.display_meta_tags(:site => 'someSite',
                               :title => ['someTitle', 'anotherTitle'],
                               :prefix => ' -',
@@ -360,6 +360,39 @@ describe MetaTags::ViewHelper do
     end
   end
 
+  context 'displaying alternate url' do
+    it 'should not display alternate url by default' do
+      subject.display_meta_tags(:site => 'someSite').should_not include('<link href="http://example.fr/base/url" hreflang="fr" rel="alternate" />')
+    end
+
+    it 'should display alternate url when "set_meta_tags" used' do
+      subject.set_meta_tags(:alternate => { 'fr' => 'http://example.fr/base/url' })
+      subject.display_meta_tags(:site => 'someSite').should include('<link href="http://example.fr/base/url" hreflang="fr" rel="alternate" />')
+    end
+
+    it 'should display default alternate url' do
+      subject.display_meta_tags(:site => 'someSite', :alternate => { 'fr' => 'http://example.fr/base/url' }).should include('<link href="http://example.fr/base/url" hreflang="fr" rel="alternate" />')
+    end
+
+    it "should not display alternate without content" do
+      subject.display_meta_tags(:site => 'someSite', :alternate => {'zh-Hant' => ''}).should_not include('<link href="" hreflang="zh-Hant" rel="alternate" />')
+    end
+  end
+
+  context 'displaying author link' do
+    it 'should display author link when "set_meta_tags" used' do
+      subject.set_meta_tags(:author => 'http://plus.google.com/profile/url')
+      subject.display_meta_tags(:site => 'someSite').should include('<link href="http://plus.google.com/profile/url" rel="author" />')
+    end
+  end
+
+  context 'displaying publisher link' do
+    it 'should display publisher link when "set_meta_tags" used' do
+      subject.set_meta_tags(:publisher => 'http://plus.google.com/myprofile_url')
+      subject.display_meta_tags(:site => 'someSite').should include('<link href="http://plus.google.com/myprofile_url" rel="publisher" />')
+    end
+  end
+
   context 'displaying prev url' do
     it 'should not display prev url by default' do
       subject.display_meta_tags(:site => 'someSite').should_not include('<link href="http://example.com/base/url" rel="prev" />')
@@ -458,6 +491,13 @@ describe MetaTags::ViewHelper do
         content.should_not include('<meta content="" property="og:description" />')
       end
     end
+
+    it "should display mirrored content" do
+      subject.set_meta_tags(:title => 'someTitle')
+      subject.display_meta_tags(:open_graph => { :title => :title }).tap do |content|
+        content.should include('<meta content="someTitle" property="og:title" />')
+      end
+    end
   end
 
   context 'while handling string meta tag names' do

metadata

@@ -1,111 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: meta-tags
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 0
-  version: 1.5.0
+version: !ruby/object:Gem::Version
+  version: 1.6.0
 platform: ruby
-authors: 
+authors:
 - Dmytro Shteflyuk
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-07 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2014-04-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: *id005
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
-email: 
+email:
 - kpumuk@kpumuk.info
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - CHANGELOG.md
-files: 
+files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
+- lib/meta-tags.rb
 - lib/meta_tags.rb
 - lib/meta_tags/controller_helper.rb
 - lib/meta_tags/version.rb
@@ -114,39 +107,29 @@ files:
 - spec/controller_helper_spec.rb
 - spec/meta_tags_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/kpumuk/meta-tags
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Collection of SEO helpers for Ruby on Rails.
 test_files: []
-
+has_rdoc: