tophat 1.4.0 → 1.5.0

data/lib/tophat/meta.rb

@@ -4,6 +4,7 @@ module TopHat
     # page descriptions
     # <meta name="description" content="Description goes here." />
     def description(options={})
+      options ||= {}
       if options.is_a? String
         TopHat.current['description'] = options
 
@@ -18,6 +19,7 @@ module TopHat
     # keywords
     # <meta name="keywords" content="Keywords go here." />
     def keywords(options={})
+      options ||= {}
       if options.is_a?(String)
         TopHat.current['keywords'] = options
 

data/lib/tophat/robots.rb

@@ -1,11 +1,15 @@
 module TopHat
   module RobotsHelper
 
-    def noindex(descriptor='robots')
+    DEFAULT_DESCRIPTOR = 'robots'
+
+    def noindex(descriptor=DEFAULT_DESCRIPTOR)
+      descriptor ||= DEFAULT_DESCRIPTOR
       tag(:meta, :name => descriptor, :content => 'noindex')
     end
 
-    def nofollow(descriptor='robots')
+    def nofollow(descriptor=DEFAULT_DESCRIPTOR)
+      descriptor ||= DEFAULT_DESCRIPTOR
       tag(:meta, :name => descriptor, :content => 'nofollow')
     end
 

data/lib/tophat/version.rb

@@ -1,3 +1,3 @@
 module TopHat
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/spec/tophat/meta_helper_spec.rb

@@ -39,6 +39,10 @@ describe TopHat::MetaHelper do
       @template.keywords.should be_nil
     end
 
+    it "doesn't blow up on nil" do
+      @template.keywords(nil).should be_nil
+    end
+
     it "should merge 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\" />"
@@ -56,6 +60,10 @@ describe TopHat::MetaHelper do
       @template.description(:default => desc).should == "<meta content=\"#{desc}\" name=\"description\" />"
     end
 
+    it "doesn't blow up on nil" do
+      @template.description(nil).should be_nil
+    end
+
     it "should not return a tag if no default is configured and no description is defined" do
       @template.description.should be_nil
     end

data/spec/tophat/robots_helper_spec.rb

@@ -14,6 +14,10 @@ describe TopHat::RobotsHelper do
     it "should use a descriptor if one is provided" do
       @template.nofollow('googlebot').should == "<meta content=\"nofollow\" name=\"googlebot\" />"
     end
+
+    it "doesn't blow up on nil" do
+      @template.nofollow(nil).should == "<meta content=\"nofollow\" name=\"robots\" />"
+    end
   end
 
   describe ".noindex" do
@@ -24,6 +28,10 @@ describe TopHat::RobotsHelper do
     it "should use a descriptor if one is provided" do
       @template.noindex('googlebot').should == "<meta content=\"noindex\" name=\"googlebot\" />"
     end
+
+    it "doesn't blow up on nil" do
+      @template.noindex(nil).should == "<meta content=\"noindex\" name=\"robots\" />"
+    end
   end
 
   describe ".canonical" do
@@ -34,6 +42,10 @@ describe TopHat::RobotsHelper do
     it "should render a tag when passed a path" do
       @template.canonical('http://mysite.com/somepath/').should == "<link href=\"http://mysite.com/somepath/\" rel=\"canonical\" />"
     end
+
+    it "doesn't blow up on nil" do
+      @template.canonical(nil).should be_nil
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tophat
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000Z
+date: 2012-06-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2156386200 !ruby/object:Gem::Requirement
+  requirement: &70226951969300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156386200
+  version_requirements: *70226951969300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156385680 !ruby/object:Gem::Requirement
+  requirement: &70226951967240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2156385680
+  version_requirements: *70226951967240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156385220 !ruby/object:Gem::Requirement
+  requirement: &70226951956180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2156385220
+  version_requirements: *70226951956180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156384760 !ruby/object:Gem::Requirement
+  requirement: &70226951954820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2156384760
+  version_requirements: *70226951954820
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2156384300 !ruby/object:Gem::Requirement
+  requirement: &70226951953100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2156384300
+  version_requirements: *70226951953100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156383840 !ruby/object:Gem::Requirement
+  requirement: &70226951951360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *2156383840
+  version_requirements: *70226951951360
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156383380 !ruby/object:Gem::Requirement
+  requirement: &70226951950300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156383380
+  version_requirements: *70226951950300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156382920 !ruby/object:Gem::Requirement
+  requirement: &70226951949340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *2156382920
+  version_requirements: *70226951949340
 description: Simple view helpers for your layouts
 email:
 - steve.agalloco@gmail.com