meta-tags 1.1.0 → 1.1.1

data/.gitignore

@@ -1,3 +1,4 @@
 rdoc
 doc
-pkg
+pkg
+.yardoc

data/README.rdoc

@@ -58,8 +58,8 @@ Recommended keywords tag length: up to <b>255 characters</b>, <b>20 words</b>.
 By using the noindex meta tag, you can signal to search engines to not 
 include specific pages in their indexes.
 
-  <meta name="robots" content="noindex">
-  <meta name="googlebot" content="noindex">
+  <meta name="robots" content="noindex" />
+  <meta name="googlebot" content="noindex" />
 
 This is useful for pages like login, password reset, privacy policy, etc.  
 
@@ -74,13 +74,25 @@ page. It's entirely likely that a robot might find the same links on some
 other page without a nofollow (perhaps on some other site), and so
 still arrives at your undesired page.
 
-  <meta name="robots" content="nofollow">
-  <meta name="googlebot" content="nofollow">
+  <meta name="robots" content="nofollow" />
+  <meta name="googlebot" content="nofollow" />
 
 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
 
+== Canonical URL
+
+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.
+
+  <link rel="canonical" href="http://yoursite.com/canonical/url" />
+
+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
+
 == MetaTags Usage
 
 First, add this code to your main layout:
@@ -157,7 +169,8 @@ Use these options to customize the title format:
 * <tt>:lowercase</tt> -- when true, the page name will be lowercase;
 * <tt>:reverse</tt> -- when true, the page and site names will be reversed;
 * <tt>:noindex</tt> -- add noindex meta tag; when true, 'robots' will be used, otherwise the string will be used;
-* <tt>:nofollow</tt> -- add nofollow meta tag; when true, 'robots' will be used, otherwise the string will be used.
+* <tt>:nofollow</tt> -- add nofollow meta tag; when true, 'robots' will be used, otherwise the string will be used;
+* <tt>:canonical</tt> -- add canonical link tag.
 
 And here are a few examples to give you ideas.
 
@@ -193,3 +206,4 @@ There are several plugins influenced me to create this one:
 
 * Dmytro Shteflyuk (author) <kpumuk@kpumuk.info> http://kpumuk.info
 * Morgan Roderick (contributor) <morgan@roderick.dk> http://roderick.dk
+* Sergio Cambra (contributor) <sergio@entrecables.com>

data/Rakefile

@@ -1,6 +1,4 @@
 require 'rake'
-require 'spec/rake/spectask'
-require 'rake/rdoctask'
 
 begin
   require 'jeweler'
@@ -17,22 +15,33 @@ rescue LoadError
   puts 'Jeweler not available. Install it with: sudo gem install jeweler'
 end
 
-desc 'Default: run unit tests.'
-task :default => :spec
+begin
+  require 'spec/rake/spectask'
+
+  desc 'Default: run specs'
+  task :default => :spec
 
-desc 'Test the meta-tags plugin.'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs << 'lib'
-  t.pattern = 'spec/**/*_spec.rb'
-  t.verbose = true
-  t.spec_opts = ['-cfs']
+  desc 'Test the sphinx plugin'
+  Spec::Rake::SpecTask.new do |t|
+    t.libs << 'lib'
+    t.pattern = 'spec/*_spec.rb'
+    t.verbose = true
+    t.spec_opts = ['-cfs']
+  end
+rescue LoadError
+  puts 'RSpec not available. Install it with: sudo gem install rspec'
 end
 
-desc 'Generate documentation for the meta-tags plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'MetaTags'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new(:yard) do |t|
+    t.options = ['--title', 'MetaTags Documentation']
+    if ENV['PRIVATE']
+      t.options.concat ['--protected', '--private']
+    else
+      t.options << '--no-private' 
+    end
+  end
+rescue LoadError
+  puts 'Yard not available. Install it with: sudo gem install yard'
 end

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
+:patch: 1
+:build: 
 :major: 1
 :minor: 1
-:patch: 0

data/lib/meta_tags/view_helper.rb

@@ -107,7 +107,8 @@ module MetaTags
     # * <tt>:lowercase</tt> -- when true, the page name will be lowercase;
     # * <tt>:reverse</tt> -- when true, the page and site names will be reversed;
     # * <tt>:noindex</tt> -- add noindex meta tag; when true, 'robots' will be used, otherwise the string will be used;
-    # * <tt>:nofollow</tt> -- add nofollow meta tag; when true, 'robots' will be used, otherwise the string will be used.
+    # * <tt>:nofollow</tt> -- add nofollow meta tag; when true, 'robots' will be used, otherwise the string will be used;
+    # * <tt>:canonical</tt> -- add canonical link tag.
     def display_meta_tags(default = {})
       meta_tags = (default || {}).merge(@meta_tags || {})
 
@@ -173,6 +174,9 @@ module MetaTags
         result << "\n" + tag(:meta, :name => nofollow_name, :content => 'nofollow') if meta_tags[:nofollow]
       end
 
+      # canonical
+      result << "\n" + tag(:link, :rel => :canonical, :href => meta_tags[:canonical]) unless meta_tags[:canonical].blank?
+
       return result
     end
   

data/meta-tags.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta-tags}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmytro Shteflyuk"]
-  s.date = %q{2009-11-05}
+  s.date = %q{2009-11-21}
   s.description = %q{Search Engine Optimization (SEO) plugin for Ruby on Rails applications.}
   s.email = %q{kpumuk@kpumuk.info}
   s.extra_rdoc_files = [

data/spec/meta_tags_spec.rb

@@ -275,4 +275,19 @@ describe MetaTags::ViewHelper do
       content.should include('<meta content="nofollow" name="some-nofollow" />')
     end
   end
+
+  context 'displaying canonical url' do
+    it 'should not display canonical url by default' do
+      @view.display_meta_tags(:site => 'someSite').should_not include('<link href="http://example.com/base/url" rel="canonical" />')
+    end
+
+    it 'should display canonical url when "set_meta_tags" used' do
+      @view.set_meta_tags(:canonical => 'http://example.com/base/url')
+      @view.display_meta_tags(:site => 'someSite').should include('<link href="http://example.com/base/url" rel="canonical" />')
+    end
+
+    it 'should display default canonical url' do
+      @view.display_meta_tags(:site => 'someSite', :canonical => 'http://example.com/base/url').should include('<link href="http://example.com/base/url" rel="canonical" />')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: meta-tags
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Dmytro Shteflyuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 +02:00
+date: 2009-11-21 00:00:00 +02:00
 default_executable: 
 dependencies: []