staticmatic 0.11.0.alpha.1 → 0.11.0.alpha.3

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 11
 :patch: 0
-:build: alpha.1
+:build: alpha.3

data/lib/staticmatic/helpers.rb

@@ -22,7 +22,7 @@ module StaticMatic
       if params.length == 0
         # no specific files requested so include all in no particular order
         stylesheet_dir = File.join(@staticmatic.src_dir, 'stylesheets')
-        stylesheet_directories = Dir[File.join(stylesheet_dir, '**','*.sass')]
+        stylesheet_directories = Dir[File.join(stylesheet_dir, '**','*.{sass,scss}')]
         
         # Bit of a hack here - adds any stylesheets that exist in the site/ dir that haven't been generated from source sass
         Dir[File.join(@staticmatic.site_dir, 'stylesheets', '*.css')].each do |filename|
@@ -45,7 +45,7 @@ module StaticMatic
           
           if !filename_without_extension.match(/^\_/)
             path = path.gsub(/#{@staticmatic.base_dir}\/(src|site)\//, "").
-                                 gsub(/#{filename_without_extension}\.(sass|css)/, "")
+                                 gsub(/#{filename_without_extension}\.(sass|scss|css)/, "")
           
             options[:href] = "#{relative_path}#{path}#{filename_without_extension}.css"
             output << tag(:link, options)

data/lib/staticmatic/mixins/render.rb

@@ -74,9 +74,16 @@ module StaticMatic::RenderMixin
   end
 
   def generate_css(source, source_dir = '')
-    full_file_path = File.join(@src_dir, 'stylesheets', source_dir, "#{source}.sass")
+    # full_file_path = File.join(@src_dir, 'stylesheets', source_dir, "#{source}.sass")
+    full_file_path = Dir[File.join(@src_dir, 'stylesheets', source_dir, "#{source}.{sass,scss}")].first
+
     begin
       sass_options = { :load_paths => [ File.join(@src_dir, 'stylesheets') ] }.merge(self.configuration.sass_options)
+      
+      if File.extname(full_file_path) == ".scss"
+        sass_options[:syntax] = :scss
+      end
+      
       stylesheet = Sass::Engine.new(File.read(full_file_path), sass_options)
       stylesheet.to_css
     rescue Exception => e

data/spec/helpers_spec.rb

@@ -20,6 +20,7 @@ describe "Helpers:" do
     it "should set up links for all stylesheets" do
       @links.should match(/stylesheets\/application\.css/)
       @links.should match(/stylesheets\/nested\/a_nested_stylesheet\.css/)
+      @links.should match(/stylesheets\/sassy\.css/)
     end
     
     it "should not link to partials" do

data/spec/render_spec.rb

@@ -28,4 +28,10 @@ describe "StaticMatic::Render" do
     @staticmatic.determine_layout("test/projects").should == "projects"
   end
   
+  context "handling scss" do
+    it "should generate css from scss" do
+      @staticmatic.generate_css("sassy").should match(/color\: \#3bbfce\;/)
+    end
+  end
+  
 end

data/spec/sandbox/test_site/src/stylesheets/sassy.scss

@@ -0,0 +1,12 @@
+$blue: #3bbfce;
+$margin: 16px;
+
+.content_navigation {
+  color: $blue;
+}
+
+.border {
+  padding: $margin / 2;
+  margin: $margin / 2;
+  border: 2px $blue solid;
+}

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 11
   - 0
   - alpha
-  - 1
-  version: 0.11.0.alpha.1
+  - 3
+  version: 0.11.0.alpha.3
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +01:00
+date: 2010-04-22 00:00:00 +01:00
 default_executable: staticmatic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,7 +118,6 @@ files:
 - spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html
 - spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html
 - spec/sandbox/test_site/site/sub_folder/index.html
-- spec/sandbox/test_site/src/configuration.rb
 - spec/sandbox/test_site/src/helpers/application_helper.rb
 - spec/sandbox/test_site/src/layouts/alternate_layout.haml
 - spec/sandbox/test_site/src/layouts/default.haml
@@ -134,6 +133,7 @@ files:
 - spec/sandbox/test_site/src/stylesheets/css_with_error.sass
 - spec/sandbox/test_site/src/stylesheets/nested/a_nested_stylesheet.sass
 - spec/sandbox/test_site/src/stylesheets/partials/_forms.sass
+- spec/sandbox/test_site/src/stylesheets/sassy.scss
 - spec/sandbox/tmp/Rakefile
 - spec/sandbox/tmp/config/compass.rb
 - spec/sandbox/tmp/config/site.rb
@@ -184,7 +184,6 @@ test_files:
 - spec/render_spec.rb
 - spec/rescue_spec.rb
 - spec/sandbox/test_site/config/site.rb
-- spec/sandbox/test_site/src/configuration.rb
 - spec/sandbox/test_site/src/helpers/application_helper.rb
 - spec/sandbox/tmp/config/compass.rb
 - spec/sandbox/tmp/config/site.rb

data/spec/sandbox/test_site/src/configuration.rb

@@ -1 +0,0 @@
-# stub for testing