jekyll-sass 1.0.0 → 1.1.0

data/lib/jekyll-sass.rb

@@ -3,6 +3,21 @@ require "jekyll-sass/version"
 module Jekyll
   module Sass
     require 'sass'
+
+    class SassConfig
+      def self.generate()
+        config = Hash["style", :compressed, "syntax", :scss]
+        if Jekyll.configuration({}).has_key?('sass')
+          config.merge!(Jekyll.configuration({})['sass']) {|key,v1,v2| v2.to_sym}
+        end
+        config
+      end
+
+      def self.get()
+        @config ||= generate()
+      end
+    end
+
     class SassCssFile < StaticFile
 
       # Obtain destination path.
@@ -10,14 +25,16 @@ module Jekyll
       #
       # Returns destination file path.
       def destination(dest)
-        File.join(dest, @dir, @name.sub(/scss$/, 'css'))
+        syntax = SassConfig.get()['syntax'].to_s
+        File.join(dest, @dir, @name.sub(/#{syntax}$/, 'css'))
       end
 
-      # Convert the scss file into a css file.
+      # Convert the sass/scss file into a css file.
       #   +dest+ is the String path to the destination dir
       #
       # Returns false if the file was not modified since last time (no-op).
       def write(dest)
+        config = SassConfig.get()
         dest_path = destination(dest)
 
         return false if File.exist? dest_path and !modified?
@@ -26,7 +43,7 @@ module Jekyll
         FileUtils.mkdir_p(File.dirname(dest_path))
         begin
           content = File.read(path)
-          engine = ::Sass::Engine.new( content, :syntax => :scss, :load_paths => ["#{@site.source}#{@dir}"], :style => :compressed )
+          engine = ::Sass::Engine.new( content, :syntax => config['syntax'], :load_paths => ["#{@site.source}#{@dir}"], :style => config['style'] )
           content = engine.render
           File.open(dest_path, 'w') do |f|
             f.write(content)
@@ -44,12 +61,13 @@ module Jekyll
     class SassCssGenerator < Generator
       safe true
 
-      # Jekyll will have already added the *.scss files as Jekyll::StaticFile
+      # Jekyll will have already added the *.sass/scss files as Jekyll::StaticFile
       # objects to the static_files array.  Here we replace those with a
       # SassCssFile object.
       def generate(site)
+        syntax = SassConfig.get()['syntax'].to_s
         site.static_files.clone.each do |sf|
-          if sf.kind_of?(Jekyll::StaticFile) && sf.path =~ /\.scss$/
+          if sf.kind_of?(Jekyll::StaticFile) && sf.path =~ /\.#{syntax}$/
             site.static_files.delete(sf)
             name = File.basename(sf.path)
             destination = File.dirname(sf.path).sub(site.source, '')
@@ -57,6 +75,8 @@ module Jekyll
           end
         end
       end
+
     end
+
   end
 end

data/lib/jekyll-sass/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Sass
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/readme.md

@@ -1,4 +1,4 @@
-Less for Jekyll
+Sass for Jekyll
 ===============
 
 This gem provides a [Jekyll](http://github.com/mojombo/jekyll) converter for
@@ -10,31 +10,39 @@ Install the gem:
 
 	[sudo] gem install jekyll-sass
 
-In a plugin file within your Jekyll project's _plugins directory:
+In a plugin file within your Jekyll project's `_plugins` directory:
 
 	# _plugins/my-plugin.rb
 	require "jekyll-sass"
 
 Place .scss files anywhere in your Jekyll project's directory.  These will be
 converted to .css files with the same directory path and filename. For example,
-if you create a Less file at _css/my-stuff/styles.scss, then the corresponding
-css file would end up at _css/my-stuff/styles.css_.
+if you create a Less file at `css/my-stuff/styles.scss`, then the corresponding
+css file would end up at `css/my-stuff/styles.css`.
 
 Bundler Setup
 -------------
-Already using bundler to manage gems for your Jekyll project?  Then just add
+Using bundler to manage gems for your Jekyll project? Just add
 
 	gem "jekyll-sass"
 
-to your gemfile and create the following plugin in your projects _plugins
-directory.  I've called mine bundler.rb.  This will automatically require all
-of the gems specified in your Gemfile.
+to your gemfile and create the following plugin in your projects `_plugins`
+directory.  This will automatically require all of the gems specified in your Gemfile.
 
 	# _plugins/bundler.rb
 	require "rubygems"
 	require "bundler/setup"
 	Bundler.require(:default)
 
+Configuration
+-------------
+In your `_config.yml`
+
+	# defaults
+	sass:
+	    syntax: scss        # scss|sass
+	    style:  compressed  # nested|expanded|compact|compressed
+
 Credit
 ------
-This gem is based on [Roger López's](https://github.com/zroger) [jekyll-less](https://github.com/zroger/jekyll-less).
+This gem is based on [Roger López's](https://github.com/zroger) [jekyll-less](https://github.com/zroger/jekyll-less), with contributions from [Joe Buszkiewic](https://github.com/zznq).

metadata

@@ -2,7 +2,7 @@
 name: jekyll-sass
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jason Kozak
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-01 00:00:00 Z
+date: 2012-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll