tophat 2.2.0 → 2.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b56ca22052879feee712624be7e4280ba092ebe4
+  data.tar.gz: 17028a90e939dff0feb788e70638376330b9d97a
+SHA512:
+  metadata.gz: 232aa078654be03c161781b600c5589bbcc1d7b3987282f5856bef5bad67264d3a325eb66aebc5129d442f7afd3b97b5b12811e55a1b80e2774abef2cb1bbb9b
+  data.tar.gz: a7b08dbbab148bd2456f2883d1008059f960f1477e6939454f23bfa770943b80edd46fccc74d7e4fbd803687b2fdb0d95a2d1d746958a7e1139e6e5b214213e8

data/.rspec

@@ -1,3 +1,2 @@
 --color
---format=nested
 --backtrace

data/.travis.yml

@@ -1,13 +1,19 @@
 bundler_args: --without development
 language: ruby
 rvm:
-  - rbx-18mode
-  - rbx-19mode
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
+  - jruby-19mode
+  - jruby-19mode
+  - jruby-head
+  - rbx-2
+  - ruby-head
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
-    - rvm: 1.8.7
+    - rvm: jruby-head
+    - rvm: jruby-19mode
+    - rvm: rbx-2
+    - rvm: ruby-head
+  fash_finish: true
+sudo: false

data/Gemfile

@@ -5,11 +5,10 @@ gem 'yard'
 
 group :development do
   gem 'kramdown'
-  gem 'guard-rspec'
 end
 
 group :test do
-  gem 'rspec', '>= 2.11'
+  gem 'rspec'
   gem 'simplecov', :require => false
   gem 'rails', '>= 3.0.0', '< 4.0.0'
   gem 'webmock'

data/README.md

@@ -1,9 +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] [![Code Climate](https://codeclimate.com/github/spagalloco/tophat.png)][codeclimate]
+# TopHat [![Build Status](https://secure.travis-ci.org/stve/tophat.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/stve/tophat.png?travis)][gemnasium] [![Code Climate](https://codeclimate.com/github/stve/tophat.png)][codeclimate]
 
 
-[travis]: http://travis-ci.org/spagalloco/tophat
-[gemnasium]: https://gemnasium.com/spagalloco/tophat
-[codeclimate]: https://codeclimate.com/github/spagalloco/tophat
+[travis]: http://travis-ci.org/stve/tophat
+[gemnasium]: https://gemnasium.com/stve/tophat
+[codeclimate]: https://codeclimate.com/github/stve/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.
 
@@ -196,4 +196,4 @@ Pull requests welcome: fork, make a topic branch, commit (squash when possible)
 
 ## Copyright
 
-Copyright (c) 2012 Steve Agalloco. See [LICENSE](https://github.com/spagalloco/tophat/blob/master/LICENSE.md) for details.
+Copyright (c) 2014 Steve Agalloco. See [LICENSE](https://github.com/stve/tophat/blob/master/LICENSE.md) for details.

data/lib/tophat/meta.rb

@@ -28,7 +28,7 @@ module TopHat
       else
         default_description = options.delete(:default)
         options[:name] = 'description'
-        options[:content] = TopHat.current['description'] || default_description
+        options[:content] = TopHat.current['description'].blank? ? default_description : TopHat.current['description']
 
         meta_tag(options) if options[:content]
       end

data/lib/tophat/robots.rb

@@ -3,25 +3,24 @@ module TopHat
 
     DEFAULT_DESCRIPTOR = 'robots'
 
-    def noindex(descriptor=nil)
-      if descriptor
-        TopHat.current['noindex'] = descriptor || DEFAULT_DESCRIPTOR
-      else
-        descriptor = TopHat.current['noindex'] || DEFAULT_DESCRIPTOR
-      end
-      tag(:meta, :name => descriptor, :content => 'noindex')
+    def noindex(descriptor = nil, content = 'noindex')
+      robot_tag(descriptor, content)
+    end
+
+    def nofollow(descriptor = nil, content = 'nofollow')
+      robot_tag(descriptor, content)
     end
 
-    def nofollow(descriptor=nil)
+    def robot_tag(descriptor = nil, content)
       if descriptor
-        TopHat.current['nofollow'] = descriptor || DEFAULT_DESCRIPTOR
+        TopHat.current[content] = descriptor || DEFAULT_DESCRIPTOR
       else
-        descriptor = TopHat.current['nofollow'] || DEFAULT_DESCRIPTOR
+        descriptor = TopHat.current[content] || DEFAULT_DESCRIPTOR
       end
-      tag(:meta, :name => descriptor, :content => 'nofollow')
+      tag(:meta, :name => descriptor, :content => content)
     end
 
-    def canonical(path=nil)
+    def canonical(path = nil)
       tag(:link, :rel => 'canonical', :href => path) if path
     end
 

data/lib/tophat/version.rb

@@ -1,3 +1,3 @@
 module TopHat
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/spec/spec_helper.rb

@@ -21,3 +21,15 @@ RSpec.configure do |config|
     TopHat.reset
   end
 end
+
+def capture_warning
+  begin
+    old_stderr = $stderr
+    $stderr = StringIO.new
+    yield
+    result = $stderr.string
+  ensure
+    $stderr = old_stderr
+  end
+  result
+end

data/spec/tophat/html_helper_spec.rb

@@ -7,41 +7,41 @@ describe TopHat::HtmlHelper do
 
   describe 'html_tag' do
     it 'returns a simple tag by default' do
-      @template.html_tag.should eq('<html>')
+      expect(@template.html_tag).to eq('<html>')
     end
 
     it 'accepts a version in an options hash' do
       output = @template.html_tag(:version => '123')
-      output.should eq('<html version="123">')
+      expect(output).to eq('<html version="123">')
     end
 
     context 'xmlns' do
       it 'accepts xmlns passed as strings' do
         output = @template.html_tag(:xmlns => 'http://someurl.com')
-        output.should eq('<html xmlns="http://someurl.com">')
+        expect(output).to 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">')
+        expect(output).to 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])
-        output.should eq('<html xmlns:fb="http://developers.facebook.com/schema/">')
+        expect(output).to eq('<html xmlns:fb="http://developers.facebook.com/schema/">')
       end
     end
 
     context 'prefixes' do
       it 'accepts prefixes passed as strings' do
         output = @template.html_tag(:prefix => 'ohai')
-        output.should eq('<html prefix="ohai">')
+        expect(output).to eq('<html prefix="ohai">')
       end
 
       it 'accepts prefixes passed as a hash' do
         output = @template.html_tag(:prefix => { :prefix => 'og', :url => 'http://ogp.me/ns#' })
-        output.should eq('<html prefix="og: http://ogp.me/ns#">')
+        expect(output).to eq('<html prefix="og: http://ogp.me/ns#">')
       end
 
       it 'accepts prefixes passed as an array of hashes' do
@@ -50,12 +50,12 @@ describe TopHat::HtmlHelper do
           { :prefix => 'fb', :url => 'http://ogp.me/ns/fb#' }
         ]
         output = @template.html_tag(:prefix => prefixes)
-        output.should eq('<html prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">')
+        expect(output).to eq('<html prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">')
       end
 
       it 'accepts prefixes passes and an array of strings' do
         output = @template.html_tag(:prefix => ['og: http://ogp.me/ns#', 'fb: http://ogp.me/ns/fb#'])
-        output.should eq('<html prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">')
+        expect(output).to eq('<html prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">')
       end
     end
 

data/spec/tophat/meta_helper_spec.rb

@@ -8,19 +8,19 @@ describe TopHat::MetaHelper do
 
   describe "charset" do
     it 'renders a meta tag with a charset' do
-      @template.charset('utf-8').should eq('<meta charset="utf-8">')
+      expect(@template.charset('utf-8')).to eq('<meta charset="utf-8">')
     end
   end
 
   describe "viewport" do
     it 'renders a meta tag with a viewport' do
-      @template.viewport('width=device-width').should eq('<meta content="width=device-width" name="viewport">')
+      expect(@template.viewport('width=device-width')).to eq('<meta content="width=device-width" name="viewport">')
     end
   end
 
   describe "meta_tag" do
     it 'renders meta_tags' do
-      @template.meta_tag(:charset => 'utf-8').should eq('<meta charset="utf-8" />')
+      expect(@template.meta_tag(:charset => 'utf-8')).to eq('<meta charset="utf-8" />')
     end
   end
 
@@ -31,11 +31,11 @@ describe TopHat::MetaHelper do
       end
 
       it "saves keywords" do
-        @template.keywords(@keywords).should == @keywords.join(', ')
+        expect(@template.keywords(@keywords)).to eq(@keywords.join(', '))
       end
 
       it "uses default keywords if keywords is empty" do
-        @template.keywords(:default => @keywords).should == "<meta content=\"#{@keywords.join(', ')}\" name=\"keywords\" />"
+        expect(@template.keywords(:default => @keywords)).to eq("<meta content=\"#{@keywords.join(', ')}\" name=\"keywords\" />")
       end
     end
 
@@ -45,56 +45,61 @@ describe TopHat::MetaHelper do
       end
 
       it "saves keywords" do
-        @template.keywords(@keywords).should == @keywords
+        expect(@template.keywords(@keywords)).to eq(@keywords)
       end
 
       it "uses default keywords passed as a string if keywords is empty" do
-        @template.keywords(:default => @keywords).should == "<meta content=\"#{@keywords}\" name=\"keywords\" />"
+        expect(@template.keywords(:default => @keywords)).to eq("<meta content=\"#{@keywords}\" name=\"keywords\" />")
       end
     end
 
     it "return nil when no default is configured and no keywords are defined" do
-      @template.keywords.should be_nil
+      expect(@template.keywords).to be_nil
     end
 
     it "returns nil when passed nil" do
-      @template.keywords(nil).should be_nil
+      expect(@template.keywords(nil)).to be_nil
     end
 
     it "merges default tags with page tags, when merge_default is set to true" do
       @template.keywords("Stu, Pete")
-      @template.keywords(:default => "John, Paul, George, Ringo", :merge_default => true).should == "<meta content=\"Stu, Pete, John, Paul, George, Ringo\" name=\"keywords\" />"
+      expect(@template.keywords(:default => "John, Paul, George, Ringo", :merge_default => true)).to eq("<meta content=\"Stu, Pete, John, Paul, George, Ringo\" name=\"keywords\" />")
     end
   end
 
   describe ".description" do
     it "saves the description" do
       desc = "Cinderella story. Outta nowhere. A former greenskeeper, now, about to become the Masters champion."
-      @template.description(desc).should == desc
+      expect(@template.description(desc)).to eq(desc)
     end
 
     it "uses the default description if no description is defined" do
       desc = "A flute without holes, is not a flute. A donut without a hole, is a Danish."
-      @template.description(:default => desc).should == "<meta content=\"#{desc}\" name=\"description\" />"
+      expect(@template.description(:default => desc)).to eq("<meta content=\"#{desc}\" name=\"description\" />")
     end
 
     it "returns nil when passed nil" do
-      @template.description(nil).should be_nil
+      expect(@template.description(nil)).to be_nil
     end
 
     it "returns nil when no default is configured and no description is defined" do
-      @template.description.should be_nil
+      expect(@template.description).to be_nil
     end
 
     it 'overrides the default' do
       @template.description('This is a custom description')
-      @template.description(:default => 'This is a default description.').should eq('<meta content="This is a custom description" name="description" />')
+      expect(@template.description(:default => 'This is a default description.')).to eq('<meta content="This is a custom description" name="description" />')
     end
+
+    it "uses the default description if custom description is blank" do
+      @template.description('')
+      expect(@template.description(:default => 'This is a default description')).to eq('<meta content="This is a default description" name="description" />')
+    end 
   end
 
   describe ".itemprop" do
     it "renders an itemprop meta tag" do
-      @template.itemprop(:rating, '1').should == "<meta content=\"1\" itemprop=\"rating\" />"
+      expect(@template.itemprop(:rating, '1')).to eq("<meta content=\"1\" itemprop=\"rating\" />")
     end
   end
 

data/spec/tophat/opengraph_helper_spec.rb

@@ -14,29 +14,39 @@ describe TopHat::OpenGraphHelper do
     context 'default style' do
       it 'renders an html tag with namespace' do
         output = @template.opengraph_html
-        output.should =~ /<html/
-        output.should =~ /xmlns\:og/
-        output.should =~ /xmlns\:fb/
+        expect(output).to match(/<html/)
+        expect(output).to match(/xmlns\:og/)
+        expect(output).to match(/xmlns\:fb/)
       end
     end
 
     context 'html5 style' do
       it 'renders an html tag with namespace' do
         output = @template.opengraph_html('html5')
-        output.should =~ /<html/
-        output.should =~ /xmlns\:og/
-        output.should =~ /xmlns\:fb/
+        expect(output).to match(/<html/)
+        expect(output).to match(/xmlns\:og/)
+        expect(output).to match(/xmlns\:fb/)
       end
     end
 
     context 'unknown style' do
       it 'returns an empty html tag' do
-        @template.opengraph_html('funny').should eq('<html>')
+        expect(@template.opengraph_html('funny')).to eq('<html>')
       end
     end
 
     it 'it supports deprecated html_with_opengraph' do
-      @template.opengraph_html.should eq(@template.html_with_opengraph)
+      capture_warning do
+        expect(@template.opengraph_html).to eq(@template.html_with_opengraph)
+      end
+    end
+
+    it 'deprecates html_with_opengraph' do
+      warning = capture_warning do
+        @template.html_with_opengraph
+      end
+
+      expect(warning).to eq("html_with_opengraph has been deprecated, use opengraph_html instead.\n")
     end
   end
 
@@ -44,14 +54,14 @@ describe TopHat::OpenGraphHelper do
     context "as a string" do
       it "generates a site admin tag" do
         @template.opengraph(:admins => '123,124')
-        @template.opengraph.should include('<meta content="123,124" property="fb:admins" />')
+        expect(@template.opengraph).to include('<meta content="123,124" property="fb:admins" />')
       end
     end
 
     context "as an array" do
       it "generates a site admin tag" do
         @template.opengraph(:admins => [123, 124])
-        @template.opengraph.should include('<meta content="123,124" property="fb:admins" />')
+        expect(@template.opengraph).to include('<meta content="123,124" property="fb:admins" />')
       end
     end
   end
@@ -59,19 +69,19 @@ describe TopHat::OpenGraphHelper do
   context "app_id when configured" do
     it "generates an app_id meta tag" do
       @template.opengraph(:app_id => 'MyApp')
-      @template.opengraph.should include('<meta content="MyApp" property="fb:app_id" />')
+      expect(@template.opengraph).to include('<meta content="MyApp" property="fb:app_id" />')
     end
   end
 
   context "additional open graph properties" do
     it "generates opengraph meta tags" do
       @template.opengraph { |og| og.title 'The Great Gatsby' }
-      @template.opengraph.should include('<meta content="The Great Gatsby" property="og:title" />')
+      expect(@template.opengraph).to include('<meta content="The Great Gatsby" property="og:title" />')
     end
 
     it "allows use of the tag 'type'" do
       @template.opengraph { |og| og.type 'sports_team' }
-      @template.opengraph.should include('<meta content="sports_team" property="og:type" />')
+      expect(@template.opengraph).to include('<meta content="sports_team" property="og:type" />')
     end
 
     it "supports multiple tags" do
@@ -81,8 +91,8 @@ describe TopHat::OpenGraphHelper do
       end
       output = @template.opengraph
 
-      output.should include('<meta content="movie" property="og:type" />')
-      output.should include('<meta content="Austin Powers: International Man of Mystery" property="og:title" />')
+      expect(output).to include('<meta content="movie" property="og:type" />')
+      expect(output).to include('<meta content="Austin Powers: International Man of Mystery" property="og:title" />')
     end
 
     it 'supports default tags' do
@@ -94,9 +104,9 @@ describe TopHat::OpenGraphHelper do
         og.rating '5/10'
       end
 
-      output.should include('<meta content="movie" property="og:type" />')
-      output.should include('<meta content="Rain Man" property="og:title" />')
-      output.should include('<meta content="5/10" property="og:rating" />')
+      expect(output).to include('<meta content="movie" property="og:type" />')
+      expect(output).to include('<meta content="Rain Man" property="og:title" />')
+      expect(output).to include('<meta content="5/10" property="og:rating" />')
     end
   end
 
@@ -108,10 +118,10 @@ describe TopHat::OpenGraphHelper do
       end
       output = @template.opengraph
 
-      output.should include('<meta content="MyApp" property="fb:app_id" />')
-      output.should include('<meta content="123,1234" property="fb:admins" />')
-      output.should include('<meta content="movie" property="og:type" />')
-      output.should include('<meta content="Rain Man" property="og:title" />')
+      expect(output).to include('<meta content="MyApp" property="fb:app_id" />')
+      expect(output).to include('<meta content="123,1234" property="fb:admins" />')
+      expect(output).to include('<meta content="movie" property="og:type" />')
+      expect(output).to include('<meta content="Rain Man" property="og:title" />')
     end
 
     it "generates all tags when app_id and admins passed as part of rendering" do
@@ -121,10 +131,10 @@ describe TopHat::OpenGraphHelper do
       end
       output = @template.opengraph(:app_id => 'MyApp', :admins => [123, 1234])
 
-      output.should include('<meta content="MyApp" property="fb:app_id" />')
-      output.should include('<meta content="123,1234" property="fb:admins" />')
-      output.should include('<meta content="movie" property="og:type" />')
-      output.should include('<meta content="Rain Man" property="og:title" />')
+      expect(output).to include('<meta content="MyApp" property="fb:app_id" />')
+      expect(output).to include('<meta content="123,1234" property="fb:admins" />')
+      expect(output).to include('<meta content="movie" property="og:type" />')
+      expect(output).to include('<meta content="Rain Man" property="og:title" />')
     end
 
     it 'supports default tags' do
@@ -136,11 +146,11 @@ describe TopHat::OpenGraphHelper do
         og.rating '5/10'
       end
 
-      output.should include('<meta content="MyApp" property="fb:app_id" />')
-      output.should include('<meta content="123,1234" property="fb:admins" />')
-      output.should include('<meta content="movie" property="og:type" />')
-      output.should include('<meta content="Rain Man" property="og:title" />')
-      output.should include('<meta content="5/10" property="og:rating" />')
+      expect(output).to include('<meta content="MyApp" property="fb:app_id" />')
+      expect(output).to include('<meta content="123,1234" property="fb:admins" />')
+      expect(output).to include('<meta content="movie" property="og:type" />')
+      expect(output).to include('<meta content="Rain Man" property="og:title" />')
+      expect(output).to include('<meta content="5/10" property="og:rating" />')
     end
   end
 

data/spec/tophat/robots_helper_spec.rb

@@ -8,53 +8,53 @@ describe TopHat::RobotsHelper do
 
   describe ".nofollow" do
     it "defaults to all robots" do
-      @template.nofollow.should == "<meta content=\"nofollow\" name=\"robots\" />"
+      expect(@template.nofollow).to eq("<meta content=\"nofollow\" name=\"robots\" />")
     end
 
     it "uses a descriptor if one is provided" do
-      @template.nofollow('googlebot').should == "<meta content=\"nofollow\" name=\"googlebot\" />"
+      expect(@template.nofollow('googlebot')).to eq("<meta content=\"nofollow\" name=\"googlebot\" />")
     end
 
     it "generates a default tag when passed nil" do
-      @template.nofollow(nil).should == "<meta content=\"nofollow\" name=\"robots\" />"
+      expect(@template.nofollow(nil)).to eq("<meta content=\"nofollow\" name=\"robots\" />")
     end
 
     it 'stores a descriptor' do
       @template.nofollow('twitterbot')
-      @template.nofollow.should == "<meta content=\"nofollow\" name=\"twitterbot\" />"
+      expect(@template.nofollow).to eq("<meta content=\"nofollow\" name=\"twitterbot\" />")
     end
   end
 
   describe ".noindex" do
     it "defaults to all robots" do
-      @template.noindex.should == "<meta content=\"noindex\" name=\"robots\" />"
+      expect(@template.noindex).to eq("<meta content=\"noindex\" name=\"robots\" />")
     end
 
     it "uses a descriptor if one is provided" do
-      @template.noindex('googlebot').should == "<meta content=\"noindex\" name=\"googlebot\" />"
+      expect(@template.noindex('googlebot')).to eq("<meta content=\"noindex\" name=\"googlebot\" />")
     end
 
     it "generates a default tag when passed nil" do
-      @template.noindex(nil).should == "<meta content=\"noindex\" name=\"robots\" />"
+      expect(@template.noindex(nil)).to eq("<meta content=\"noindex\" name=\"robots\" />")
     end
 
     it 'stores a descriptor' do
       @template.noindex('twitterbot')
-      @template.noindex.should == "<meta content=\"noindex\" name=\"twitterbot\" />"
+      expect(@template.noindex).to eq("<meta content=\"noindex\" name=\"twitterbot\" />")
     end
   end
 
   describe ".canonical" do
     it "returns nil when not passed a path" do
-      @template.canonical.should be_nil
+      expect(@template.canonical).to be_nil
     end
 
     it "renders a tag when passed a path" do
-      @template.canonical('http://mysite.com/somepath/').should == "<link href=\"http://mysite.com/somepath/\" rel=\"canonical\" />"
+      expect(@template.canonical('http://mysite.com/somepath/')).to eq("<link href=\"http://mysite.com/somepath/\" rel=\"canonical\" />")
     end
 
     it "returns nil when passed nil" do
-      @template.canonical(nil).should be_nil
+      expect(@template.canonical(nil)).to be_nil
     end
   end
 

data/spec/tophat/stylesheet_helper_spec.rb

@@ -17,131 +17,131 @@ describe TopHat::StylesheetHelper do
   end
 
   it "defines IE conditionals" do
-    @template.ie_5_conditional {
+    expect(@template.ie_5_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.ie_5_5_conditional {
+    expect(@template.ie_5_5_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.ie_6_conditional {
+    expect(@template.ie_6_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if IE 6]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if IE 6]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.ie_7_conditional {
+    expect(@template.ie_7_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if IE 7]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if IE 7]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.ie_8_conditional {
+    expect(@template.ie_8_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if IE 8]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if IE 8]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.ie_9_conditional {
+    expect(@template.ie_9_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if IE 9]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_conditional(:gt) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if gt IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_5_conditional(:gt) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if gt IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_conditional(:gte) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if gte IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_5_conditional(:gte) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if gte IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_conditional(:not) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if !IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_5_conditional(:not) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if !IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_conditional(:lt) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if lt IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_5_conditional(:lt) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if lt IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_conditional(:lte) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if lte IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_5_conditional(:lte) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if lte IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_conditional(:eq) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if eq IE 5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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) {
+    expect(@template.ie_5_5_conditional(:eq) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if eq IE 5.5]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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 {
+    expect(@template.opera_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if Opera]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if Opera]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.webkit_conditional {
+    expect(@template.webkit_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if Webkit]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if Webkit]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.webkit_conditional(:eq) {
+    expect(@template.webkit_conditional(:eq) {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if eq Webkit]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if eq Webkit]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.gecko_conditional {
+    expect(@template.gecko_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if Gecko]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if Gecko]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.ie_mac_conditional {
+    expect(@template.ie_mac_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if IEMac]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if IEMac]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.konqueror_conditional {
+    expect(@template.konqueror_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if Konq]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if Konq]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.ie_mobile_conditional {
+    expect(@template.ie_mobile_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if IEmob]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if IEmob]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.psp_conditional {
+    expect(@template.psp_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if PSP]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if PSP]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.net_front_conditional {
+    expect(@template.net_front_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if NetF]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to eq("<!--[if NetF]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
 
-    @template.mobile_safari_conditional {
+    expect(@template.mobile_safari_conditional {
       @template.stylesheet_link_tag(@stylesheet)
-    }.should eq("<!--[if SafMob]>\n<link href=\"/stylesheets/ie.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<![endif]-->")
+    }).to 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

@@ -8,90 +8,90 @@ describe TopHat::TitleHelper do
 
   context "saving a title" do
     it "saves the title" do
-      @template.title('Kind of Blue').should eq('Kind of Blue')
+      expect(@template.title('Kind of Blue')).to 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 eq("<title>Miles Davis</title>")
+      expect(@template.title(:site => "Miles Davis")).to eq("<title>Miles Davis</title>")
     end
 
     it "displays the title if no website was specified" do
       save_basic_title
-      @template.title().should eq('<title>Kind of Blue</title>')
+      expect(@template.title()).to 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 eq("<title>Miles Davis | Kind of Blue</title>")
+      expect(@template.title(:site => "Miles Davis", :separator => '|')).to 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 eq("<title>Miles Davis | Kind of Blue</title>")
+      expect(save_basic_title("<b>Kind of Blue</b>")).to eq("<b>Kind of Blue</b>")
+      expect(@template.title(:site => "Miles Davis", :separator => '|')).to 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 eq("<title>Kind of Blue | Miles Davis</title>")
+      expect(@template.title(:site => "Miles Davis", :reverse => true, :separator => '|')).to 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 eq("<title>John Coltrane | My Favorite Things</title>")
+      expect(@template.title(:site => "John Coltrane", :default => "My Favorite Things", :reverse => true, :reverse_on_default => false, :separator => '|')).to 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 eq("<title>miles davis | kind of blue</title>")
+      expect(@template.title(:site => "Miles Davis", :lowercase => true, :separator => '|')).to 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 eq("<title>MILES DAVIS | KIND OF BLUE</title>")
+      expect(@template.title(:site => "Miles Davis", :uppercase => true, :separator => '|')).to 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 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>")
+      expect(@template.title(:site => "Miles Davis", :separator => "-")).to eq("<title>Miles Davis - Kind of Blue</title>")
+      expect(@template.title(:site => "Miles Davis", :separator => ":")).to eq("<title>Miles Davis : Kind of Blue</title>")
+      expect(@template.title(:site => "Miles Davis", :separator => "&mdash;")).to 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 eq("<title>Miles Davis ||| Kind of Blue</title>")
+      expect(@template.title(:site => "Miles Davis", :prefix => " |", :suffix => "| ", :separator => '|')).to 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 eq("<title>Miles Davis: Kind of Blue</title>")
+      expect(@template.title(:site => "Miles Davis", :prefix => false, :separator => ":")).to 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 eq("<title>Miles Davis ~Kind of Blue</title>")
+      expect(@template.title(:site => "Miles Davis", :suffix => false, :separator => "~")).to 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 eq("<title>kind of blue - miles davis</title>")
+      expect(@template.title(custom_options)).to 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 eq("<title>Miles Davis | Round About Midnight</title>")
+      expect(@template.title(:site => "Miles Davis", :default => "Round About Midnight", :separator => '|')).to 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 eq("<title>Kind of Blue | Freddie Freeloader</title>")
+      expect(@template.title(:site => "Freddie Freeloader", :separator => '|')).to 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 eq("<title>Freddie Freeloader | My | Favorite | Things</title>")
+      expect(@template.title(:site => "Freddie Freeloader", :separator => '|')).to eq("<title>Freddie Freeloader | My | Favorite | Things</title>")
     end
   end
 

data/spec/tophat/twitter_card_helper_spec.rb

@@ -16,7 +16,7 @@ describe TopHat::TwitterCardHelper do
     @template.twitter_card('summary')
 
     output = @template.twitter_card
-    output.should eq('<meta name="twitter:card" value="summary" />')
+    expect(output).to eq('<meta name="twitter:card" value="summary" />')
   end
 
   it 'generates twitter:card meta tags' do
@@ -28,8 +28,8 @@ describe TopHat::TwitterCardHelper do
     end
 
     output = @template.twitter_card
-    output.should include('<meta name="twitter:title" value="Rain Man" />')
-    output.should include('<meta name="twitter:image" value="http://someurl.com/animage.jpg" />')
+    expect(output).to include('<meta name="twitter:title" value="Rain Man" />')
+    expect(output).to include('<meta name="twitter:image" value="http://someurl.com/animage.jpg" />')
   end
 
   it 'generates nested twitter:card meta tags' do
@@ -41,9 +41,9 @@ describe TopHat::TwitterCardHelper do
     end
 
     output = @template.twitter_card
-    output.should include('<meta name="twitter:image" value="http://someurl.com/animage.jpg" />')
-    output.should include('<meta name="twitter:image:height" value="123" />')
-    output.should include('<meta name="twitter:image:width" value="456" />')
+    expect(output).to include('<meta name="twitter:image" value="http://someurl.com/animage.jpg" />')
+    expect(output).to include('<meta name="twitter:image:height" value="123" />')
+    expect(output).to include('<meta name="twitter:image:width" value="456" />')
   end
 
 
@@ -57,8 +57,8 @@ describe TopHat::TwitterCardHelper do
     end
 
     output = @template.twitter_card
-    output.should include('<meta name="twitter:player:stream" value="http://example.com/raw-stream/a.mp4" />')
-    output.should include('<meta name="twitter:player:stream:content_type" value="123" />')
+    expect(output).to include('<meta name="twitter:player:stream" value="http://example.com/raw-stream/a.mp4" />')
+    expect(output).to include('<meta name="twitter:player:stream:content_type" value="123" />')
   end
 
   it 'supports default tags' do
@@ -73,9 +73,9 @@ describe TopHat::TwitterCardHelper do
       end
     end
 
-    output.should include('<meta name="twitter:player:embed" value="https://example.com/embed/a" />')
-    output.should include('<meta name="twitter:player:site" value="https://example.com" />')
-    output.should_not include('<meta name="twitter:embed" value="https://example.com/embed/a" />')
+    expect(output).to include('<meta name="twitter:player:embed" value="https://example.com/embed/a" />')
+    expect(output).to include('<meta name="twitter:player:site" value="https://example.com" />')
+    expect(output).not_to include('<meta name="twitter:embed" value="https://example.com/embed/a" />')
   end
 
 end

data/spec/tophat_spec.rb

@@ -7,84 +7,84 @@ describe TopHat do
   end
 
   it "is mixed into ActionView::Base" do
-    ActionView::Base.included_modules.include?(TopHat::TitleHelper).should be_true
-    ActionView::Base.included_modules.include?(TopHat::MetaHelper).should be_true
-    ActionView::Base.included_modules.include?(TopHat::StylesheetHelper).should be_true
+    expect(ActionView::Base.included_modules.include?(TopHat::TitleHelper)).to be_truthy
+    expect(ActionView::Base.included_modules.include?(TopHat::MetaHelper)).to be_truthy
+    expect(ActionView::Base.included_modules.include?(TopHat::StylesheetHelper)).to be_truthy
   end
 
   it "responds to the 'title' helper" do
-    @template.respond_to?(:title).should be_true
+    expect(@template.respond_to?(:title)).to be_truthy
   end
 
   it "responds to the 'title' helper alias" do
-    @template.respond_to?(:t).should be_true
+    expect(@template.respond_to?(:t)).to be_truthy
   end
 
   it "responds to the 'description' helper" do
-    @template.respond_to?(:description).should be_true
+    expect(@template.respond_to?(:description)).to be_truthy
   end
 
   it "responds to the 'keywords' helper" do
-    @template.respond_to?(:keywords).should be_true
+    expect(@template.respond_to?(:keywords)).to be_truthy
   end
 
   it "responds to the 'ie_5_conditional' helper" do
-    @template.respond_to?(:ie_5_conditional).should be_true
+    expect(@template.respond_to?(:ie_5_conditional)).to be_truthy
   end
 
   it "responds to the 'ie_5_5_conditional' helper" do
-    @template.respond_to?(:ie_5_5_conditional).should be_true
+    expect(@template.respond_to?(:ie_5_5_conditional)).to be_truthy
   end
 
   it "responds to the 'ie_6_conditional' helper" do
-    @template.respond_to?(:ie_6_conditional).should be_true
+    expect(@template.respond_to?(:ie_6_conditional)).to be_truthy
   end
 
   it "responds to the 'ie_7_conditional' helper" do
-    @template.respond_to?(:ie_7_conditional).should be_true
+    expect(@template.respond_to?(:ie_7_conditional)).to be_truthy
   end
 
   it "responds to the 'ie_8_conditional' helper" do
-    @template.respond_to?(:ie_8_conditional).should be_true
+    expect(@template.respond_to?(:ie_8_conditional)).to be_truthy
   end
 
   it "responds to the 'ie_9_conditional' helper" do
-    @template.respond_to?(:ie_9_conditional).should be_true
+    expect(@template.respond_to?(:ie_9_conditional)).to be_truthy
   end
 
   it "responds to the 'opengraph' helper" do
-    @template.respond_to?(:opengraph).should be_true
+    expect(@template.respond_to?(:opengraph)).to be_truthy
   end
 
   it "responds to the 'noindex' helper" do
-    @template.respond_to?(:noindex).should be_true
+    expect(@template.respond_to?(:noindex)).to be_truthy
   end
 
   it "responds to the 'nofollow' helper" do
-    @template.respond_to?(:nofollow).should be_true
+    expect(@template.respond_to?(:nofollow)).to be_truthy
   end
 
   it "responds to the 'canonical' helper" do
-    @template.respond_to?(:canonical).should be_true
+    expect(@template.respond_to?(:canonical)).to be_truthy
   end
 
   it "responds to the 'twitter_card' helper" do
-    @template.respond_to?(:twitter_card).should be_true
+    expect(@template.respond_to?(:twitter_card)).to be_truthy
   end
 
   it "responds to the 'html_tag' helper" do
-    @template.respond_to?(:html_tag).should be_true
+    expect(@template.respond_to?(:html_tag)).to be_truthy
   end
 
   describe '.current' do
     it 'returns a hash' do
-      TopHat.current.should be_kind_of(Hash)
+      expect(TopHat.current).to be_kind_of(Hash)
     end
 
     it 'allows the hash to be modified' do
       TopHat.current[:title] = 'foo'
 
-      TopHat.current[:title].should eq('foo')
+      expect(TopHat.current[:title]).to eq('foo')
     end
   end
 

data/tophat.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Agalloco"]
   s.email       = ['steve.agalloco@gmail.com']
-  s.homepage    = "https://github.com/spagalloco/tophat"
+  s.homepage    = "https://github.com/stve/tophat"
   s.description = %q{Simple view helpers for your layouts}
   s.summary     = %q{Simple view helpers for your layouts}
 

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: tophat
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.2.1
 platform: ruby
 authors:
 - Steve Agalloco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Simple view helpers for your layouts
@@ -34,12 +31,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
-- Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
@@ -64,35 +60,28 @@ files:
 - spec/tophat/twitter_card_helper_spec.rb
 - spec/tophat_spec.rb
 - tophat.gemspec
-homepage: https://github.com/spagalloco/tophat
+homepage: https://github.com/stve/tophat
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2300101656837364012
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2300101656837364012
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple view helpers for your layouts
 test_files:
 - spec/spec_helper.rb

data/Guardfile

@@ -1,6 +0,0 @@
-guard 'rspec', :cli => '--format documentation' do
-  watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^lib/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^lib/tophat/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_helper_spec.rb" }
-  watch('spec/spec_helper.rb') { "spec" }
-end