tophat 2.1.0 → 2.2.0

data/.travis.yml

@@ -1,13 +1,13 @@
+bundler_args: --without development
 language: ruby
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
 rvm:
+  - rbx-18mode
+  - rbx-19mode
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby
-  - rbx
-  - ree
-  - ruby-head
+  - 2.0.0
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: 1.8.7

data/Gemfile

@@ -1,3 +1,18 @@
 source 'https://rubygems.org'
 
+gem 'rake'
+gem 'yard'
+
+group :development do
+  gem 'kramdown'
+  gem 'guard-rspec'
+end
+
+group :test do
+  gem 'rspec', '>= 2.11'
+  gem 'simplecov', :require => false
+  gem 'rails', '>= 3.0.0', '< 4.0.0'
+  gem 'webmock'
+end
+
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# 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]
+# 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]
 
 
 [travis]: http://travis-ci.org/spagalloco/tophat
@@ -13,7 +13,7 @@ Just add it to your Gemfile:
 
     gem 'tophat'
 
-Note: TopHat is Rails 3.0+ compatible.
+Note: TopHat is compatible with Rails 3.0+.
 
 ## Changes in 2.1
 

data/lib/tophat/meta.rb

@@ -14,6 +14,10 @@ module TopHat
       meta_tag(options.merge(:name => 'viewport', :content => viewport), true)
     end
 
+    def itemprop(name, value)
+      meta_tag(:itemprop => name, :content => value)
+    end
+
     # page descriptions
     # <meta name="description" content="Description goes here." />
     def description(options={})

data/lib/tophat/opengraph.rb

@@ -12,7 +12,9 @@ module TopHat
         yield self if block_given?
       end
 
-      def merge(options={})
+      def merge(options={}, &block)
+        yield self if block_given?
+
         @app_id = options.delete(:app_id) if options && options.has_key?(:app_id)
         @admins = options.delete(:admins) if options && options.has_key?(:admins)
       end
@@ -85,15 +87,9 @@ module TopHat
     end
 
     def opengraph(options=nil, &block)
-      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'])
-        TopHat.current['open_graph_generator'].to_html
-      end
+      TopHat.current['open_graph_generator'] ||= OpenGraphGenerator.new(options)
+      TopHat.current['open_graph_generator'].merge(options, &block)
+      TopHat.current['open_graph_generator'].to_html
     end
 
   end

data/lib/tophat/robots.rb

@@ -3,13 +3,21 @@ module TopHat
 
     DEFAULT_DESCRIPTOR = 'robots'
 
-    def noindex(descriptor=DEFAULT_DESCRIPTOR)
-      descriptor ||= DEFAULT_DESCRIPTOR
+    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')
     end
 
-    def nofollow(descriptor=DEFAULT_DESCRIPTOR)
-      descriptor ||= DEFAULT_DESCRIPTOR
+    def nofollow(descriptor=nil)
+      if descriptor
+        TopHat.current['nofollow'] = descriptor || DEFAULT_DESCRIPTOR
+      else
+        descriptor = TopHat.current['nofollow'] || DEFAULT_DESCRIPTOR
+      end
       tag(:meta, :name => descriptor, :content => 'nofollow')
     end
 

data/lib/tophat/twitter_card.rb

@@ -16,9 +16,11 @@ module TopHat
       def to_html
         output = ActiveSupport::SafeBuffer.new
         output << tag(:meta, :name => 'twitter:card', :value => @type)
+        @card_data = @card_data.delete_if { |k, v| v.nil? }
         @card_data.each do |key, value|
+          tag_name = "twitter:#{key}".squeeze(":")
           output << "\n".html_safe
-          output << tag(:meta, :name => "twitter:#{key}", :value => value)
+          output << tag(:meta, :name => tag_name, :value => value)
         end
         output << "\n".html_safe unless @card_data.empty?
         output
@@ -40,13 +42,12 @@ module TopHat
     end
 
     def twitter_card(type=nil, &block)
-      if type.nil?
-        if TopHat.current['twitter_card']
-          TopHat.current['twitter_card'].to_html
-        end
-      else
+      if TopHat.current['twitter_card'].nil?
         TopHat.current['twitter_card'] = TwitterCardGenerator.new(type, &block)
+      else
+        TopHat.current['twitter_card'].add_nested_attributes('', &block)
       end
+      TopHat.current['twitter_card'].to_html
     end
   end
 end

data/lib/tophat/version.rb

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

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
-require 'simplecov'
-SimpleCov.start do
-  add_group 'TopHat', 'lib/tophat'
-  add_group 'Specs', 'spec'
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '.bundle'
+    add_group 'TopHat', 'lib/tophat'
+    add_group 'Specs', 'spec'
+  end
 end
 
-require File.expand_path('../../lib/tophat', __FILE__)
-
+require 'tophat'
 require 'rspec'
 require 'rails/all'
 

data/spec/tophat/meta_helper_spec.rb

@@ -92,4 +92,10 @@ describe TopHat::MetaHelper do
     end
   end
 
-end
+  describe ".itemprop" do
+    it "renders an itemprop meta tag" do
+      @template.itemprop(:rating, '1').should == "<meta content=\"1\" itemprop=\"rating\" />"
+    end
+  end
+
+end

data/spec/tophat/opengraph_helper_spec.rb

@@ -85,6 +85,19 @@ describe TopHat::OpenGraphHelper do
       output.should include('<meta content="Austin Powers: International Man of Mystery" property="og:title" />')
     end
 
+    it 'supports default tags' do
+      @template.opengraph do |og|
+        og.title @title
+        og.type @type
+      end
+      output = @template.opengraph do |og|
+        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" />')
+    end
   end
 
   context "combined usage" do
@@ -113,6 +126,22 @@ describe TopHat::OpenGraphHelper do
       output.should include('<meta content="movie" property="og:type" />')
       output.should include('<meta content="Rain Man" property="og:title" />')
     end
+
+    it 'supports default tags' do
+      @template.opengraph do |og|
+        og.title @title
+        og.type @type
+      end
+      output = @template.opengraph(:app_id => 'MyApp', :admins => [123, 1234]) do |og|
+        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" />')
+    end
   end
 
-end
+end

data/spec/tophat/robots_helper_spec.rb

@@ -18,6 +18,11 @@ describe TopHat::RobotsHelper do
     it "generates a default tag when passed nil" do
       @template.nofollow(nil).should == "<meta content=\"nofollow\" name=\"robots\" />"
     end
+
+    it 'stores a descriptor' do
+      @template.nofollow('twitterbot')
+      @template.nofollow.should == "<meta content=\"nofollow\" name=\"twitterbot\" />"
+    end
   end
 
   describe ".noindex" do
@@ -32,6 +37,11 @@ describe TopHat::RobotsHelper do
     it "generates a default tag when passed nil" do
       @template.noindex(nil).should == "<meta content=\"noindex\" name=\"robots\" />"
     end
+
+    it 'stores a descriptor' do
+      @template.noindex('twitterbot')
+      @template.noindex.should == "<meta content=\"noindex\" name=\"twitterbot\" />"
+    end
   end
 
   describe ".canonical" do
@@ -48,4 +58,4 @@ describe TopHat::RobotsHelper do
     end
   end
 
-end
+end

data/spec/tophat/twitter_card_helper_spec.rb

@@ -61,4 +61,21 @@ describe TopHat::TwitterCardHelper do
     output.should include('<meta name="twitter:player:stream:content_type" value="123" />')
   end
 
-end
+  it 'supports default tags' do
+    @template.twitter_card('player') do |card|
+      card.player do |player|
+        player.embed 'https://example.com/embed/a'
+      end
+    end
+    output = @template.twitter_card('player') do |card|
+      card.player do |player|
+        player.site 'https://example.com'
+      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" />')
+  end
+
+end

data/tophat.gemspec

@@ -14,14 +14,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('actionpack', '>= 3.0.0')
 
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec')
-  s.add_development_dependency('yard')
-  s.add_development_dependency('rdiscount')
-  s.add_development_dependency('simplecov')
-  s.add_development_dependency('rails', '>= 3.0.0')
-  s.add_development_dependency('guard-rspec')
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tophat
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -27,118 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Simple view helpers for your layouts
 email:
 - steve.agalloco@gmail.com
@@ -190,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1469491919120880781
+      hash: -2300101656837364012
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,10 +87,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1469491919120880781
+      hash: -2300101656837364012
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple view helpers for your layouts