sinatra-ie6nomore 0.1.2 → 0.1.3

data/Rakefile

@@ -10,8 +10,8 @@ begin
     gem.email = "kematzy@gmail.com"
     gem.homepage = "http://github.com/kematzy/sinatra-ie6nomore"
     gem.authors = ["kematzy"]
-    gem.add_dependency('sinatra', '>= 0.9.4')
-    gem.add_development_dependency('spec', '>= 1.2.7')
+    gem.add_dependency('sinatra', '>= 1.0')
+    gem.add_development_dependency('rspec', '>= 1.3.0')
     gem.add_development_dependency('rspec_hpricot_matchers', '>= 1.0.0')
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/sinatra/ie6nomore.rb

@@ -169,7 +169,7 @@ module Sinatra
   # 
   module IE6NoMore
     
-    VERSION = '0.1.2' unless const_defined?(:VERSION)
+    VERSION = '0.1.3' unless const_defined?(:VERSION)
     def self.version; "Sinatra::IE6NoMore v#{VERSION}"; end
     
     ##
@@ -229,24 +229,28 @@ module Sinatra
         # set the localisation 
         i18n = localizations[o[:locale].to_s]
         
-        html = '' 
-        html << %Q[<!--[if lt IE 7]>\n] unless o[:debug] # == true
-        html << %Q[<div style="border: #{o[:border]}; background: #{o[:background]}; text-align: center; clear: both; height: 75px; position: relative;">\n]
-        html << %Q[ <div style="position: absolute; right: 3px; top: 3px; font-family: courier new; font-weight: bold;"><a href="#" onclick="javascript:this.parentNode.parentNode.style.display='none'; return false;"><img src="#{o[:img_host]}ie6nomore-cornerx.jpg" style="border: none;" alt="#{i18n['close']}"/></a></div>\n]
-        html << %Q[  <div style="width: 640px; margin: 0 auto; text-align: left; padding: 0; overflow: hidden; color: #{o[:text_color]};">\n]
-        html << %Q[   <div style="width: 75px; float: left;"><img src="#{o[:img_host]}ie6nomore-warning.jpg" alt="Warning!"/></div>\n]
-        html << %Q[   <div style="width: 275px; float: left; font-family: Arial, sans-serif;">\n]
-        html << %Q[   <div style="font-size: 14px; font-weight: bold; margin-top: 12px;">#{i18n['header']}</div>\n]
-        html << %Q[   <div style="font-size: 12px; margin-top: 6px; line-height: 12px;">#{i18n['sub']}</div>\n]
-        html << %Q[  </div>\n]
-        html << %Q[  <div style="width: 75px; float: left;"><a href="#{i18n['ff_url']}" target="_blank"><img src="#{o[:img_host]}ie6nomore-firefox.jpg" style="border: none;" alt="#{i18n['get']} Firefox 3.5"/></a></div>\n]
-        html << %Q[  <div style="width: 75px; float: left;"><a href="#{i18n['ie_url']}" target="_blank"><img src="#{o[:img_host]}ie6nomore-ie8.jpg" style="border: none;" alt="#{i18n['get']} Internet Explorer 8"/></a></div>\n]
-        html << %Q[  <div style="width: 73px; float: left;"><a href="#{i18n['safari_url']}" target="_blank"><img src="#{o[:img_host]}ie6nomore-safari.jpg" style="border: none;" alt="#{i18n['get']} Safari 4"/></a></div>\n]
-        html << %Q[  <div style="float: left;"><a href="#{i18n['chrome_url']}" target="_blank"><img src="#{o[:img_host]}ie6nomore-chrome.jpg" style="border: none;" alt="#{i18n['get']} Google Chrome"/></a></div>\n]
-        html << %Q[ </div>\n]
-        html << %Q[</div>\n]
-        html << %Q[<![endif]-->\n] unless o[:debug] # == true
-        html
+        start_tag = o[:debug] ? "<!-- DEBUG [if lt IE 7] -->" :  "<!--[if lt IE 7]>"
+        close_tag = o[:debug] ? "<!-- DEBUG [endif] -->" : "<![endif]-->"
+        
+        (<<-CODE).gsub(/^ {4}/, '')
+
+        #{start_tag}
+        <div id="ie6nomore" style="border: #{o[:border]}; background: #{o[:background]}; text-align: center; clear: both; height: 75px; position: relative;">
+         <div style="position: absolute; right: 3px; top: 3px; font-family: courier new; font-weight: bold;"><a href="#" onclick="javascript:this.parentNode.parentNode.style.display='none'; return false;"><img src="#{o[:img_host]}ie6nomore-cornerx.jpg" style="border: none;" alt="#{i18n['close']}"/></a></div>
+          <div style="width: 640px; margin: 0 auto; text-align: left; padding: 0; overflow: hidden; color: #{o[:text_color]};">
+           <div style="width: 75px; float: left;"><img src="#{o[:img_host]}ie6nomore-warning.jpg" alt="Warning!"/></div>
+           <div style="width: 275px; float: left; font-family: Arial, sans-serif;">
+           <div style="font-size: 14px; font-weight: bold; margin-top: 12px;">#{i18n['header']}</div>
+           <div style="font-size: 12px; margin-top: 6px; line-height: 12px;">#{i18n['sub']}</div>
+          </div>
+          <div style="width: 75px; float: left;"><a href="#{i18n['ff_url']}" target="_blank"><img src="#{o[:img_host]}ie6nomore-firefox.jpg" style="border: none;" alt="#{i18n['get']} Firefox 3.5"/></a></div>
+          <div style="width: 75px; float: left;"><a href="#{i18n['ie_url']}" target="_blank"><img src="#{o[:img_host]}ie6nomore-ie8.jpg" style="border: none;" alt="#{i18n['get']} Internet Explorer 8"/></a></div>
+          <div style="width: 73px; float: left;"><a href="#{i18n['safari_url']}" target="_blank"><img src="#{o[:img_host]}ie6nomore-safari.jpg" style="border: none;" alt="#{i18n['get']} Safari 4"/></a></div>
+          <div style="float: left;"><a href="#{i18n['chrome_url']}" target="_blank"><img src="#{o[:img_host]}ie6nomore-chrome.jpg" style="border: none;" alt="#{i18n['get']} Google Chrome"/></a></div>
+         </div>
+        </div>
+        #{close_tag}
+        CODE
       end
       
       

data/sinatra-ie6nomore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-ie6nomore}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kematzy"]
-  s.date = %q{2010-03-01}
+  s.date = %q{2010-08-01}
   s.description = %q{A Sinatra Extension that shows an 'IE6 No More' div on the page for IE6 browsers, making the eradication of IE6 easier.}
   s.email = %q{kematzy@gmail.com}
   s.extra_rdoc_files = [
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kematzy/sinatra-ie6nomore}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Sinatra Extension that shows an 'IE6 No More' div on the page for IE6 browsers, making the eradication of IE6 easier.}
   s.test_files = [
     "spec/sinatra/ie6nomore_spec.rb",
@@ -50,18 +50,18 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_development_dependency(%q<spec>, [">= 1.2.7"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_development_dependency(%q<rspec_hpricot_matchers>, [">= 1.0.0"])
     else
-      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_dependency(%q<spec>, [">= 1.2.7"])
+      s.add_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_dependency(%q<rspec_hpricot_matchers>, [">= 1.0.0"])
     end
   else
-    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-    s.add_dependency(%q<spec>, [">= 1.2.7"])
+    s.add_dependency(%q<sinatra>, [">= 1.0"])
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
     s.add_dependency(%q<rspec_hpricot_matchers>, [">= 1.0.0"])
   end
 end

data/spec/sinatra/ie6nomore_spec.rb

@@ -38,7 +38,7 @@ describe "Sinatra" do
           # remove the comments so we can test the code output
           markup = remove_enclosing_html_comments(body)
           # we get the border and background through OK
-          markup.should match(/<div style="border: 1px solid #F7941D; background: #FEEFDA;/)
+          markup.should match(/<div id="ie6nomore" style="border: 1px solid #F7941D; background: #FEEFDA;/)
           # we have a warning image
           markup.should have_tag('div[@style=width: 75px; float: left;] > img') do |img|
             img.attributes['src'].should == '/images/ie6nomore/ie6nomore-warning.jpg'
@@ -78,11 +78,11 @@ describe "Sinatra" do
         end
         
         it "should set the border style attribute" do 
-          @markup.should match(/<div style="border: 10px dashed #fff; background: yellow;/)
+          @markup.should match(/<div id="ie6nomore" style="border: 10px dashed #fff; background: yellow;/)
         end
         
         it "should set the background style attribute" do 
-          @markup.should match(/<div style="(.*)background: yellow;/)
+          @markup.should match(/<div id="ie6nomore" style="(.*)background: yellow;/)
         end
         
         it "should set the text color style attribute" do 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-ie6nomore
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - kematzy
@@ -14,44 +15,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 +08:00
+date: 2010-08-01 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: spec
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
-        - 2
-        - 7
-        version: 1.2.7
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec_hpricot_matchers
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -97,23 +103,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Sinatra Extension that shows an 'IE6 No More' div on the page for IE6 browsers, making the eradication of IE6 easier.