From 9ffb984f372afaea5700b8edc30d2e75efe27155 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 25 Feb 2014 10:26:41 -0500
Subject: [PATCH 1/3] Sass support should be shipped outside core.

---
 jekyll.gemspec                |  2 +-
 lib/jekyll.rb                 |  1 -
 lib/jekyll/converters/sass.rb | 58 -----------------------------------
 3 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 lib/jekyll/converters/sass.rb

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 46509f69..073705f8 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -38,8 +38,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('colorator', "~> 0.1")
   s.add_runtime_dependency('redcarpet', "~> 3.1")
   s.add_runtime_dependency('toml', '~> 0.1.0')
-  s.add_runtime_dependency('sass', '~> 3.2')
   s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
+  s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0.0.alpha.1')
 
   s.add_development_dependency('rake', "~> 10.1")
   s.add_development_dependency('rdoc', "~> 3.11")
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index ae3a1883..7bccfe45 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -27,7 +27,6 @@ require 'liquid'
 require 'maruku'
 require 'colorator'
 require 'toml'
-require 'sass'
 
 # internal requires
 require 'jekyll/version'
diff --git a/lib/jekyll/converters/sass.rb b/lib/jekyll/converters/sass.rb
deleted file mode 100644
index 0c36eb65..00000000
--- a/lib/jekyll/converters/sass.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-module Jekyll
-  class Sass < Converter
-    safe true
-    priority :low
-
-    def matches(ext)
-      ext =~ /^\.s(a|c)ss$/i
-    end
-
-    def output_ext(ext)
-      ".css"
-    end
-
-    def jekyll_sass_configuration
-      @config["sass"] || {}
-    end
-
-    def sass_build_configuration_options(overrides)
-      jekyll_sass_configuration.deep_merge(overrides).symbolize_keys
-    end
-
-    def syntax_type_of_content(content)
-      if content.include?(";") || content.include?("{")
-        :scss
-      else
-        :sass
-      end
-    end
-
-    def sass_dir
-      return "_sass" if jekyll_sass_configuration["sass_dir"].to_s.empty?
-      jekyll_sass_configuration["sass_dir"]
-    end
-
-    def sass_dir_relative_to_site_source
-      File.join(
-        @config["source"],
-        File.expand_path(sass_dir, "/") # FIXME: Not windows-compatible
-      )
-    end
-
-    def allow_caching?
-      !@config["safe"]
-    end
-
-    def sass_configs(content = "")
-      sass_build_configuration_options({
-        "syntax" => syntax_type_of_content(content),
-        "cache"  => allow_caching?,
-        "load_paths" => [sass_dir_relative_to_site_source]
-      })
-    end
-
-    def convert(content)
-      ::Sass.compile(content, sass_configs(content))
-    end
-  end
-end

From 80c39cf67075ecfb5ee15b605e119ee2af430ccb Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 25 Feb 2014 11:02:54 -0500
Subject: [PATCH 2/3] Choose jekyll-sass-converter 1.0.0.rc1

---
 jekyll.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 073705f8..fc462f9f 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('redcarpet', "~> 3.1")
   s.add_runtime_dependency('toml', '~> 0.1.0')
   s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
-  s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0.0.alpha.1')
+  s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0.0.rc1')
 
   s.add_development_dependency('rake', "~> 10.1")
   s.add_development_dependency('rdoc', "~> 3.11")

From 0633cbf8fa962fd96e6e618370743065f8be6212 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 28 Feb 2014 21:19:44 -0500
Subject: [PATCH 3/3] Bring in jekyll-sass-converter

---
 lib/jekyll.rb     | 1 +
 test/test_sass.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 7bccfe45..e4276967 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -64,6 +64,7 @@ require_all 'jekyll/tags'
 
 # plugins
 require 'jekyll-coffeescript'
+require 'jekyll-sass-converter'
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
diff --git a/test/test_sass.rb b/test/test_sass.rb
index 0daa4f1d..aa25bd9d 100644
--- a/test/test_sass.rb
+++ b/test/test_sass.rb
@@ -9,7 +9,7 @@ class TestSass < Test::Unit::TestCase
   end
 
   def converter(overrides = {})
-    Jekyll::Sass.new(site_configuration({"sass" => overrides}))
+    Jekyll::Converters::Sass.new(site_configuration({"sass" => overrides}))
   end
 
   def sass_content