serve 0.10.0 → 0.10.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.10.1
+
+* Add handling for .SCSS files with HAML/SASS 3.0 [nathany]
+
 == 0.10.0
 
 * Added additional view helper methods and harmonized the API a bit [aiwilliams]

data/QUICKSTART.rdoc

@@ -16,7 +16,7 @@ To get started we need to download and install the Ruby gem for Serve:
 
 After we've done that it's probably a good idea to install a couple of additional gems so that Serve will play nicely with HAML, Markdown, and Textile:
 
- $ sudo gem install haml Bluecloth Redcloth
+ $ sudo gem install haml BlueCloth RedCloth
 
 
 == Project Directory Structure

data/README.rdoc

@@ -55,6 +55,7 @@ markdown :: Evaluates the document as Markdown (requires the Bluecloth gem)
 erb :: Experimental support for ERB
 haml :: Evaluates the document as Haml (requires the Haml gem)
 sass :: Evaluates the document as Sass (requires the Haml gem)
+scss :: Evaluates the document as Scss (requires the Haml gem)
 email :: Evaluates the document as if it is an e-mail message; the format is identical to a plain/text e-mail message's source
 redirect :: Redirects to the URL contained in the document
 

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.10.1

data/lib/serve/file_resolver.rb

@@ -12,9 +12,11 @@ module Serve
       path = File.join(path) # path may be array
       return nil if path =~ /\.\./
       path = path.sub(%r{/\Z}, '')
-      if path =~ /\.css\Z/ && !File.file?(File.join(root, path))
-        sass_path = path.sub(/\.css\Z/, '.sass')
-        sass_path if File.file?(File.join(root, sass_path))
+      if path =~ /\.css\Z/ && !File.file?(File.join(root, path))  # if .css not found, try .scss, .sass:
+        alternates = %w{.scss .sass}.map { |ext| path.sub(/\.css\Z/, ext) }
+        sass_path = alternates.find do |p|
+          File.file?(File.join(root, p))
+        end
       elsif File.directory?(File.join(root, path))
         resolve(root, File.join(path, 'index'))
       else

data/lib/serve/handlers/sass_handler.rb

@@ -1,17 +1,27 @@
 module Serve #:nodoc:
   class SassHandler < FileTypeHandler #:nodoc:
-    extension 'sass'
+    extension 'sass', 'scss'
     
     def parse(string)
       require 'sass'
       engine = Sass::Engine.new(string,
         :load_paths => [@root_path],
         :style => :expanded,
-        :filename => @script_filename
+        :filename => @script_filename,
+        :syntax => syntax(@script_filename)
       )
       engine.render
     end
     
+    def syntax(filename)
+      ext = File.extname(@script_filename)
+      if ext == '.scss'
+        :scss
+      else
+        :sass
+      end
+    end
+    
     def content_type
       'text/css'
     end

data/spec/serve_spec.rb

@@ -4,7 +4,7 @@ describe "Serve" do
   
   it "should register all of the file type handlers" do
     Serve::WEBrick::Server.register_handlers
-    handlers = ["cgi", "email", "erb", "haml", "html.erb", "html.haml", "markdown", "redirect", "rhtml", "sass", "textile"]
+    handlers = ["cgi", "email", "erb", "haml", "html.erb", "html.haml", "markdown", "redirect", "rhtml", "sass", "scss", "textile"]
     table = WEBrick::HTTPServlet::FileHandler::HandlerTable
     table.keys.sort.should == handlers
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: serve
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - John W. Long
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 -05:00
+date: 2010-05-13 00:00:00 -04:00
 default_executable: serve
 dependencies: 
 - !ruby/object:Gem::Dependency