tophat 2.0.0 → 2.1.0

data/README.md

@@ -1,7 +1,9 @@
-# TopHat [![Build Status](https://secure.travis-ci.org/spagalloco/tophat.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/spagalloco/tophat.png?travis)][gemnasium]
+# TopHat [![Build Status](https://secure.travis-ci.org/spagalloco/tophat.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/spagalloco/tophat.png?travis)][gemnasium] [![Code Climate](https://codeclimate.com/badge.png)][codeclimate]
+
 
 [travis]: http://travis-ci.org/spagalloco/tophat
 [gemnasium]: https://gemnasium.com/spagalloco/tophat
+[codeclimate]: https://codeclimate.com/github/spagalloco/tophat
 
 TopHat is a set of view helpers to keep your layouts and views DRY.  Easily include meta tags like keywords and descriptions, Open Graph and Twitter Cards in your Rails views.
 
@@ -13,6 +15,10 @@ Just add it to your Gemfile:
 
 Note: TopHat is Rails 3.0+ compatible.
 
+## Changes in 2.1
+
+TopHat version < 2.1 aliased the `title` as `t` and conflicted with an existing Rails helper used for i18n translation.  Version 2.1 removes this alias.  If you were using `t` as part of TopHat previously, you will need to change your code to use TopHat's `title` helper instead.
+
 ## Layout Usage
 
 You'll want to add the relevant TopHat helpers to your layouts:
@@ -179,7 +185,7 @@ Which will render a twitter card like so:
     <meta name="twitter:player" value="https://example.com/embed/a">
     <meta name="twitter:player:width" value="435">
     <meta name="twitter:player:height" value="251">
-    
+
 To render the twitter card in your layout, simply call the twitter_card helper with no arguments:
 
     <%= twitter_card %>

data/lib/tophat/html.rb

@@ -2,35 +2,71 @@ module TopHat
   module HtmlHelper
 
     def html_tag(options={})
-      if options[:xmlns] && options[:xmlns].kind_of?(Array)
-        options.delete(:xmlns).each do |xmlns|
-          if xmlns.kind_of?(Hash)
-            options["xmlns:#{xmlns[:prefix]}"] = xmlns[:url]
-          else
-            options['xmlns'] = xmlns
-          end
-        end
+      opts = options.dup
+      opts.merge!(xmlns_options(opts.delete(:xmlns))) if opts[:xmlns]
+      opts.merge!(prefix_options(opts.delete(:prefix))) if opts[:prefix]
+
+      tag(:html, opts, true)
+    end
+
+    private
+
+    def xmlns_options(xmlns)
+      options = {}
+
+      if xmlns.kind_of?(String)
+        options['xmlns'] = xmlns
+      elsif xmlns.kind_of?(Array)
+        options.merge!(xmlns_from_array(xmlns))
+      elsif xmlns.kind_of?(Hash)
+        options.merge!(xmlns_from_hash(xmlns))
       end
 
-      if options[:prefix]
-        if options[:prefix].kind_of?(Hash)
-          prefix_options = options.delete(:prefix)
-          options['prefix'] = "#{prefix_options[:prefix]}: #{prefix_options[:url]}"
-        elsif options[:prefix].kind_of?(Array)
-          prefixes = []
-          options.delete(:prefix).each do |prefix|
-            if prefix.kind_of?(Hash)
-              prefixes << "#{prefix[:prefix]}: #{prefix[:url]}"
-            else
-              prefixes << prefix
-            end
-          end
-
-          options['prefix'] = prefixes.join(' ')
+      options
+    end
+
+    def xmlns_from_array(xmlns)
+      options = {}
+
+      xmlns.each do |x|
+        if x.kind_of?(Hash)
+          options.merge!(xmlns_from_hash(x))
+        else
+          options['xmlns'] = x
         end
       end
 
-      tag(:html, options, true)
+      options
+    end
+
+    def xmlns_from_hash(h)
+      { "xmlns:#{h[:prefix]}" => h[:url] }
+    end
+
+    def prefix_options(prefix)
+      options = {}
+
+      options['prefix'] = case prefix
+      when String then prefix
+      when Hash then prefix_from_hash(prefix)
+      when Array then prefix_from_array(prefix)
+      end
+
+      options
+    end
+
+    def prefix_from_array(prefixes)
+      prefixes.map do |prefix|
+        if prefix.kind_of?(Hash)
+          prefix_from_hash(prefix)
+        else
+          prefix
+        end
+      end.join(' ')
+    end
+
+    def prefix_from_hash(h)
+      "#{h[:prefix]}: #{h[:url]}"
     end
 
   end

data/lib/tophat/opengraph.rb

@@ -18,14 +18,14 @@ module TopHat
       end
 
       def app_id
-        tag(:meta, :property => 'fb:app_id', :content => @app_id) + "\n".html_safe if @app_id
+        tag(:meta, :property => 'fb:app_id', :content => @app_id) + "\n".html_safe
       end
 
       def admins
-        tag(:meta, :property => 'fb:admins', :content => [*@admins].join(',')) + "\n".html_safe if @admins
+        tag(:meta, :property => 'fb:admins', :content => [*@admins].join(',')) + "\n".html_safe
       end
 
-      def render_graph_data
+      def graph_data
         output = ActiveSupport::SafeBuffer.new
         @graph_data.each do |key, value|
           output << tag(:meta, :property => "og:#{key}", :content => value)
@@ -48,6 +48,14 @@ module TopHat
         @graph_data[method] = args.shift
       end
 
+      def to_html
+        output = ActiveSupport::SafeBuffer.new
+        output << app_id if defined?(@app_id) && @app_id
+        output << admins if defined?(@admins) && @admins
+        output << graph_data if has_graph_data?
+        output
+      end
+
     end
 
     HTML4_XMLNS = [
@@ -77,19 +85,14 @@ module TopHat
     end
 
     def opengraph(options=nil, &block)
-      if options.kind_of? Hash
-        TopHat.current['open_graph_defaults'] = options
-      end
+      TopHat.current['open_graph_defaults'] = options if options.kind_of? Hash
+
       if block_given?
         TopHat.current['open_graph_generator'] = OpenGraphGenerator.new(TopHat.current['open_graph_defaults'], &block)
       else
         TopHat.current['open_graph_generator'] ||= OpenGraphGenerator.new
         TopHat.current['open_graph_generator'].merge(TopHat.current['open_graph_defaults'])
-        output = ActiveSupport::SafeBuffer.new
-        output << TopHat.current['open_graph_generator'].app_id
-        output << TopHat.current['open_graph_generator'].admins
-        output << TopHat.current['open_graph_generator'].render_graph_data if TopHat.current['open_graph_generator'].has_graph_data?
-        output
+        TopHat.current['open_graph_generator'].to_html
       end
     end
 

data/lib/tophat/title.rb

@@ -1,6 +1,10 @@
 module TopHat
   module TitleHelper
 
+    DEFAULT_PREFIX = ' '.freeze unless defined?(DEFAULT_PREFIX)
+    DEFAULT_SUFFIX = ' '.freeze unless defined?(DEFAULT_SUFFIX)
+    DEFAULT_SEPARATOR = ''.freeze unless defined?(DEFAULT_SEPARATOR)
+
     def title(title=nil, options={})
       if title.is_a?(String) || title.is_a?(Array)
         save_tophat_title(title, options)
@@ -8,8 +12,7 @@ module TopHat
         display_tophat_title(title || options)
       end
     end
-    alias t title
-    
+
     private
 
     def save_tophat_title(title, options)
@@ -27,8 +30,6 @@ module TopHat
 
       title_segments.flatten! # flatten out in case the title is an array
       title_segments.compact! # clean out any nils
-      title_segments.map! { |t| t.downcase! } if options[:lowercase]
-      title_segments.map! { |t| t.upcase! } if options[:uppercase]
       title_segments.map! { |t| strip_tags(t) }
 
       reverse = options[:reverse]
@@ -36,32 +37,34 @@ module TopHat
 
       title_segments.reverse! if reverse
 
-      content_tag :title, title_segments.join(delimiter_from(options)).strip
+      title_text = title_segments.join(delimiter_from(options))
+      title_text.downcase! if options[:lowercase]
+      title_text.upcase! if options[:uppercase]
+
+      content_tag :title, title_text.strip
     end
 
     def delimiter_from(options={})
       return "" if options.empty?
 
       # Prefix (leading space)
-      if options[:prefix]
-        prefix = options[:prefix]
+      prefix = if options[:prefix]
+        options[:prefix]
       elsif options[:prefix] == false
-        prefix = ''
-      else
-        prefix = ' '
+        ''
       end
+      prefix ||= DEFAULT_PREFIX
 
       # Separator
-      separator = options[:separator] || ''
+      separator = options[:separator] || DEFAULT_SEPARATOR
 
       # Suffix (trailing space)
-      if options[:suffix]
-        suffix = options[:suffix]
+      suffix = if options[:suffix]
+        options[:suffix]
       elsif options[:suffix] == false
-        suffix = ''
-      else
-        suffix = ' '
+        ''
       end
+      suffix ||= DEFAULT_SUFFIX
 
       prefix + separator + suffix
     end

data/lib/tophat/twitter_card.rb

@@ -13,7 +13,7 @@ module TopHat
         yield self if block_given?
       end
 
-      def render
+      def to_html
         output = ActiveSupport::SafeBuffer.new
         output << tag(:meta, :name => 'twitter:card', :value => @type)
         @card_data.each do |key, value|
@@ -23,6 +23,7 @@ module TopHat
         output << "\n".html_safe unless @card_data.empty?
         output
       end
+      alias render to_html
 
       def add_nested_attributes(method, &block)
         image_generator = TwitterCardGenerator.new(method, &block)
@@ -41,7 +42,7 @@ module TopHat
     def twitter_card(type=nil, &block)
       if type.nil?
         if TopHat.current['twitter_card']
-          TopHat.current['twitter_card'].render
+          TopHat.current['twitter_card'].to_html
         end
       else
         TopHat.current['twitter_card'] = TwitterCardGenerator.new(type, &block)

data/lib/tophat/version.rb

@@ -1,3 +1,3 @@
 module TopHat
-  VERSION = '2.0.0'
-end
+  VERSION = '2.1.0'
+end

data/spec/tophat/html_helper_spec.rb

@@ -21,6 +21,11 @@ describe TopHat::HtmlHelper do
         output.should eq('<html xmlns="http://someurl.com">')
       end
 
+      it 'accepts xmlns passed as hashes' do
+        output = @template.html_tag(:xmlns => { :prefix => 'fb', :url => 'http://someurl.com' })
+        output.should eq('<html xmlns:fb="http://someurl.com">')
+      end
+
       it 'accepts xmlns passed as an array of hashes' do
         xmlns = { :prefix => 'fb', :url => 'http://developers.facebook.com/schema/' }
         output = @template.html_tag(:xmlns => [xmlns])

data/spec/tophat/stylesheet_helper_spec.rb

@@ -19,129 +19,129 @@ describe TopHat::StylesheetHelper do
   it "defines IE conditionals" do
     @template.ie_5_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_5_5_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_6_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if IE 6]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if IE 6]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_7_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if IE 7]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if IE 7]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_8_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if IE 8]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if IE 8]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_9_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if IE 9]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if IE 9]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
   end
 
   it "renders defined IE conditional with greater than operator" do
     @template.ie_5_conditional(:gt) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if gt IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if gt IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_5_5_conditional(:gt) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if gt IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if gt IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
   end
 
   it "renders defined IE conditional with greater than or equal to operator" do
     @template.ie_5_conditional(:gte) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if gte IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if gte IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_5_5_conditional(:gte) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if gte IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if gte IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
   end
 
   it "renders defined IE conditional with ! operator" do
     @template.ie_5_conditional(:not) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if !IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if !IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_5_5_conditional(:not) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if !IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if !IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
   end
 
   it "renders defined IE conditional with less than operator" do
     @template.ie_5_conditional(:lt) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if lt IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if lt IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_5_5_conditional(:lt) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if lt IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if lt IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
   end
 
   it "renders defined IE conditional with less than or equal to operator" do
     @template.ie_5_conditional(:lte) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if lte IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if lte IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_5_5_conditional(:lte) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if lte IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if lte IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
   end
 
   it "renders defined IE conditional with equal to operator" do
     @template.ie_5_conditional(:eq) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if eq IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if eq IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_5_5_conditional(:eq) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if eq IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if eq IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
   end
 
   it "renders defined conditionals for other browsers" do
     @template.opera_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if Opera]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if Opera]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.webkit_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if Webkit]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if Webkit]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.webkit_conditional(:eq) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if eq Webkit]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if eq Webkit]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.gecko_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if Gecko]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if Gecko]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_mac_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if IEMac]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if IEMac]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.konqueror_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if Konq]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if Konq]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.ie_mobile_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if IEmob]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if IEmob]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.psp_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if PSP]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if PSP]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.net_front_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if NetF]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if NetF]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
     @template.mobile_safari_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should == "<!--[if SafMob]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->"
+    }.should eq("<!--[if SafMob]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
   end
 

data/spec/tophat/title_helper_spec.rb

@@ -7,91 +7,91 @@ describe TopHat::TitleHelper do
   end
 
   context "saving a title" do
-    it "should save the title" do
-      @template.title('Kind of Blue').should == 'Kind of Blue'
+    it "saves the title" do
+      @template.title('Kind of Blue').should eq('Kind of Blue')
     end
   end
 
   context "displaying a title" do
     it "uses the website name if title is empty" do
-      @template.title(:site => "Miles Davis").should == "<title>Miles Davis</title>"
+      @template.title(:site => "Miles Davis").should eq("<title>Miles Davis</title>")
     end
 
     it "displays the title if no website was specified" do
       save_basic_title
-      @template.title().should == '<title>Kind of Blue</title>'
+      @template.title().should eq('<title>Kind of Blue</title>')
     end
 
     it "uses website before page by default" do
       save_basic_title
-      @template.title(:site => "Miles Davis", :separator => '|').should == "<title>Miles Davis | Kind of Blue</title>"
+      @template.title(:site => "Miles Davis", :separator => '|').should eq("<title>Miles Davis | Kind of Blue</title>")
     end
 
     it "only uses markup in titles in the view" do
       save_basic_title("<b>Kind of Blue</b>").should == "<b>Kind of Blue</b>"
-      @template.title(:site => "Miles Davis", :separator => '|').should == "<title>Miles Davis | Kind of Blue</title>"
+      @template.title(:site => "Miles Davis", :separator => '|').should eq("<title>Miles Davis | Kind of Blue</title>")
     end
 
     it "uses page before website if :reverse" do
       save_basic_title
-      @template.title(:site => "Miles Davis", :reverse => true, :separator => '|').should == "<title>Kind of Blue | Miles Davis</title>"
+      @template.title(:site => "Miles Davis", :reverse => true, :separator => '|').should eq("<title>Kind of Blue | Miles Davis</title>")
     end
 
     it "uses website before page if :reverse and :reverse_on_default" do
-      @template.title(:site => "John Coltrane", :default => "My Favorite Things", :reverse => true, :reverse_on_default => false, :separator => '|').should == "<title>John Coltrane | My Favorite Things</title>"
+      @template.title(:site => "John Coltrane", :default => "My Favorite Things", :reverse => true, :reverse_on_default => false, :separator => '|').should eq("<title>John Coltrane | My Favorite Things</title>")
     end
 
     it "lowercases the title if :lowercase" do
       save_basic_title
-      @template.title(:site => "Miles Davis", :lowercase => true, :separator => '|').should == "<title>miles davis | kind of blue</title>"
+      @template.title(:site => "Miles Davis", :lowercase => true, :separator => '|').should eq("<title>miles davis | kind of blue</title>")
     end
 
     it "uppercases the title if :uppercase" do
       save_basic_title
-      @template.title(:site => "Miles Davis", :uppercase => true, :separator => '|').should == "<title>MILES DAVIS | KIND OF BLUE</title>"
+      @template.title(:site => "Miles Davis", :uppercase => true, :separator => '|').should eq("<title>MILES DAVIS | KIND OF BLUE</title>")
     end
 
     it "uses a custom separator if :separator" do
       save_basic_title
-      @template.title(:site => "Miles Davis", :separator => "-").should == "<title>Miles Davis - Kind of Blue</title>"
-      @template.title(:site => "Miles Davis", :separator => ":").should == "<title>Miles Davis : Kind of Blue</title>"
-      @template.title(:site => "Miles Davis", :separator => "&mdash;").should == "<title>Miles Davis &amp;mdash; Kind of Blue</title>"
+      @template.title(:site => "Miles Davis", :separator => "-").should eq("<title>Miles Davis - Kind of Blue</title>")
+      @template.title(:site => "Miles Davis", :separator => ":").should eq("<title>Miles Davis : Kind of Blue</title>")
+      @template.title(:site => "Miles Davis", :separator => "&mdash;").should eq("<title>Miles Davis &amp;mdash; Kind of Blue</title>")
     end
 
     it "uses custom prefix and suffix if available" do
       save_basic_title
-      @template.title(:site => "Miles Davis", :prefix => " |", :suffix => "| ", :separator => '|').should == "<title>Miles Davis ||| Kind of Blue</title>"
+      @template.title(:site => "Miles Davis", :prefix => " |", :suffix => "| ", :separator => '|').should eq("<title>Miles Davis ||| Kind of Blue</title>")
     end
 
     it "collapses prefix if false" do
       save_basic_title
-      @template.title(:site => "Miles Davis", :prefix => false, :separator => ":").should == "<title>Miles Davis: Kind of Blue</title>"
+      @template.title(:site => "Miles Davis", :prefix => false, :separator => ":").should eq("<title>Miles Davis: Kind of Blue</title>")
     end
 
     it "collapses suffix if false" do
       save_basic_title
-      @template.title(:site => "Miles Davis", :suffix => false, :separator => "~").should == "<title>Miles Davis ~Kind of Blue</title>"
+      @template.title(:site => "Miles Davis", :suffix => false, :separator => "~").should eq("<title>Miles Davis ~Kind of Blue</title>")
     end
 
     it "uses all custom options if available" do
       save_basic_title
       custom_options = { :site => "Miles Davis", :prefix => " ", :suffix => " ", :separator => "-", :lowercase => true, :reverse => true }
-      @template.title(custom_options).should == "<title>kind of blue - miles davis</title>"
+      @template.title(custom_options).should eq("<title>kind of blue - miles davis</title>")
     end
 
     it "uses the default title if title is not present or blank" do
       save_basic_title("")
-      @template.title(:site => "Miles Davis", :default => "Round About Midnight", :separator => '|').should == "<title>Miles Davis | Round About Midnight</title>"
+      @template.title(:site => "Miles Davis", :default => "Round About Midnight", :separator => '|').should eq("<title>Miles Davis | Round About Midnight</title>")
     end
 
     it "allows custom options per title" do
       save_custom_title
-      @template.title(:site => "Freddie Freeloader", :separator => '|').should == "<title>Kind of Blue | Freddie Freeloader</title>"
+      @template.title(:site => "Freddie Freeloader", :separator => '|').should eq("<title>Kind of Blue | Freddie Freeloader</title>")
     end
 
     it "accepts an array of strings as the title" do
       @template.title(['My', 'Favorite', 'Things'])
-      @template.title(:site => "Freddie Freeloader", :separator => '|').should == "<title>Freddie Freeloader | My | Favorite | Things</title>"
+      @template.title(:site => "Freddie Freeloader", :separator => '|').should eq("<title>Freddie Freeloader | My | Favorite | Things</title>")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tophat
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3156332109712594110
+      hash: -1469491919120880781
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3156332109712594110
+      hash: -1469491919120880781
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24