fancyviews 1.1 → 1.3

data/Rakefile

@@ -1,9 +1,11 @@
 task :default => :test
 
-desc "Run example test app"
-task :test do
-  dir = File.dirname(__FILE__)
-  system "cd #{dir} && ruby test/test.rb -p 2222"
+%w(html4 html5).each do |version|
+  desc "Run example test app for #{version}"
+  task "test_#{version}" do
+    dir = File.dirname(__FILE__)
+    system "cd #{dir} && ruby test/#{version}.rb -p 2222"
+  end
 end
 
 begin

data/fancyviews.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "fancyviews"
   s.rubyforge_project = 'fancyviews'
-  s.version  = "1.1"
+  s.version  = "1.3"
   s.summary  = "Fancy Views"
   s.description  = "Fancy Views"
   s.email    = "myles@myles.id.au"
@@ -12,7 +12,8 @@ Gem::Specification.new do |s|
 Rakefile
 fancyviews.gemspec
 lib/sinatra/fancyviews.rb
-test/test.rb
+test/html4.rb
+test/html5.rb
 ]
   s.add_dependency("sinatra", [">= 0.9.1.1"])
   s.add_dependency("haml", [">= 2.2"])

data/lib/sinatra/fancyviews.rb

@@ -78,16 +78,31 @@ module Sinatra
         eng = Sass::Engine.new(imported + "\n" + sass, :attribute_syntax => :normal)
         "\n/* -- #{name} -- */\n" + eng.render
       end.join
-      
-      capture_haml { haml_tag(:style, rendered_styles) }.strip
+
+      style_tag(rendered_styles, options[:media])
     end
-    
+
+    def style_tag(styles, media=nil)
+      capture_haml do
+        haml_tag(:style, styles, :type => ("text/css" if haml_format != :html5), :media => media)
+      end.strip
+    end
+
     # renders all the scripts captured by the :script filter
     def scripts
-      scripts = fancyviews.included_scripts.map do |name, js|
+      script_tag(fancyviews.included_scripts.map do |name, js|
         "\n/* -- #{name} -- */\n" + js
-      end.join
-      capture_haml { haml_tag(:script, scripts) }.strip
+      end.join)
+    end
+    
+    def script_tag(scripts)
+      capture_haml do
+        haml_tag(:script, scripts, :type => ("text/javascript" if haml_format != :html5))
+      end.strip
+    end
+
+    def haml_format
+      (options.haml && options.haml[:format]) || :xhtml
     end
     
     def fancyviews

data/test/html4.rb

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'sinatra'
+require File.dirname(__FILE__) + '/../lib/sinatra/fancyviews'
+
+set :haml, :format => :html4
+
+get('/') { page :home }
+
+__END__
+
+@@layout
+!!!
+%head
+  %title FancyTest
+  = styles :media => "screen, projection"
+%body
+  = yield
+  = scripts
+
+@@home
+:style
+  body
+    :background-color goldenrod
+
+:script
+  if (document.getElementsByTagName('style')[0].type != "text/css")
+    alert("Style tag doesn't have type = 'text/css'");
+  else if (document.getElementsByTagName('style')[0].media != "screen, projection")
+    alert("Style tag doesn't have media = 'screen, projection'");
+  else if (document.getElementsByTagName('script')[0].type != "text/javascript")
+    alert("Script tag doesn't have type = 'text/javascript'");
+  else
+    alert("All good!");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fancyviews
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.3"
 platform: ruby
 authors: 
 - Myles Byrne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 +10:00
+date: 2009-09-03 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,8 @@ files:
 - Rakefile
 - fancyviews.gemspec
 - lib/sinatra/fancyviews.rb
-- test/test.rb
+- test/html4.rb
+- test/html5.rb
 has_rdoc: false
 homepage: 
 post_install_message: