meta-tags 1.3.0 → 1.4.0

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - ree
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
 
 notifications:
   recipients:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.4.0 (March 14, 2013)
+
+Features:
+
+  - Added support of custom meta tags
+
 ## 1.3.0 (February 13, 2013)
 
 Features:

data/README.md

@@ -175,6 +175,22 @@ Further reading:
 
 * [Twitter Cards Documentation](https://dev.twitter.com/docs/cards/)
 
+### Custom meta tags
+
+Starting from version 1.3.1, you can specify arbitrary meta tags, and they will
+be rendered on the page, even if meta-tags gem does not know about them.
+
+Example:
+
+    set_meta_tags :author => "Dmytro Shteflyuk"
+    # <meta name="author" content="Dmytro Shteflyuk"/>
+
+You can also specify value as an Array, and values will be displayed as a list
+of `meta` tags:
+
+    set_meta_tags :author => [ "Dmytro Shteflyuk", "John Doe" ]
+    # <meta name="author" content="Dmytro Shteflyuk"/>
+    # <meta name="author" content="John Doe"/>
 
 ## MetaTags Usage
 
@@ -332,3 +348,5 @@ There are several plugins influenced me to create this one:
 * [Jürg Lehni](https://github.com/lehni) (contributor)
 * [Tom Coleman](https://github.com/tmeasday) (contributor)
 * [Guille Lopez](https://github.com/guillelopez) (contributor)
+* [Holger Frohloff](https://github.com/jazzgumpy) (contributor)
+* [Jakub Wojtysiak](https://github.com/schiza) (contributor)

data/lib/meta_tags/version.rb

@@ -1,3 +1,3 @@
 module MetaTags
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/lib/meta_tags/view_helper.rb

@@ -161,11 +161,11 @@ module MetaTags
       result << content_tag(:title, title) unless title.blank?
 
       # description
-      description = normalize_description(meta_tags[:description])
+      description = normalize_description(meta_tags.delete(:description))
       result << tag(:meta, :name => :description, :content => description) unless description.blank?
 
       # keywords
-      keywords = normalize_keywords(meta_tags[:keywords])
+      keywords = normalize_keywords(meta_tags.delete(:keywords))
       result << tag(:meta, :name => :keywords, :content => keywords) unless keywords.blank?
 
       # noindex & nofollow
@@ -179,34 +179,31 @@ module MetaTags
         result << tag(:meta, :name => noindex_name,  :content => 'noindex')  if meta_tags[:noindex] && meta_tags[:noindex] != false
         result << tag(:meta, :name => nofollow_name, :content => 'nofollow') if meta_tags[:nofollow] && meta_tags[:nofollow] != false
       end
+      meta_tags.delete(:noindex)
+      meta_tags.delete(:nofollow)
 
       # hashes
-      meta_tags.each do |property, content|
-        if content.is_a?(Hash)
-          result.concat process_tree(property, content)
+      meta_tags.each do |property, data|
+        if data.is_a?(Hash)
+          result.concat process_tree(property, data)
+          meta_tags.delete(property)
         end
       end
 
       # canonical
       result << tag(:link, :rel => :canonical, :href => meta_tags[:canonical]) unless meta_tags[:canonical].blank?
+      meta_tags.delete(:canonical)
 
-      result = result.join("\n")
-      result.respond_to?(:html_safe) ? result.html_safe : result
-    end
-
-    # Recursive function to process all the hashes and arrays on meta tags
-    def process_tree(property, content)
-      result = []
-      if content.is_a?(Hash)
-        content.each do |key, value|
-          result.concat process_tree("#{property}:#{key}", value)
-        end
-      else
-        Array(content).each do |c|
-          result << tag(:meta, :property => "#{property}", :content => c) unless c.blank?
+      # user defined
+      meta_tags.each do |name, data|
+        Array(data).each do |val|
+          result << tag(:meta, :name => name, :content => val)
         end
+        meta_tags.delete(name)
       end
-      result
+
+      result = result.join("\n")
+      result.respond_to?(:html_safe) ? result.html_safe : result
     end
 
     # Returns full page title as a string without surrounding <title> tag.
@@ -239,6 +236,21 @@ module MetaTags
 
     private
 
+      # Recursive function to process all the hashes and arrays on meta tags
+      def process_tree(property, content)
+        result = []
+        if content.is_a?(Hash)
+          content.each do |key, value|
+            result.concat process_tree("#{property}:#{key}", value)
+          end
+        else
+          Array(content).each do |c|
+            result << tag(:meta, :property => "#{property}", :content => c) unless c.blank?
+          end
+        end
+        result
+      end
+
       def normalize_title(title)
         Array(title).map { |t| h(strip_tags(t)) }
       end
@@ -263,35 +275,40 @@ module MetaTags
       def build_full_title(meta_tags)
         # Prefix (leading space)
         prefix = meta_tags[:prefix] === false ? '' : (meta_tags[:prefix] || ' ')
+        meta_tags.delete(:prefix)
 
         # Separator
         separator = meta_tags[:separator] === false ? '' : (meta_tags[:separator] || '|')
 
         # Suffix (trailing space)
         suffix = meta_tags[:suffix] === false ? '' : (meta_tags[:suffix] || ' ')
+        meta_tags.delete(:suffix)
 
         # Special case: if separator is hidden, do not display suffix/prefix
         if meta_tags[:separator] == false
           prefix = suffix = ''
         end
+        meta_tags.delete(:separator)
 
         # Title
-        title = meta_tags[:title]
-        if meta_tags[:lowercase] === true and !title.blank?
+        title = meta_tags.delete(:title)
+        if meta_tags.delete(:lowercase) === true and !title.blank?
           title = Array(title).map { |t| t.downcase }
         end
 
         # title
         if title.blank?
-          meta_tags[:site]
+          meta_tags.delete(:reverse)
+          meta_tags.delete(:site)
         else
           title = normalize_title(title)
           title.unshift(h(meta_tags[:site])) unless meta_tags[:site].blank?
-          title.reverse! if meta_tags[:reverse] === true
+          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
         end
       end

data/spec/controller_helper_spec.rb

@@ -34,7 +34,7 @@ describe MetaTags::ControllerHelper do
     it 'should set meta tags from instance variables' do
       subject.index
       subject.rendered.should be_true
-      subject.meta_tags.should == { 'title' => 'title', 'keywords' => 'key1, key2, key3', 'description' => 'description' }
+      subject.meta_tags.should eq('title' => 'title', 'keywords' => 'key1, key2, key3', 'description' => 'description')
     end
   end
 

data/spec/meta_tags_spec.rb

@@ -43,102 +43,102 @@ describe MetaTags::ViewHelper do
 
   context 'returning values' do
     it 'should return title' do
-      subject.title('some-title').should == 'some-title'
+      subject.title('some-title').should eq('some-title')
     end
 
     it 'should return headline if specified' do
-      subject.title('some-title', 'some-headline').should == 'some-headline'
+      subject.title('some-title', 'some-headline').should eq('some-headline')
     end
 
     it 'should return title' do
-      subject.title('some-title').should == 'some-title'
-      subject.title.should == 'some-title'
+      subject.title('some-title').should eq('some-title')
+      subject.title.should eq('some-title')
     end
 
     it 'should return description' do
-      subject.description('some-description').should == 'some-description'
+      subject.description('some-description').should eq('some-description')
     end
 
     it 'should return keywords' do
-      subject.keywords('some-keywords').should == 'some-keywords'
+      subject.keywords('some-keywords').should eq('some-keywords')
     end
 
     it 'should return noindex' do
-      subject.noindex('some-noindex').should == 'some-noindex'
+      subject.noindex('some-noindex').should eq('some-noindex')
     end
 
     it 'should return nofollow' do
-      subject.noindex('some-nofollow').should == 'some-nofollow'
+      subject.noindex('some-nofollow').should eq('some-nofollow')
     end
   end
 
   context 'displaying title' do
     it 'should not display title if blank' do
-      subject.display_meta_tags.should == ''
+      subject.display_meta_tags.should eq('')
       subject.title('')
-      subject.display_meta_tags.should == ''
+      subject.display_meta_tags.should eq('')
     end
 
     it 'should use website name if title is empty' do
-      subject.display_meta_tags(:site => 'someSite').should == '<title>someSite</title>'
+      subject.display_meta_tags(:site => 'someSite').should eq('<title>someSite</title>')
     end
 
     it 'should display title when "title" used' do
       subject.title('someTitle')
-      subject.display_meta_tags(:site => 'someSite').should == '<title>someSite | someTitle</title>'
+      subject.display_meta_tags(:site => 'someSite').should eq('<title>someSite | someTitle</title>')
     end
 
     it 'should display title only when "site" is empty' do
       subject.title('someTitle')
-      subject.display_meta_tags.should == '<title>someTitle</title>'
+      subject.display_meta_tags.should eq('<title>someTitle</title>')
     end
 
     it 'should display title when "set_meta_tags" used' do
       subject.set_meta_tags(:title => 'someTitle')
-      subject.display_meta_tags(:site => 'someSite').should == '<title>someSite | someTitle</title>'
+      subject.display_meta_tags(:site => 'someSite').should eq('<title>someSite | someTitle</title>')
     end
 
     it 'should display custom title if given' do
       subject.title('someTitle')
-      subject.display_meta_tags(:site => 'someSite', :title => 'defaultTitle').should == '<title>someSite | someTitle</title>'
+      subject.display_meta_tags(:site => 'someSite', :title => 'defaultTitle').should eq('<title>someSite | someTitle</title>')
     end
 
     it 'should use website before page by default' do
-      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle').should == '<title>someSite | someTitle</title>'
+      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle').should eq('<title>someSite | someTitle</title>')
     end
 
     it 'should only use markup in titles in the view' do
-      subject.title('<b>someTitle</b>').should == '<b>someTitle</b>'
-      subject.display_meta_tags(:site => 'someSite').should == '<title>someSite | someTitle</title>'
+      subject.title('<b>someTitle</b>').should eq('<b>someTitle</b>')
+      subject.display_meta_tags(:site => 'someSite').should eq('<title>someSite | someTitle</title>')
     end
 
     it 'should use page before website if :reverse' do
-      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :reverse => true).should == '<title>someTitle | someSite</title>'
+      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :reverse => true).should eq('<title>someTitle | someSite</title>')
     end
 
     it 'should be lowercase if :lowercase' do
-      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :lowercase => true).should == '<title>someSite | sometitle</title>'
+      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :lowercase => true).should eq('<title>someSite | sometitle</title>')
     end
 
     it 'should use custom separator if :separator' do
       subject.title('someTitle')
-      subject.display_meta_tags(:site => 'someSite', :separator => '-').should == '<title>someSite - someTitle</title>'
-      subject.display_meta_tags(:site => 'someSite', :separator => ':').should == '<title>someSite : someTitle</title>'
-      subject.display_meta_tags(:site => 'someSite', :separator => '&mdash;').should == '<title>someSite &amp;mdash; someTitle</title>'
-      subject.display_meta_tags(:site => 'someSite', :separator => '&mdash;'.html_safe).should == '<title>someSite &mdash; someTitle</title>'
-      subject.display_meta_tags(:site => 'someSite: ', :separator => false).should == '<title>someSite: someTitle</title>'
+      subject.display_meta_tags(:site => 'someSite', :separator => '-').should eq('<title>someSite - someTitle</title>')
+      subject.display_meta_tags(:site => 'someSite', :separator => ':').should eq('<title>someSite : someTitle</title>')
+      subject.display_meta_tags(:site => 'someSite', :separator => '&mdash;').should eq('<title>someSite &amp;mdash; someTitle</title>')
+      subject.display_meta_tags(:site => 'someSite', :separator => '&mdash;'.html_safe).should eq('<title>someSite &mdash; someTitle</title>')
+      subject.display_meta_tags(:site => 'someSite: ', :separator => false).should eq('<title>someSite: someTitle</title>')
     end
 
     it 'should use custom prefix and suffix if available' do
-      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :prefix => ' -', :suffix => '- ').should == '<title>someSite -|- someTitle</title>'
+      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :prefix => ' -', :suffix => '- ').should eq('<title>someSite -|- someTitle</title>')
     end
 
     it 'should collapse prefix if false' do
-      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :prefix => false).should == '<title>someSite| someTitle</title>'
+      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :prefix => false).should eq('<title>someSite| someTitle</title>')
     end
 
     it 'should collapse suffix if false' do
-      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :suffix => false).should == '<title>someSite |someTitle</title>'
+      subject.display_meta_tags(:site => 'someSite', :title => 'someTitle', :suffix => false).should eq('<title>someSite |someTitle</title>')
     end
 
     it 'should use all custom options if available' do
@@ -148,15 +148,15 @@ describe MetaTags::ViewHelper do
                               :suffix => '+ ',
                               :separator => ':',
                               :lowercase => true,
-                              :reverse => true).should == '<title>sometitle -:+ someSite</title>'
+                              :reverse => true).should eq('<title>sometitle -:+ someSite</title>')
     end
 
     it 'shold allow Arrays in title' do
-      subject.display_meta_tags(:site => 'someSite', :title => ['someTitle', 'anotherTitle']).should == '<title>someSite | someTitle | anotherTitle</title>'
+      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
-      subject.display_meta_tags(:site => 'someSite', :title => ['someTitle', 'anotherTitle'], :lowercase => true).should == '<title>someSite | sometitle | anothertitle</title>'
+      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
@@ -165,14 +165,14 @@ describe MetaTags::ViewHelper do
                               :prefix => ' -',
                               :suffix => '+ ',
                               :separator => ':',
-                              :reverse => true).should == '<title>anotherTitle -:+ someTitle -:+ someSite</title>'
+                              :reverse => true).should eq('<title>anotherTitle -:+ someTitle -:+ someSite</title>')
     end
   end
 
   context 'displaying description' do
     it 'should not display description if blank' do
       subject.description('')
-      subject.display_meta_tags.should == ''
+      subject.display_meta_tags.should eq('')
     end
 
     it 'should display description when "description" used' do
@@ -210,10 +210,10 @@ describe MetaTags::ViewHelper do
   context 'displaying keywords' do
     it 'should not display keywords if blank' do
       subject.keywords('')
-      subject.display_meta_tags.should == ''
+      subject.display_meta_tags.should eq('')
 
       subject.keywords([])
-      subject.display_meta_tags.should == ''
+      subject.display_meta_tags.should eq('')
     end
 
     it 'should display keywords when "keywords" used' do
@@ -398,7 +398,7 @@ describe MetaTags::ViewHelper do
 
   context 'while handling string meta tag names' do
     it 'should work with common parameters' do
-      subject.display_meta_tags('site' => 'someSite', 'title' => 'someTitle').should == '<title>someSite | someTitle</title>'
+      subject.display_meta_tags('site' => 'someSite', 'title' => 'someTitle').should eq('<title>someSite | someTitle</title>')
     end
 
     it 'should work with open graph parameters' do
@@ -416,7 +416,21 @@ describe MetaTags::ViewHelper do
   context '.display_title' do
     it 'should display custom title if given' do
       subject.title('someTitle')
-      subject.display_title(:site => 'someSite', :title => 'defaultTitle').should == 'someSite | someTitle'
+      subject.display_title(:site => 'someSite', :title => 'defaultTitle').should eq('someSite | someTitle')
+    end
+  end
+
+  context 'display any named meta tag that you want to' do
+    it 'should display testing meta tag' do
+      subject.display_meta_tags(:testing => 'this is a test').should eq('<meta content="this is a test" name="testing" />')
+    end
+
+    it 'should support Array values' do
+      subject.display_meta_tags(:testing => ['test1', 'test2']).should eq("<meta content=\"test1\" name=\"testing\" />\n<meta content=\"test2\" name=\"testing\" />")
+    end
+
+    it 'should not render when value is nil' do
+      subject.display_meta_tags(:testing => nil).should eq('')
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: meta-tags
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Dmytro Shteflyuk
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-13 00:00:00 -05:00
+date: 2013-03-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  name: actionpack
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id002
+  name: rake
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
+  name: rspec
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: yard
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,12 +72,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id004
+  name: yard
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: bluecloth
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -86,8 +86,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id005
+  name: bluecloth
+  requirement: *id005
 description: Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 email: 
 - kpumuk@kpumuk.info