tophat 1.6.1 → 1.7.0

data/lib/tophat.rb

@@ -1,24 +1,33 @@
 require 'action_view'
+require 'tophat/html'
+require 'tophat/title'
+require 'tophat/meta'
+require 'tophat/stylesheet'
+require 'tophat/robots'
+require 'tophat/opengraph'
+require 'tophat/twitter_card'
 
 module TopHat
   extend self
 
-  def current
-    return Thread.current[:tophat] if Thread.current[:tophat]
+  require "tophat/railtie" if defined?(::Rails)
 
-    reset
+  def current
+    Thread.current[:tophat] ||= {}
   end
 
   def reset
     Thread.current[:tophat] = {}
   end
 
-end
+  def setup
+    ActionView::Base.send :include, TopHat::HtmlHelper
+    ActionView::Base.send :include, TopHat::TitleHelper
+    ActionView::Base.send :include, TopHat::MetaHelper
+    ActionView::Base.send :include, TopHat::StylesheetHelper
+    ActionView::Base.send :include, TopHat::RobotsHelper
+    ActionView::Base.send :include, TopHat::OpenGraphHelper
+    ActionView::Base.send :include, TopHat::TwitterCardHelper
+  end
 
-require 'tophat/html'
-require 'tophat/title'
-require 'tophat/meta'
-require 'tophat/stylesheet'
-require 'tophat/robots'
-require 'tophat/opengraph'
-require 'tophat/twitter_card'
+end

data/lib/tophat/html.rb

@@ -12,10 +12,26 @@ module TopHat
         end
       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(' ')
+        end
+      end
+
       tag(:html, options, true)
     end
 
   end
 end
-
-ActionView::Base.send :include, TopHat::HtmlHelper

data/lib/tophat/meta.rb

@@ -1,6 +1,19 @@
 module TopHat
   module MetaHelper
 
+    # Meta Tag helper
+    def meta_tag(options, open=false, escape=true)
+      tag(:meta, options, open, escape)
+    end
+
+    def charset(charset, options={})
+      meta_tag(options.merge(:charset => charset), true)
+    end
+
+    def viewport(viewport, options={})
+      meta_tag(options.merge(:name => 'viewport', :content => viewport), true)
+    end
+
     # page descriptions
     # <meta name="description" content="Description goes here." />
     def description(options={})
@@ -9,10 +22,11 @@ module TopHat
         TopHat.current['description'] = options
 
       else
+        default_description = options.delete(:default)
         options[:name] = 'description'
-        options[:content] = TopHat.current['description'] || options.delete(:default)
+        options[:content] = TopHat.current['description'] || default_description
 
-        tag(:meta, options) if options[:content]
+        meta_tag(options) if options[:content]
       end
     end
 
@@ -39,10 +53,8 @@ module TopHat
         display_keywords += default_keywords if options.delete(:merge_default) == true
 
         options.merge!(:content => display_keywords.uniq.join(', ').squeeze(' '))
-        tag(:meta, options) if display_keywords.any?
+        meta_tag(options) if display_keywords.any?
       end
     end
   end
 end
-
-ActionView::Base.send :include, TopHat::MetaHelper

data/lib/tophat/opengraph.rb

@@ -106,5 +106,3 @@ module TopHat
 
   end
 end
-
-ActionView::Base.send :include, TopHat::OpenGraphHelper

data/lib/tophat/railtie.rb

@@ -0,0 +1,20 @@
+require 'tophat'
+require 'tophat/reset'
+require 'rails'
+
+module TopHat
+  class Railtie < Rails::Railtie
+
+    initializer "tophat.view_helpers" do |app|
+      TopHat.setup
+    end
+
+    # Clear the identity map after each request
+    initializer "tophat.reset" do |app|
+      ActiveSupport.on_load(:action_controller) do
+        include(TopHat::Reset)
+      end
+    end
+
+  end
+end

data/lib/tophat/reset.rb

@@ -0,0 +1,14 @@
+module TopHat
+  module Reset
+
+    def self.included(base)
+      base.append_before_filter :reset_tophat
+    end
+
+    def reset_tophat
+      puts 'i am getting reset'
+      TopHat.reset
+    end
+
+  end
+end

data/lib/tophat/robots.rb

@@ -19,5 +19,3 @@ module TopHat
 
   end
 end
-
-ActionView::Base.send :include, TopHat::RobotsHelper

data/lib/tophat/stylesheet.rb

@@ -83,5 +83,3 @@ module TopHat
 
   end
 end
-
-ActionView::Base.send :include, TopHat::StylesheetHelper

data/lib/tophat/title.rb

@@ -67,5 +67,3 @@ module TopHat
       end
   end
 end
-
-ActionView::Base.send :include, TopHat::TitleHelper

data/lib/tophat/twitter_card.rb

@@ -51,5 +51,3 @@ module TopHat
     end
   end
 end
-
-ActionView::Base.send :include, TopHat::TwitterCardHelper

data/lib/tophat/version.rb

@@ -1,3 +1,3 @@
 module TopHat
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
 end

data/spec/spec_helper.rb

@@ -11,6 +11,10 @@ require 'rails/all'
 
 
 RSpec.configure do |config|
+  config.before(:suite) do
+    TopHat.setup
+  end
+
   config.after(:each) do
     TopHat.reset
   end

data/spec/tophat/html_helper_spec.rb

@@ -15,15 +15,43 @@ describe TopHat::HtmlHelper do
       output.should eq('<html version="123">')
     end
 
-    it 'accepts xmlns in an options hash' do
-      output = @template.html_tag(:xmlns => 'http://someurl.com')
-      output.should eq('<html xmlns="http://someurl.com">')
+    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">')
+      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/">')
+      end
     end
 
-    it 'accepts an array of xmlns including prefixes' 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/">')
+    context 'prefixes' do
+      it 'accepts prefixes passed as strings' do
+        output = @template.html_tag(:prefix => 'ohai')
+        output.should 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#">')
+      end
+
+      it 'accepts prefixes passed as an array of hashes' do
+        prefixes = [
+          { :prefix => 'og', :url => 'http://ogp.me/ns#' },
+          { :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#">')
+      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#">')
+      end
     end
 
   end

data/spec/tophat/meta_helper_spec.rb

@@ -6,6 +6,24 @@ describe TopHat::MetaHelper do
     @template = ActionView::Base.new
   end
 
+  describe "charset" do
+    it 'renders a meta tag with a charset' do
+      @template.charset('utf-8').should 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">')
+    end
+  end
+
+  describe "meta_tag" do
+    it 'renders meta_tags' do
+      @template.meta_tag(:charset => 'utf-8').should eq('<meta charset="utf-8" />')
+    end
+  end
+
   describe "keywords" do
     context "defined as an array" do
       before do
@@ -67,6 +85,11 @@ describe TopHat::MetaHelper do
     it "returns nil when no default is configured and no description is defined" do
       @template.description.should 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" />')
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tophat
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000Z
+date: 2012-07-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70282580984540 !ruby/object:Gem::Requirement
+  requirement: &70142323594740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70282580984540
+  version_requirements: *70142323594740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70282580982080 !ruby/object:Gem::Requirement
+  requirement: &70142323593260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282580982080
+  version_requirements: *70142323593260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70282580979740 !ruby/object:Gem::Requirement
+  requirement: &70142323591560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282580979740
+  version_requirements: *70142323591560
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70282580978720 !ruby/object:Gem::Requirement
+  requirement: &70142323590340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282580978720
+  version_requirements: *70142323590340
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70282580975360 !ruby/object:Gem::Requirement
+  requirement: &70142323588840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282580975360
+  version_requirements: *70142323588840
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70282580971680 !ruby/object:Gem::Requirement
+  requirement: &70142323587760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282580971680
+  version_requirements: *70142323587760
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70282580969740 !ruby/object:Gem::Requirement
+  requirement: &70142323586680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70282580969740
+  version_requirements: *70142323586680
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70282580968820 !ruby/object:Gem::Requirement
+  requirement: &70142323585960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282580968820
+  version_requirements: *70142323585960
 description: Simple view helpers for your layouts
 email:
 - steve.agalloco@gmail.com
@@ -119,6 +119,8 @@ files:
 - lib/tophat/html.rb
 - lib/tophat/meta.rb
 - lib/tophat/opengraph.rb
+- lib/tophat/railtie.rb
+- lib/tophat/reset.rb
 - lib/tophat/robots.rb
 - lib/tophat/stylesheet.rb
 - lib/tophat/title.rb