tophat 1.7.1 → 1.7.2

data/lib/tophat/opengraph.rb

@@ -16,22 +16,18 @@ module TopHat
       end
 
       def app_id
-        output = @app_id ? tag(:meta, :property => 'fb:app_id', :content => @app_id) : ""
-        output << '\n' unless output.blank?
-        output
+        tag(:meta, :property => 'fb:app_id', :content => @app_id) + "\n".html_safe if @app_id
       end
 
       def admins
-        output = @admins ? tag(:meta, :property => 'fb:admins', :content => [*@admins].join(',')) : ""
-        output << '\n' unless output.blank?
-        output
+        tag(:meta, :property => 'fb:admins', :content => [*@admins].join(',')) + "\n".html_safe if @admins
       end
 
       def render_graph_data
-        output = ""
+        output = ActiveSupport::SafeBuffer.new
         @graph_data.each do |key, value|
           output << tag(:meta, :property => "og:#{key}", :content => value)
-          output << '\n' if @graph_data.size > 1
+          output << "\n".html_safe if @graph_data.size > 1
         end
         output
       end
@@ -96,7 +92,7 @@ module TopHat
       else
         TopHat.current['open_graph_generator'] ||= OpenGraphGenerator.new
         TopHat.current['open_graph_generator'].merge(TopHat.current['open_graph_defaults'])
-        output = ""
+        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?

data/lib/tophat/stylesheet.rb

@@ -76,9 +76,11 @@ module TopHat
 
         browser_version = version.blank? ? "" : " #{version}"
 
-        output = "<!--[if #{operator}#{browser}#{browser_version}]>\n"
+        output = ActiveSupport::SafeBuffer.new("<!--[if #{operator}#{browser}#{browser_version}]>")
+        output << "\n".html_safe
         output << yield if block_given?
-        output << "\n<![endif]-->"
+        output << "\n".html_safe
+        output << "<![endif]-->".html_safe
       end
 
   end

data/lib/tophat/twitter_card.rb

@@ -12,13 +12,13 @@ module TopHat
       end
 
       def render
-        output = ""
+        output = ActiveSupport::SafeBuffer.new
         output << tag(:meta, :name => 'twitter:card', :value => @type)
         @card_data.each do |key, value|
-          output << '\n'
+          output << "\n".html_safe
           output << tag(:meta, :name => "twitter:#{key}", :value => value)
         end
-        output << '\n' unless @card_data.empty?
+        output << "\n".html_safe unless @card_data.empty?
         output
       end
 

data/lib/tophat/version.rb

@@ -1,3 +1,3 @@
 module TopHat
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

data/spec/spec_helper.rb

@@ -19,36 +19,3 @@ RSpec.configure do |config|
     TopHat.reset
   end
 end
-
-require 'action_controller/vendor/html-scanner'
-
-module HTML
-  class Node
-    def ==(node)
-      return false unless self.class == node.class && children.size == node.children.size
-
-      equivalent = true
-
-      children.size.times do |i|
-        equivalent &&= children.include?(node.children[i])
-      end
-
-      equivalent
-    end
-  end
-end
-
-RSpec::Matchers.define :be_dom_equivalent_to do |expected|
-  match do |actual|
-    expected_dom = HTML::Document.new(expected).root
-    actual_dom   = HTML::Document.new(actual).root
-
-    expected_dom == actual_dom
-  end
-
-  failure_message_for_should do |actual|
-    "expected #{actual} would be dom equivalent to #{expected}"
-  end
-
-end
-

data/spec/tophat/opengraph_helper_spec.rb

@@ -40,14 +40,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 be_dom_equivalent_to('<meta content="123,124" property="fb:admins" />\n')
+        @template.opengraph.should 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 be_dom_equivalent_to('<meta content="123,124" property="fb:admins" />\n')
+        @template.opengraph.should include('<meta content="123,124" property="fb:admins" />')
       end
     end
   end
@@ -55,19 +55,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 be_dom_equivalent_to('<meta content="MyApp" property="fb:app_id" />\n')
+      @template.opengraph.should include('<meta content="MyApp" property="fb:app_id" />')
     end
   end
 
   context "additional open graph properties" do
     it "generates opengraph meta tags" do
       @template.opengraph { title 'The Great Gatsby' }
-      @template.opengraph.should be_dom_equivalent_to('<meta content="The Great Gatsby" property="og:title" />')
+      @template.opengraph.should include('<meta content="The Great Gatsby" property="og:title" />')
     end
 
     it "allows use of the tag 'type'" do
       @template.opengraph { type 'sports_team' }
-      @template.opengraph.should be_dom_equivalent_to('<meta content="sports_team" property="og:type" />')
+      @template.opengraph.should include('<meta content="sports_team" property="og:type" />')
     end
 
     it "supports multiple tags" do
@@ -75,7 +75,10 @@ describe TopHat::OpenGraphHelper do
         title 'Austin Powers: International Man of Mystery'
         type 'movie'
       }
-      @template.opengraph.should be_dom_equivalent_to('<meta content="movie" property="og:type" />\n<meta content="Austin Powers: International Man of Mystery" property="og:title" />\n')
+      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" />')
     end
 
   end
@@ -86,7 +89,12 @@ describe TopHat::OpenGraphHelper do
         title 'Rain Man'
         type 'movie'
       }
-      @template.opengraph.should be_dom_equivalent_to('<meta content="MyApp" property="fb:app_id" />\n<meta content="123,1234" property="fb:admins" />\n<meta content="movie" property="og:type" />\n<meta content="Rain Man" property="og:title" />\n')
+      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" />')
     end
 
     it "generates all tags when app_id and admins passed as part of rendering" do
@@ -94,7 +102,12 @@ describe TopHat::OpenGraphHelper do
         title 'Rain Man'
         type 'movie'
       }
-      @template.opengraph(:app_id => 'MyApp', :admins => [123, 1234]).should be_dom_equivalent_to('<meta content="MyApp" property="fb:app_id" />\n<meta content="123,1234" property="fb:admins" />\n<meta content="movie" property="og:type" />\n<meta content="Rain Man" property="og:title" />\n')
+      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" />')
     end
   end
 
@@ -104,8 +117,10 @@ describe TopHat::OpenGraphHelper do
         graph.title 'Rain Man'
         graph.type 'movie'
       }
+      output = @template.opengraph
 
-      @template.opengraph.should be_dom_equivalent_to('<meta content="movie" property="og:type" />\n<meta content="Rain Man" property="og:title" />\n')
+      output.should include('<meta content="movie" property="og:type" />')
+      output.should include('<meta content="Rain Man" property="og:title" />')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tophat
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2153060100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153060100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153053760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153053760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153053300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153053300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153052840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153052840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2153052420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153052420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153051980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153051980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153051440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153051440
+  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: &2153051020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153051020
+  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
@@ -148,15 +188,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1182497879789537042
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1182497879789537042
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple view helpers for your layouts