mercury 0.9.9 → 0.9.10

data/lib/mercury/helpers.rb

@@ -25,20 +25,16 @@ module Sinatra
     end
     
 
-    def css(cssfile)
-      render_script open_file(find_file(cssfile, CSS)), 'css'    
+    def css(cssfile, mediatype="all")
+      render_style open_file(find_file(cssfile, CSS)), mediatype
     end
 
-    def sass(sassfile)
-      ["<style type='text/css'>",
-        Sass::Engine.new(open_file(find_file(sassfile, SASS))).render, 
-        "</style>\n"].join("\n")
+    def sass(sassfile, mediatype="all")
+      render_style Sass::Engine.new(open_file(find_file(sassfile, SASS))).render, mediatype
     end
 
-    def scss(scssfile)
-      ["<style type='text/css'>",
-        Sass::Engine.new(open_file(find_file(scssfile, SCSS)), :syntax => :scss).render, 
-        "</style>\n"].join("\n")
+    def scss(scssfile, mediatype="all")
+      render_style Sass::Engine.new(open_file(find_file(scssfile, SCSS)), :syntax => :scss).render, mediatype
     end
 
     def javascript(jsfile)
@@ -61,6 +57,13 @@ module Sinatra
         "</script>\n"].join("\n")      
     end
     
+    def render_style(text, mediatype="all")
+      ["<style type='text/css' media='#{mediatype}' >",
+        text,
+        "</style>\n"].join("\n")      
+    end
+    
+    
   
     def find_file(filename, ext)
       Dir.glob(File.join(options.views, "**/*.#{ext}")).select { |extfile| extfile.downcase =~ /\/#{filename.to_s.downcase}.#{ext}$/ }.first

data/spec/lib/mercury/helpers_spec.rb

@@ -8,10 +8,18 @@ describe "helpers" do
     Mercury
   end
   
+  before(:all) do
+    app.extend(Sinatra::MercuryHelpers)
+  end
+  
+  
   it "should return js file" do
-    #puts app.render_script("test", "javascript")
-    #app.css(:hello).should =~ /^<script(.*)<\/script>$/
+    app.render_script("Hello World", "javascript").should == "<script type='text/javascript'>\nHello World\n</script>\n"
   end
 
+  it "should return style for all media" do
+    app.render_style("Hello World").should == "<style type='text/css' media='all' >\nHello World\n</style>\n"    
+  end
+  
 
 end

data/spec/lib/mercury/images_spec.rb

@@ -11,7 +11,7 @@ describe "images" do
   it "should return gif" do
     File.stub!(:open).and_return('foobar')
     get "/hello.gif"
-    puts last_response.body.should == 'foobar'
+    last_response.body.should == 'foobar'
   end
   
   it "should return correct file content type for gif" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mercury
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Tom Wilson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -04:00
+date: 2010-04-12 00:00:00 -04:00
 default_executable: mercury
 dependencies: 
 - !ruby/object:Gem::Dependency