sinatra-support 1.1.0 → 1.1.1

data/HISTORY.md

@@ -1,3 +1,9 @@
+v1.1.1 - May 27, 2011
+---------------------
+
+### Fixed:
+  * CssSupport: Fix issue where Sass files are not loaded
+
 v1.1.0 - May 27, 2011
 ---------------------
 

data/lib/sinatra/support/csssupport.rb

@@ -72,7 +72,7 @@ module Sinatra::CssSupport
     prefix = options[:from]
 
     get path do |name|
-      fname = Dir[File.join(prefix, "#{name}.{css,scss,less}")].first  or pass
+      fname = Dir[File.join(prefix, "#{name}.{css,sass,scss,less}")].first  or pass
 
       content_type :css, :charset => 'utf-8'
       last_modified css_mtime_for(prefix, fname)
@@ -80,7 +80,7 @@ module Sinatra::CssSupport
 
       if fname =~ /\.scss$/
         scss File.read(fname)
-      elsif fname =~ /\.scss$/
+      elsif fname =~ /\.sass$/
         sass File.read(fname)
       elsif fname =~ /\.less$/
         less File.read(fname)

data/lib/sinatra/support/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Support
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
 
     def self.version
       VERSION

data/test/fixtures/css/style-less.less

@@ -0,0 +1,2 @@
+@grey: #333;
+body, #less { color: @grey; }

data/test/fixtures/css/style-sass.sass

@@ -0,0 +1,2 @@
+body, #sass
+  color: #333

data/test/fixtures/css/style-scss.scss

@@ -0,0 +1,2 @@
+$grey: #333;
+body, #scss { color: $grey; }

data/test/test_css.rb

@@ -0,0 +1,32 @@
+require File.expand_path('../helper', __FILE__)
+
+class CssAppTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  class App < Sinatra::Base
+    register Sinatra::CssSupport
+    serve_css '/css', :from => File.expand_path('../fixtures/css', __FILE__)
+  end
+
+  def app
+    App.new
+  end
+
+  test "sass" do
+    get '/css/style-sass.css'
+
+    assert_equal "body, #sass {\n  color: #333333; }\n", last_response.body
+  end
+
+  test "scss" do
+    get '/css/style-scss.css'
+
+    assert_equal "body, #scss {\n  color: #333333; }\n", last_response.body
+  end
+
+  test "less" do
+    get '/css/style-less.css'
+
+    assert_equal "body, #less { color: #333333; }\n", last_response.body
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: sinatra-support
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Cyril David
@@ -118,6 +118,9 @@ files:
 - lib/sinatra/support/ohmerrorhelpers.rb
 - lib/sinatra/support/version.rb
 - lib/sinatra/support.rb
+- test/fixtures/css/style-less.less
+- test/fixtures/css/style-sass.sass
+- test/fixtures/css/style-scss.scss
 - test/fixtures/i18n/en.yml
 - test/fixtures/i18n/tl.yml
 - test/fixtures/multirender/views_1/dupe.erb
@@ -128,6 +131,7 @@ files:
 - test/helper.rb
 - test/test_compass_app.rb
 - test/test_country.rb
+- test/test_css.rb
 - test/test_date.rb
 - test/test_date_app.rb
 - test/test_date_form.rb