meta-tags 1.6.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTVhZmJkYjIxODQ5MTRjZjkxOGY0ODQwYmYwYmVjM2E0ZmYyNWI2NQ==
+    NmY1YmU5YTM0ZjQwYzBkODRkZmViODlmMTI1NjljYzdkMzcwMzljYg==
   data.tar.gz: !binary |-
-    MjQyMDNhYWNmOGNhMjBkN2RmZWZiODY5NGEzYTQ0NzdmMmFkNjhmMw==
+    OGQ1ZjE5YzFjMjcxNzM1OTliZDNhY2MxMDU0M2ExMTkxOTMzZTkxMQ==
 SHA512:
   metadata.gz: !binary |-
-    YzAzNDRlZGEwMDIxYWVjOTZhODY2NWZkYWJhMjMyMjNlNjZmYzkzMzc0NmQw
-    MjAzOTNlYjQ3MjE1ZjY0ZGU0NDA0MDlhZTQ2YTBiZjEzZDdjZjQ0M2Q5YTVk
-    OTI0NjMwM2MxMjU4Mjc0ZGRiNjI3MmUzMGRmYTdlODY2YmY0YWE=
+    MjA0OTRkMGJjMDc1ZGE1NDk5OTExZGRmMDVhZjNiZDFmMTgzYjYxYTYzOWYw
+    N2YxYjc4YjI4ZDc3ZjIyYjBmNWJiNjBhNzI2MmY3MmRlMDliMjU2ZTQ5Y2My
+    MmM2YTJmZjUzMzFjYWFlMDQxMzJlZmYxMWVkZTdlYjFjMjAwY2U=
   data.tar.gz: !binary |-
-    YzA3YzcyN2NjMTg3MWE3YzYzZWVlNTQ5ZDk0M2ZkM2FjNjU5NDc1MTJkNmYy
-    MzUwNzA0NjUzMTM4YWUzZDJkN2UxNzM3ZDA2MTVlZWMwZmVkY2QxODMxM2I0
-    NWZmNWM3ZTcwOGVmNDY4NDQ2YzVlNTc3MzA1ZjA3NTU4NGY0M2I=
+    M2FmMmJlZGZhNTU0YWIwMTUzYzZhNGY5OWQxNDA4MGYyOTZlOTUzMzM4NTg4
+    YzU4MGVhZTNiNzk0NzYwNDQ5NTUwYjM2NTA5MTA3YjQxMzI1MWVhZGUwY2Vl
+    NjY5MjVlNTZhYmY1MjNhNjA1MWQ0ZjVkMTU2NjFkZWE2OTI4NWI=

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.0.0 (April 15, 2014)
+
+Features:
+
+  - Fully refactored code base.
+
+Bugfixes:
+
+  - Symlink references in nested hashes include use normalized meta tag values.
+
 ## 1.6.0 (April 14, 2014)
 
 Features:

data/README.md

@@ -1,6 +1,8 @@
 # MetaTags: a gem to make your Rails application SEO-friendly
 
 [![Travis-CI build status](https://secure.travis-ci.org/kpumuk/meta-tags.png)](http://travis-ci.org/kpumuk/meta-tags)
+[![Gem Version](https://badge.fury.io/rb/meta-tags.svg)](http://badge.fury.io/rb/meta-tags)
+[![Code Climate](https://codeclimate.com/github/kpumuk/meta-tags.png)](https://codeclimate.com/github/kpumuk/meta-tags)
 
 Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
 
@@ -240,11 +242,26 @@ There are 3 card types (summary, photo and player). Here's an example for summar
       :card => "summary",
       :site => "@username"
     }
-    # <meta property="twitter:card" content="summary"/>
-    # <meta property="twitter:site" content="@username"/>
+    # <meta name="twitter:card" content="summary"/>
+    # <meta name="twitter:site" content="@username"/>
 
 Take in consideration that if you're already using OpenGraph to describe data on your page, it’s easy to generate a Twitter card without duplicating your tags and data. When the Twitter card processor looks for tags on your page, it first checks for the Twitter property, and if not present, falls back to the supported Open Graph property. This allows for both to be defined on the page independently, and minimizes the amount of duplicate markup required to describe your content and experience.
 
+When you need to generate a [Twitter Photo card](https://dev.twitter.com/docs/cards/types/photo-card), `twitter:image` property is a string, while image dimensions are specified using `twitter:image:width` and `twitter:image:height`, or a `Hash` objects in terms of MetaTags gems. There is a special syntax to make this work:
+
+    set_meta_tags :twitter => {
+      :card  => "photo",
+      :image => {
+        :_      => "http://example.com/1.png",
+        :width  => 100,
+        :height => 100,
+      }
+    }
+    # <meta name="twitter:card" content="photo"/>
+    # <meta name="twitter:image" content="http://example.com/1.png"/>
+    # <meta name="twitter:image:width" content="100"/>
+    # <meta name="twitter:image:height" content="100"/>
+
 Further reading:
 
 * [Twitter Cards Documentation](https://dev.twitter.com/docs/cards/)

data/Rakefile

@@ -7,6 +7,16 @@ RSpec::Core::RakeTask.new(:spec)
 task :test => :spec
 task :default => :spec
 
+desc 'Starts irb with MetaTags gem loaded'
+task :console do
+  require 'irb'
+
+  $:.unshift File.expand_path('../lib', __FILE__)
+  require 'meta_tags'
+  ARGV.clear
+  IRB.start
+end
+
 require 'yard'
 YARD::Rake::YardocTask.new(:yard) do |t|
   t.options = ['--title', 'MetaTags Documentation']

data/lib/meta_tags.rb

@@ -1,12 +1,19 @@
 require 'action_controller'
 require 'action_view'
 
+# MetaTags gem namespace.
 module MetaTags
 end
 
 require 'meta_tags/version'
-require 'meta_tags/view_helper'
+
 require 'meta_tags/controller_helper'
+require 'meta_tags/meta_tags_collection'
+require 'meta_tags/renderer'
+require 'meta_tags/tag'
+require 'meta_tags/content_tag'
+require 'meta_tags/text_normalizer'
+require 'meta_tags/view_helper'
 
 ActionView::Base.send :include, MetaTags::ViewHelper
 ActionController::Base.send :include, MetaTags::ControllerHelper

data/lib/meta_tags/content_tag.rb

@@ -0,0 +1,14 @@
+module MetaTags
+  # Represents an HTML meta tag with content (<tag></tag>).
+  # Content should be passed as a `:content` attribute.
+  class ContentTag < Tag
+    # Render tag into a Rails view.
+    #
+    # @param [ActionView::Base] view instance of a Rails view.
+    # @return [String] HTML string for the tag.
+    #
+    def render(view)
+      view.content_tag(name, attributes[:content], attributes.except(:content))
+    end
+  end
+end

data/lib/meta_tags/controller_helper.rb

@@ -6,43 +6,39 @@ module MetaTags
   #   @page_description = 'Member login page.'
   #   @page_keywords = 'Site, Login, Members'
   #
-  # Also you can use {InstanceMethods#set_meta_tags} method, that have the same parameters
+  # Also you can use {#set_meta_tags} method, that have the same parameters
   # as {ViewHelper#set_meta_tags}.
   #
   module ControllerHelper
-    def self.included(base)
-      base.send :include, InstanceMethods
-      base.alias_method_chain :render, :meta_tags
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method_chain :render, :meta_tags
     end
 
-    module InstanceMethods
-      # 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)
-        meta_tags = {}
-        meta_tags[:title]       = @page_title       if @page_title
-        meta_tags[:keywords]    = @page_keywords    if @page_keywords
-        meta_tags[:description] = @page_description if @page_description
-        set_meta_tags(meta_tags)
+    # 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)
+      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)
-      end
+      render_without_meta_tags(*args, &block)
+    end
+    protected :render_with_meta_tags
 
-      # Set meta tags for the page.
-      #
-      # See <tt>MetaTags.set_meta_tags</tt> for details.
-      def set_meta_tags(meta_tags)
-        meta_tags = (meta_tags || {}).with_indifferent_access
-        meta_tags[:og] = meta_tags.delete(:open_graph) if meta_tags.key?(:open_graph)
-        self.meta_tags.deep_merge!(meta_tags)
-      end
-      protected :set_meta_tags
+    # Set meta tags for the page.
+    #
+    # See <tt>MetaTags::ViewHelper#set_meta_tags</tt> for details.
+    def set_meta_tags(meta_tags)
+      self.meta_tags.update(meta_tags)
+    end
+    protected :set_meta_tags
 
-      # Get meta tags for the page.
-      def meta_tags
-        @meta_tags ||= HashWithIndifferentAccess.new
-      end
-      protected :meta_tags
+    # Get meta tags for the page.
+    def meta_tags
+      @meta_tags ||= MetaTagsCollection.new
     end
+    protected :meta_tags
   end
 end

data/lib/meta_tags/meta_tags_collection.rb

@@ -0,0 +1,181 @@
+module MetaTags
+  # Class represents a collection of meta tags. Basically a wrapper around
+  # HashWithIndifferentAccess, with some additional helper methods.
+  class MetaTagsCollection
+    attr_reader :meta_tags
+
+    # Initializes a new instance of MetaTagsCollection.
+    #
+    def initialize
+      @meta_tags = HashWithIndifferentAccess.new
+    end
+
+    # Returns meta tag value by name.
+    #
+    # @param [String, Symbol] name meta tag name.
+    # @return meta tag value.
+    #
+    def [](name)
+      @meta_tags[name]
+    end
+
+    # Sets meta tag value by name.
+    #
+    # @param [String, Symbol] name meta tag name.
+    # @param value meta tag value.
+    # @return meta tag value.
+    #
+    def []=(name, value)
+      @meta_tags[name] = value
+    end
+
+    # Recursively merges a Hash of meta tag attributes into current list.
+    #
+    # @param [Hash] meta_tags meta tags Hash to merge into current list.
+    # @return [Hash] result of the merge.
+    #
+    def update(meta_tags = {})
+      @meta_tags.deep_merge! normalize_open_graph(meta_tags)
+    end
+
+    # Temporary merges defaults with current meta tags list and yields the block.
+    #
+    # @param [Hash] defaults list of default meta tag attributes.
+    # @return result of the block call.
+    #
+    def with_defaults(defaults = {})
+      old_meta_tags = @meta_tags
+      @meta_tags = normalize_open_graph(defaults).deep_merge!(self.meta_tags)
+      yield
+    ensure
+      @meta_tags = old_meta_tags
+    end
+
+    # Constructs the full title as if it would be rendered in title meta tag.
+    #
+    # @param [Hash] defaults list of default meta tag attributes.
+    # @return [String] page title.
+    #
+    def full_title(defaults = {})
+      with_defaults(defaults) { extract_full_title  }
+    end
+
+    # Deletes and returns a meta tag value by name.
+    #
+    # @param [String, Symbol] name meta tag name.
+    # @return [Object] meta tag value.
+    #
+    def extract(name)
+      @meta_tags.delete(name)
+    end
+
+    # Deletes specified meta tags.
+    #
+    # @param [Array<String, Symbol>] names a list of meta tags to delete.
+    #
+    def delete(*names)
+      names.each { |name| @meta_tags.delete(name) }
+    end
+
+    # Extracts full page title and deletes all related meta tags.
+    #
+    # @return [String] page title.
+    #
+    def extract_full_title
+      title = extract_title || []
+      separator = extract_separator
+
+      site_title = extract(:site).presence
+      title.unshift(site_title) if site_title
+      title = TextNormalizer.normalize_title(title)
+
+      title.reverse! if extract(:reverse) === true
+      title = TextNormalizer.safe_join(title, separator)
+
+      title
+    end
+
+    # Extracts page title as an array of segments without site title and separators.
+    #
+    # @return [Array<String>] segments of page title.
+    #
+    def extract_title
+      title = extract(:title).presence
+      return unless title
+
+      title = Array(title)
+      title.each(&:downcase!) if extract(:lowercase) === true
+      title
+    end
+
+    # Extracts title separator as a string.
+    #
+    # @return [String] page title separator.
+    #
+    def extract_separator
+      if meta_tags[:separator] === false
+        # Special case: if separator is hidden, do not display suffix/prefix
+        prefix = separator = suffix = ''
+      else
+        prefix    = extract_separator_section(:prefix, ' ')
+        separator = extract_separator_section(:separator, '|')
+        suffix    = extract_separator_section(:suffix, ' ')
+      end
+      delete(:separator, :prefix, :suffix)
+
+      TextNormalizer.safe_join([prefix, separator, suffix], '')
+    end
+
+    # Extracts noindex settings as a Hash mapping noindex tag name to value.
+    #
+    # @return [Hash<String,String>] noindex attributes.
+    #
+    def extract_noindex
+      noindex_name,  noindex_value  = extract_noindex_attribute(:noindex)
+      nofollow_name, nofollow_value = extract_noindex_attribute(:nofollow)
+
+      if noindex_name == nofollow_name
+        { noindex_name => [noindex_value, nofollow_value].compact.join(', ') }
+      else
+        { noindex_name => noindex_value, nofollow_name => nofollow_value }
+      end
+    end
+
+    protected
+
+    # Converts input hash to HashWithIndifferentAccess and renames :open_graph to :og.
+    #
+    # @param [Hash] meta_tags list of meta tags.
+    # @return [HashWithIndifferentAccess] normalized meta tags list.
+    #
+    def normalize_open_graph(meta_tags)
+      meta_tags = meta_tags.is_a?(HashWithIndifferentAccess) ? meta_tags.dup : meta_tags.with_indifferent_access
+      meta_tags[:og] = meta_tags.delete(:open_graph) if meta_tags.key?(:open_graph)
+      meta_tags
+    end
+
+    # Extracts separator segment without deleting it from meta tags list.
+    # If the value is false, empty string will be returned.
+    #
+    # @param [Symbol, String] name separator segment name.
+    # @param [String] default default value.
+    # @return [String] separator segment value.
+    #
+    def extract_separator_section(name, default)
+      meta_tags[name] === false ? '' : (meta_tags[name] || default)
+    end
+
+    # Extracts noindex attribute name and value without deleting it from meta tags list.
+    #
+    # @param [String, Symbol] name noindex attribute name.
+    # @return [Array<String>] pair of noindex attribute name and value.
+    #
+    def extract_noindex_attribute(name)
+      noindex       = extract(name)
+      noindex_name  = String === noindex ? noindex : 'robots'
+      noindex_value = noindex ? name.to_s : nil
+
+      [ noindex_name, noindex_value ]
+    end
+  end
+end

data/lib/meta_tags/renderer.rb

@@ -0,0 +1,176 @@
+module MetaTags
+  # This class is used by MetaTags gems to render HTML meta tags into page.
+  class Renderer
+    attr_reader :meta_tags, :normalized_meta_tags
+
+    # Initialized a new instance of Renderer.
+    #
+    # @param [MetaTagsCollection] meta_tags meta tags object to render.
+    #
+    def initialize(meta_tags)
+      @meta_tags = meta_tags
+      @normalized_meta_tags = {}
+    end
+
+    # Renders meta tags on the page.
+    #
+    # @param [ActionView::Base] view Rails view object.
+    def render(view)
+      tags = []
+
+      render_title(tags)
+      render_description(tags)
+      render_keywords(tags)
+      render_refresh(tags)
+      render_noindex(tags)
+      render_alternate(tags)
+      render_links(tags)
+
+      render_hash(tags, :twitter, :name_key => :name)
+      render_hashes(tags)
+      render_custom(tags)
+
+      tags.compact.map { |tag| tag.render(view) }.join("\n").html_safe
+    end
+
+    protected
+
+    # Renders title tag.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_title(tags)
+      title = meta_tags.extract_full_title
+      normalized_meta_tags[:title] = title
+      tags << ContentTag.new(:title, :content => title) if title.present?
+    end
+
+    # Renders description meta tag.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_description(tags)
+      description = TextNormalizer.normalize_description(meta_tags.extract(:description))
+      normalized_meta_tags[:description] = description
+      tags << Tag.new(:meta, :name => :description, :content => description) if description.present?
+    end
+
+    # Renders keywords meta tag.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_keywords(tags)
+      keywords = TextNormalizer.normalize_keywords(meta_tags.extract(:keywords))
+      normalized_meta_tags[:keywords] = keywords
+      tags << Tag.new(:meta, :name => :keywords, :content => keywords) if keywords.present?
+    end
+
+    # Renders noindex and nofollow meta tags.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_noindex(tags)
+      meta_tags.extract_noindex.each do |name, content|
+        tags << Tag.new(:meta, :name => name, :content => content) if content.present?
+      end
+    end
+
+    # Renders refresh meta tag.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_refresh(tags)
+      if refresh = meta_tags.extract(:refresh)
+        tags << Tag.new(:meta, 'http-equiv' => 'refresh', :content => refresh.to_s) if refresh.present?
+      end
+    end
+
+    # Renders alternate link tags.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_alternate(tags)
+      if alternate = meta_tags.extract(:alternate)
+        alternate.each do |hreflang, href|
+          tags << Tag.new(:link, :rel => 'alternate', :href => href, :hreflang => hreflang) if href.present?
+        end
+      end
+    end
+
+    # Renders links.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_links(tags)
+      [ :canonical, :prev, :next, :author, :publisher ].each do |tag_name|
+        href = meta_tags.extract(tag_name)
+        if href.present?
+          @normalized_meta_tags[tag_name] = href
+          tags << Tag.new(:link, :rel => tag_name, :href => href)
+        end
+      end
+    end
+
+    # Renders complex hash objects.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_hashes(tags, options = {})
+      meta_tags.meta_tags.each do |property, data|
+        if data.is_a?(Hash)
+          process_tree(tags, property, data)
+          meta_tags.extract(property)
+        end
+      end
+    end
+
+    # Renders a complex hash object by key.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_hash(tags, key, options = {})
+      data = meta_tags.meta_tags[key]
+      if data.is_a?(Hash)
+        process_tree(tags, key, data, options)
+        meta_tags.extract(key)
+      end
+    end
+
+    # Renders custom meta tags.
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    #
+    def render_custom(tags)
+      meta_tags.meta_tags.each do |name, data|
+        Array(data).each do |val|
+          tags << Tag.new(:meta, :name => name, :content => val)
+        end
+        meta_tags.extract(name)
+      end
+    end
+
+    # Recursive method to process all the hashes and arrays on meta tags
+    #
+    # @param [Array<Tag>] tags a buffer object to store tag in.
+    # @param [Hash, String] property a Hash or a String to render as meta tag.
+    # @param [String, Symbol] content text content or a symbol reference to
+    # top-level meta tag.
+    #
+    def process_tree(tags, property, content, options = {})
+      content = [content] if content.is_a?(Hash)
+      Array(content).each do |c|
+        if c.is_a?(Hash)
+          c.each do |key, value|
+            key = key.to_s == '_' ? property : "#{property}:#{key}"
+            value = normalized_meta_tags[value] if value.is_a?(Symbol)
+            process_tree(tags, key, value, options)
+          end
+        else
+          name_key = options.fetch(:name_key, :property)
+          value_key = options.fetch(:value_key, :content)
+          tags << Tag.new(:meta, name_key => property.to_s, value_key => c) unless c.blank?
+        end
+      end
+    end
+  end
+end

data/lib/meta_tags/tag.rb

@@ -0,0 +1,25 @@
+module MetaTags
+  # Represents an HTML meta tag with no content (<tag />).
+  class Tag
+    attr_reader :name, :attributes
+
+    # Initializes a new instance of Tag class.
+    #
+    # @param [String, Symbol] name HTML tag name
+    # @param [Hash] attributes list of HTML tag attributes
+    #
+    def initialize(name, attributes = {})
+      @name = name
+      @attributes = attributes
+    end
+
+    # Render tag into a Rails view.
+    #
+    # @param [ActionView::Base] view instance of a Rails view.
+    # @return [String] HTML string for the tag.
+    #
+    def render(view)
+      view.tag(name, attributes)
+    end
+  end
+end

data/lib/meta_tags/text_normalizer.rb

@@ -0,0 +1,83 @@
+module MetaTags
+  # Module contains helpers that normalize text meta tag values.
+  module TextNormalizer
+    # Normalize title value.
+    #
+    # @param [String, Array<String>] title title string.
+    # @return [Array<String>] array of title parts with tags removed.
+    #
+    def self.normalize_title(title)
+      Array(title).flatten.map(&method(:strip_tags))
+    end
+
+    # Normalize description value.
+    #
+    # @param [String] description description string.
+    # @return [String] text with tags removed, squashed spaces, truncated
+    # to 200 characters.
+    #
+    def self.normalize_description(description)
+      return '' if description.blank?
+      helpers.truncate(cleanup_string(description), :length => 200)
+    end
+
+    # Normalize keywords value.
+    #
+    # @param [String, Array<String>] keywords list of keywords as a string or Array.
+    # @return [String] list of keywords joined with comma, with tags removed.
+    #
+    def self.normalize_keywords(keywords)
+      return '' if keywords.blank?
+      cleanup_strings(keywords).join(', ').downcase
+    end
+
+    # Easy way to get access to Rails helpers.
+    #
+    # @return [ActionView::Base] proxy object to access Rails helpers.
+    #
+    def self.helpers
+      ActionController::Base.helpers
+    end
+
+    # Strips all HTML tags from the +html+, including comments.
+    #
+    # @param [String] string HTML string.
+    # @return [String] string with no HTML tags.
+    #
+    def self.strip_tags(string)
+      helpers.strip_tags(string)
+    end
+
+    # This method returns a html safe string similar to what <tt>Array#join</tt>
+    # would return. All items in the array, including the supplied separator, are
+    # html escaped unless they are html safe, and the returned string is marked
+    # as html safe.
+    #
+    # @param [Array<String>] array list of strings to join.
+    # @param [String] sep separator to join strings with.
+    # @return [String] input strings joined together using a given separator.
+    #
+    def self.safe_join(array, sep = $,)
+      helpers.safe_join(array, sep)
+    end
+
+    # Removes HTML tags and squashes down all the spaces.
+    #
+    # @param [String] string input string.
+    # @return [String] input string with no HTML tags and consequent white
+    # space characters squashed into a single space.
+    #
+    def self.cleanup_string(string)
+      strip_tags(string).gsub(/\s+/, ' ').strip
+    end
+
+    # Cleans multiple strings up.
+    #
+    # @param [Array<String>] strings input strings.
+    # @return [Array<String>] clean strings.
+    # @see cleanup_string
+    def self.cleanup_strings(strings)
+      Array(strings).flatten.map(&method(:cleanup_string))
+    end
+  end
+end

data/lib/meta_tags/version.rb

@@ -1,3 +1,4 @@
 module MetaTags
-  VERSION = '1.6.0'
+  # Gem version.
+  VERSION = '2.0.0'
 end

data/lib/meta_tags/view_helper.rb

@@ -4,7 +4,7 @@ module MetaTags
   module ViewHelper
     # Get meta tags for the page.
     def meta_tags
-      @meta_tags ||= HashWithIndifferentAccess.new
+      @meta_tags ||= MetaTagsCollection.new
     end
 
     # Set meta tags for the page.
@@ -26,7 +26,7 @@ module MetaTags
     # @see #display_meta_tags
     #
     def set_meta_tags(meta_tags = {})
-      self.meta_tags.deep_merge! normalize_open_graph(meta_tags)
+      self.meta_tags.update(meta_tags)
     end
 
     # Set the page title and return it back.
@@ -35,9 +35,8 @@ module MetaTags
     # and returns it (or +headline+ if specified).
     #
     # @param [nil, String, Array] title page title. When passed as an
-    #   +Array+, parts will be joined divided with configured
-    #   separator value (see {#display_meta_tags}). When nil, current
-    #   title will be returned.
+    #   +Array+, parts will be joined using configured separator value
+    #   (see {#display_meta_tags}). When nil, current title will be returned.
     # @param [String] headline the value to return from method. Useful
     #   for using this method in views to set both page title
     #   and the content of heading tag.
@@ -78,7 +77,7 @@ module MetaTags
 
     # Set the page description.
     #
-    # @param [String] page description to be set in HEAD section of
+    # @param [String] description page description to be set in HEAD section of
     #   the HTML document. Please note, any HTML tags will be stripped
     #   from output string, and string will be truncated to 200
     #   characters.
@@ -145,7 +144,7 @@ module MetaTags
     # Set default meta tag values and display meta tags. This method
     # should be used in layout file.
     #
-    # @param [Hash] default default meta tag values.
+    # @param [Hash] defaults default meta tag values.
     # @option default [String] :site (nil) site title;
     # @option default [String] :title ("") page title;
     # @option default [String] :description (nil) page description;
@@ -153,7 +152,7 @@ module MetaTags
     # @option default [String, Boolean] :prefix (" ") text between site name and separator; when +false+, no prefix will be rendered;
     # @option default [String] :separator ("|") text used to separate website name from page title;
     # @option default [String, Boolean] :suffix (" ") text between separator and page title; when +false+, no suffix will be rendered;
-    # @option default [Boolean] :lowercase (false) when true, the page name will be lowercase;
+    # @option default [Boolean] :lowercase (false) when true, the page title will be lowercase;
     # @option default [Boolean] :reverse (false) when true, the page and site names will be reversed;
     # @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;
@@ -161,6 +160,8 @@ module MetaTags
     # @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] :author (nil) add author link tag;
+    # @option default [String] :publisher (nil) add publisher link tag.
     # @option default [String, Integer] :refresh (nil) meta refresh tag;
     # @option default [Hash] :open_graph ({}) add Open Graph meta tags.
     # @return [String] HTML meta tags to render in HEAD section of the
@@ -171,73 +172,8 @@ module MetaTags
     #     <%= display_meta_tags :site => 'My website' %>
     #   </head>
     #
-    def display_meta_tags(default = {})
-      meta_tags = normalize_open_graph(default).deep_merge!(self.meta_tags)
-
-      result = []
-
-      # title
-      title = build_full_title(meta_tags)
-      result << content_tag(:title, title) unless title.blank?
-
-      # description
-      description = normalize_description(meta_tags.delete(:description))
-      result << tag(:meta, :name => :description, :content => description) unless description.blank?
-
-      # keywords
-      keywords = normalize_keywords(meta_tags.delete(:keywords))
-      result << tag(:meta, :name => :keywords, :content => keywords) unless keywords.blank?
-
-      # noindex & nofollow
-      noindex_name  = String === meta_tags[:noindex]  ? meta_tags[:noindex]  : 'robots'
-      nofollow_name = String === meta_tags[:nofollow] ? meta_tags[:nofollow] : 'robots'
-
-      if noindex_name == nofollow_name
-        content = [meta_tags[:noindex] && 'noindex', meta_tags[:nofollow] && 'nofollow'].compact.join(', ')
-        result << tag(:meta, :name => noindex_name, :content => content) unless content.blank?
-      else
-        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)
-
-      # refresh
-      if refresh = meta_tags.delete(:refresh)
-        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
-      meta_tags.each do |property, data|
-        if data.is_a?(Hash)
-          result.concat process_tree(property, data)
-          meta_tags.delete(property)
-        end
-      end
-
-      # 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
-
-      # 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.join("\n")
-      result.html_safe
+    def display_meta_tags(defaults = {})
+      self.meta_tags.with_defaults(defaults) { Renderer.new(meta_tags).render(self) }
     end
 
     # Returns full page title as a string without surrounding <title> tag.
@@ -247,7 +183,7 @@ module MetaTags
     # 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.
     #
-    # @param [Hash] meta_tags list of meta tags.
+    # @param [Hash] defaults list of meta tags.
     # @option default [String] :site (nil) site title;
     # @option default [String] :title ("") page title;
     # @option default [String, Boolean] :prefix (" ") text between site name and separator; when +false+, no prefix will be rendered;
@@ -259,95 +195,10 @@ module MetaTags
     # @example
     #   <div data-page-container="true" title="<%= display_title :title => 'My Page', :site => 'PJAX Site' %>">
     #
-    def display_title(default = {})
-      meta_tags = normalize_open_graph(default).deep_merge!(self.meta_tags)
-      build_full_title(meta_tags)
+    def display_title(defaults = {})
+      @meta_tags.full_title(defaults)
     end
 
-    if respond_to? :safe_helper
-      safe_helper :display_meta_tags
-    end
-
-    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.is_a?(Symbol) ? meta_tags[value] : value)
-          end
-        else
-          Array(content).each do |c|
-            if c.is_a?(Hash)
-              result.concat process_tree(property, c)
-            else
-              result << tag(:meta, :property => "#{property}", :content => c) unless c.blank?
-            end
-          end
-        end
-        result
-      end
-
-      def normalize_title(title)
-        Array(title).map { |t| h(strip_tags(t)) }
-      end
-
-      def normalize_description(description)
-        return '' if description.blank?
-        truncate(strip_tags(description).gsub(/\s+/, ' '), :length => 200)
-      end
-
-      def normalize_keywords(keywords)
-        return '' if keywords.blank?
-        keywords = keywords.flatten.join(', ') if Array === keywords
-        strip_tags(keywords).downcase
-      end
-
-      def normalize_open_graph(meta_tags)
-        meta_tags = (meta_tags || {}).with_indifferent_access
-        meta_tags[:og] = meta_tags.delete(:open_graph) if meta_tags.key?(:open_graph)
-        meta_tags
-      end
-
-      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.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.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.delete(:reverse) === true
-          sep = h(prefix) + h(separator) + h(suffix)
-          title = title.join(sep)
-          meta_tags.delete(:site)
-          # We escaped every chunk of the title, so the whole title should be HTML safe
-          title.html_safe
-        end
-      end
+    # safe_helper :display_meta_tags if defined?(:safe_helper)
   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 eq('title' => 'title', 'keywords' => 'key1, key2, key3', 'description' => 'description')
+      subject.meta_tags.meta_tags.should eq('title' => 'title', 'keywords' => 'key1, key2, key3', 'description' => 'description')
     end
   end
 

data/spec/meta_tags_spec.rb

@@ -500,6 +500,34 @@ describe MetaTags::ViewHelper do
     end
   end
 
+  context 'displaying Twitter meta tags' do
+    it 'should display meta tags specified with :twitter' do
+      subject.set_meta_tags(:twitter => {
+        :title => 'Twitter Share Title',
+        :card  => 'photo',
+        :image => {
+          :_      => 'http://example.com/1.png',
+          :width  => 123,
+          :height => 321,
+        }
+      })
+      subject.display_meta_tags(:site => 'someSite').tap do |content|
+        content.should include('<meta content="Twitter Share Title" name="twitter:title" />')
+        content.should include('<meta content="photo" name="twitter:card" />')
+        content.should include('<meta content="http://example.com/1.png" name="twitter:image" />')
+        content.should include('<meta content="123" name="twitter:image:width" />')
+        content.should include('<meta content="321" name="twitter:image:height" />')
+      end
+    end
+
+    it "should display mirrored content" do
+      subject.set_meta_tags(:title => 'someTitle')
+      subject.display_meta_tags(:twitter => { :title => :title }).tap do |content|
+        content.should include('<meta content="someTitle" name="twitter:title" />')
+      end
+    end
+  end
+
   context 'while handling string meta tag names' do
     it 'should work with common parameters' do
       subject.display_meta_tags('site' => 'someSite', 'title' => 'someTitle').should eq('<title>someSite | someTitle</title>')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meta-tags
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Dmytro Shteflyuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -100,7 +100,12 @@ files:
 - Rakefile
 - lib/meta-tags.rb
 - lib/meta_tags.rb
+- lib/meta_tags/content_tag.rb
 - lib/meta_tags/controller_helper.rb
+- lib/meta_tags/meta_tags_collection.rb
+- lib/meta_tags/renderer.rb
+- lib/meta_tags/tag.rb
+- lib/meta_tags/text_normalizer.rb
 - lib/meta_tags/version.rb
 - lib/meta_tags/view_helper.rb
 - meta-tags.gemspec