meta-tags 1.2.4 → 1.2.5

data/spec/spec_helper.rb

@@ -1,2 +1,25 @@
 require 'bundler/setup'
 require 'meta_tags'
+
+shared_examples_for '.set_meta_tags' do
+  it 'should update meta tags' do
+    subject.set_meta_tags(:title => 'hello')
+    subject.meta_tags[:title].should == 'hello'
+
+    subject.set_meta_tags(:title => 'world')
+    subject.meta_tags[:title].should == 'world'
+  end
+
+  it 'should use deep merge when updating meta tags' do
+    subject.set_meta_tags(:open_graph => { :title => 'hello' })
+    subject.meta_tags[:open_graph].should == { :title => 'hello' }
+
+    subject.set_meta_tags(:open_graph => { :description => 'world' })
+    subject.meta_tags[:open_graph].should == { :title => 'hello', :description => 'world' }
+  end
+
+  it 'should normalize :og to :open_graph' do
+    subject.set_meta_tags(:og => { :title => 'hello' })
+    subject.meta_tags[:open_graph].should == { :title => 'hello' }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: meta-tags
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Dmytro Shteflyuk
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -04:00
-default_executable: 
+date: 2012-03-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -33,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +46,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,6 +59,34 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 email: 
 - kpumuk@kpumuk.info
@@ -68,22 +95,24 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
+- CHANGELOG.md
 files: 
 - .gitignore
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - lib/meta_tags.rb
 - lib/meta_tags/controller_helper.rb
 - lib/meta_tags/version.rb
 - lib/meta_tags/view_helper.rb
 - meta-tags.gemspec
+- 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: []
 
@@ -113,10 +142,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Collection of SEO helpers for Ruby on Rails.
-test_files: 
-- spec/meta_tags_spec.rb
-- spec/spec_helper.rb
+test_files: []
+
+has_rdoc: 

data/Gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: .
-  specs:
-    meta-tags (1.2.4)
-      actionpack
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.7)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    rack (1.2.2)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    tzinfo (0.3.26)
-    yard (0.6.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  meta-tags!
-  rspec
-  yard

data/README.rdoc

@@ -1,223 +0,0 @@
-= MetaTags
-
-Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
-
-== Rails 3
-
-MetaTags master branch now fully supports Rails 3 and is backward
-compatible.
-
-== Installation
-
-Add the "meta-tags" gem to your +Gemfile+.
-
-  gem 'meta-tags', :require => 'meta_tags'
-
-And run +bundle install+ command.
-
-== Titles
-
-Page titles are very important for Search engines. The titles in the
-browser are displayed in the title bar. The search engines would look at
-the this title bar to determine what the page is all about.
-
-  <title>Some Page Title</title>
-  <title>Page Title | Site Title</title>
-
-Recommended title tag length: up to <b>70 characters</b>, <b>10 words</b>.
-
-== Description
-
-Description tags are called meta tags as they are not displayed by the
-browsers as that of titles. But these descriptions may be displayed by
-some search engines. They are used to describe the contents of a page in
-2 or 3 sentences.
-
-  <meta name="description" content="All text about keywords, other keywords" />
-
-Recommended description tag length: up to <b>160 characters</b>.
-
-== Keywords
-
-Meta keywords tag are used to place your keywords that you think a
-surfer would search in Search engines. Repeating keywords unnecessarily
-would be considered spam and you may get permanently banned from SERP's
-
-  <meta name="keywords" content="keyword1, keyword2, keyword3" />
-
-Recommended keywords tag length: up to <b>255 characters</b>, <b>20 words</b>.
-
-== Noindex
-
-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" />
-
-This is useful for pages like login, password reset, privacy policy, etc.  
-
-Further reading:
-* Blocking Google http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=93708
-* Using meta tags to block access to your site http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=93710
-
-== Nofollow
-
-Nofollow meta tag tells a search engine not to follow the links on a specific
-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" />
-
-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
-
-== Open Graph
-
-To turn your web pages into graph objects, you'll need to add Open Graph protocol
-<meta> tags to your webpages. The tags allow you to specify structured information
-about your web pages. The more information you provide, the more opportunities your
-web pages can be surfaced within Facebook today and in the future. Here's an example
-for a movie page:
-
-  <meta property="og:title" content="The Rock"/>
-  <meta property="og:type" content="movie"/>
-  <meta property="og:url" content="http://www.imdb.com/title/tt0117500/"/>
-  <meta property="og:image" content="http://ia.media-imdb.com/rock.jpg"/>
-
-Further reading:
-* Open Graph protocol http://developers.facebook.com/docs/opengraph/
-
-== MetaTags Usage
-
-First, add this code to your main layout:
-
-  <head>
-    <%= display_meta_tags :site => 'My website' %>
-  </head>
-
-Then, to set the page title, add this to each of your views (see below for other options):
-
-  <h1><%= title 'My page title' %></h1>
-
-When views are rendered, the page title will be included in the right spots:
-
-  <head>
-    <title>My website | My page title</title>
-  </head>
-  <body>
-    <h1>My page title</h1>
-  </body>
-
-You can find allowed options for +display_meta_tags+ method below.
-
-=== Using MetaTags in controller
-
-You can define following instance variables:
-
-  @page_title       = 'Member Login'
-  @page_description = 'Member login page.'
-  @page_keywords    = 'Site, Login, Members'
-  
-Also you could use +set_meta_tags+ method to define all meta tags simultaneously:
-  
-  set_meta_tags :title => 'Member Login',
-                :description => 'Member login page.',
-                :keywords => 'Site, Login, Members'
-
-You can find allowed options for +set_meta_tags+ method below.
-
-=== Using MetaTags in view
-
-To set meta tags you can use following methods:
-
-  <% title 'Member Login' %>
-  <% description 'Member login page.' %>
-  <% keywords 'Member login page.' %>
-
-Also there is +set_meta_tags+ method exists:
-
-  <% set_meta_tags :title => 'Member Login',
-                   :description => 'Member login page.',
-                   :keywords => 'Site, Login, Members' %>
-
-The +title+ method returns title itself, so you can use it to show the title
-somewhere on the page:
-
-  <h1><%= title 'Member Login' %></h1>
-
-If you want to set the title and display another text, use this:
-
-  <h1><%= title 'Member Login', 'Here you can login to the site:' %></h1>
-
-=== Allowed options for +display_meta_tags+ and +set_meta_tags+ methods
-
-Use these options to customize the title format:
-
-* <tt>:site</tt> -- site title;
-* <tt>:title</tt> -- page title;
-* <tt>:description</tt> -- page description;
-* <tt>:keywords</tt> -- page keywords;
-* <tt>:prefix</tt> -- text between site name and separator;
-* <tt>:separator</tt> -- text used to separate website name from page title;
-* <tt>:suffix</tt> -- text between separator and page title;
-* <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>:canonical</tt> -- add canonical link tag;
-* <tt>:open_graph</tt> -- add Open Graph tags (Hash).
-
-And here are a few examples to give you ideas.
-
-  <%= display_meta_tags :separator => "&mdash;".html_safe %>
-  <%= display_meta_tags :prefix => false, :separator => ":" %>
-  <%= display_meta_tags :lowercase => true %>
-  <%= display_meta_tags :reverse => true, :prefix => false %>
-  <%= display_meta_tags :open_graph => { :title => 'The Rock', :type => 'movie' } %>
-
-=== Allowed values
-
-You can specify <tt>:title</tt> as a string or array:
-
-  set_meta_tags :title => ['part1', 'part2'], :site => 'site'
-  # site | part1 | part2
-  set_meta_tags :title => ['part1', 'part2'], :reverse => true, :site => 'site'
-  # part2 | part1 | site
-
-Keywords can be passed as string of comma-separated values, or as an array:
-
-  set_meta_tags :keywords => ['tag1', 'tag2']
-  # tag1, tag2
-
-Description is a string (HTML will be stripped from output string).
-
-== Alternatives
-
-There are several plugins influenced me to create this one:
-
-* Headliner: http://github.com/mokolabs/headliner
-* meta_on_rals: http://github.com/ashchan/meta_on_rails
-
-== Credits
-
-* Dmytro Shteflyuk (author) <kpumuk@kpumuk.info> http://kpumuk.info
-* Morgan Roderick (contributor) <morgan@roderick.dk> http://roderick.dk
-* Sergio Cambra (contributor) <sergio@entrecables.com>
-* Kristoffer Renholm (contributor) <kristoffer@renholm.se>
-* Jesse Clark (contributor) <jesse@jesseclark.com> http://jesseclark.com/blog