jekyll-sass-converter 1.0.0.rc4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e62ef230908db14e202a28b5a34e94b977a8611b
-  data.tar.gz: 02b00a0ed7815186816adb92740dc185755f8c96
+  metadata.gz: fa33b7fb6d5090ac41ac28b7a66caf53bbaa2679
+  data.tar.gz: 08eab1bad34f5d3ceb7d95f320f414b32a60e4cf
 SHA512:
-  metadata.gz: 2b5821d76557b12c224d9105d58d4ab68b44a53db9219bb82de0e79a2c6bcc5960d61467f6c9561b31e8f668a1a5e70ca278051fa6b1473f243c1e82e0ae9abe
-  data.tar.gz: 04f8089e22e46c36193f6131166b9af599ba272d813fd67cbaf65ce5325c37d90731e0911dccc8e45a4afc4e18c9a882127eb791b8a517b903c8db92957aeda5
+  metadata.gz: 3a7888bd4ae43c7c83d20fa46c9664a45f278c58561704f4d0dbc646b8b368c985a0b1a01490a7c55d44af930978e800cd75e97ef4f5702de45510ae141de6c5
+  data.tar.gz: add1ac2e2f6d4ba6c06487af52c556ad40139e1008221f5c9b5d1d16e752857da492a088b733b9f963884853df12962befd225158a8105b80895aebbc64adb73

data/History.markdown

@@ -1,5 +1,8 @@
 ## HEAD
 
+## 1.0.0 / 2014-05-06
+
 * Birthday!
 * Don't use core extensions (#2)
 * Allow users to set style of outputted CSS (#4)
+* Determine input syntax based on file extension (#9)

data/lib/jekyll-sass-converter.rb

@@ -1,4 +1,5 @@
 require "jekyll-sass-converter/version"
+require "jekyll/converters/scss"
 require "jekyll/converters/sass"
 
 module JekyllSassConverter

data/lib/jekyll-sass-converter/version.rb

@@ -1,3 +1,3 @@
 module JekyllSassConverter
-  VERSION = "1.0.0.rc4"
+  VERSION = "1.0.0"
 end

data/lib/jekyll/converters/sass.rb

@@ -3,64 +3,16 @@ require 'jekyll/utils'
 
 module Jekyll
   module Converters
-    class Sass < Converter
+    class Sass < Scss
       safe true
       priority :low
 
       def matches(ext)
-        ext =~ /^\.s(a|c)ss$/i
+        ext =~ /^\.sass$/i
       end
 
-      def output_ext(ext)
-        ".css"
-      end
-
-      def jekyll_sass_configuration
-        options = @config["sass"] || {}
-        unless options["style"].nil?
-          options["style"] = options["style"].to_s.gsub(/\A:/, '').to_sym
-        end
-        options
-      end
-
-      def sass_build_configuration_options(overrides)
-        Jekyll::Utils.symbolize_hash_keys(
-          Jekyll::Utils.deep_merge_hashes(jekyll_sass_configuration, overrides)
-        )
-      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
-        # FIXME: Not Windows-safe. Can only change once Jekyll 2.0.0 is out
-        Jekyll.sanitized_path(@config["source"], sass_dir)
-      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))
+      def syntax
+        :sass
       end
     end
   end

data/lib/jekyll/converters/scss.rb

@@ -0,0 +1,63 @@
+require 'sass'
+require 'jekyll/utils'
+
+module Jekyll
+  module Converters
+    class Scss < Converter
+      safe true
+      priority :low
+
+      def matches(ext)
+        ext =~ /^\.scss$/i
+      end
+
+      def output_ext(ext)
+        ".css"
+      end
+
+      def jekyll_sass_configuration
+        options = @config["sass"] || {}
+        unless options["style"].nil?
+          options["style"] = options["style"].to_s.gsub(/\A:/, '').to_sym
+        end
+        options
+      end
+
+      def sass_build_configuration_options(overrides)
+        Jekyll::Utils.symbolize_hash_keys(
+          Jekyll::Utils.deep_merge_hashes(jekyll_sass_configuration, overrides)
+        )
+      end
+
+      def syntax
+        :scss
+      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
+        # FIXME: Not Windows-safe. Can only change once Jekyll 2.0.0 is out
+        Jekyll.sanitized_path(@config["source"], sass_dir)
+      end
+
+      def allow_caching?
+        !@config["safe"]
+      end
+
+      def sass_configs(content = "")
+        sass_build_configuration_options({
+          "syntax"     => syntax,
+          "cache"      => allow_caching?,
+          "load_paths" => [sass_dir_relative_to_site_source]
+        })
+      end
+
+      def convert(content)
+        ::Sass.compile(content, sass_configs(content))
+      end
+    end
+  end
+end

data/spec/sass_coverter_spec.rb

@@ -4,22 +4,14 @@ describe(Jekyll::Converters::Sass) do
   let(:site) do
     Jekyll::Site.new(site_configuration)
   end
-  let(:sass_content) do
+  let(:content) do
     <<-SASS
+// tl;dr some sass
 $font-stack: Helvetica, sans-serif
 body
   font-family: $font-stack
   font-color: fuschia
 SASS
-  end
-  let(:scss_content) do
-    <<-SCSS
-$font-stack: Helvetica, sans-serif;
-body {
-  font-family: $font-stack;
-  font-color: fuschia;
-}
-SCSS
   end
   let(:css_output) do
     <<-CSS
@@ -36,8 +28,8 @@ CSS
   end
 
   context "matching file extensions" do
-    it "matches .scss files" do
-      expect(converter.matches(".scss")).to be_true
+    it "does not match .scss files" do
+      expect(converter.matches(".scss")).to be_false
     end
 
     it "matches .sass files" do
@@ -45,88 +37,10 @@ CSS
     end
   end
 
-  context "determining the output file extension" do
-    it "always outputs the .css file extension" do
-      expect(converter.output_ext(".always-css")).to eql(".css")
-    end
-  end
-
-  context "when building configurations" do
-    it "not allow caching in safe mode" do
-      verter = converter
-      verter.instance_variable_get(:@config)["safe"] = true
-      expect(verter.sass_configs[:cache]).to be_false
-    end
-
-    it "allow caching in unsafe mode" do
-      expect(converter.sass_configs[:cache]).to be_true
-    end
-
-    it "set the load paths to the _sass dir relative to site source" do
-      expect(converter.sass_configs[:load_paths]).to eql([source_dir("_sass")])
-    end
-
-    it "allow the user to specify a different sass dir" do
-      expect(converter({"sass_dir" => "_scss"}).sass_configs[:load_paths]).to eql([source_dir("_scss")])
-    end
-
-    it "set syntax :scss when SCSS content" do
-      expect(converter.sass_configs(scss_content)[:syntax]).to eql(:scss)
-    end
-
-    it "set syntax :sass when Sass content" do
-      expect(converter.sass_configs(sass_content)[:syntax]).to eql(:sass)
-    end
-
-    it "default to :sass syntax when content is empty" do
-      expect(converter.sass_configs[:syntax]).to eql(:sass)
-    end
-
-    it "allow for other styles" do
-      expect(converter({"style" => :compressed}).sass_configs[:style]).to eql(:compressed)
-    end
-
-    it "not allow sass_dirs outside of site source" do
-      expect(
-        converter({"sass_dir" => "/etc/passwd"}).sass_dir_relative_to_site_source
-      ).to eql(source_dir("etc/passwd"))
-    end
-
-    it "override user-set syntax based on content" do
-      expect(
-        converter({"syntax" => :scss}).sass_configs(sass_content)[:syntax]
-      ).to eql(:sass)
-    end
-  end
-
   context "converting sass" do
     it "produces CSS" do
-      expect(converter.convert(sass_content)).to eql(compressed(css_output))
-    end
-  end
-
-  context "converting SCSS" do
-    it "produces CSS" do
-      expect(converter.convert(scss_content)).to eql(compressed(css_output))
+      expect(converter.convert(content)).to eql(compressed(css_output))
     end
   end
 
-  context "importing partials" do
-    let(:test_css_file) { dest_dir("css/main.css") }
-    before(:each) { site.process }
-
-    it "outputs the CSS file" do
-      expect(File.exist?(test_css_file)).to be_true
-    end
-
-    it "imports SCSS partial" do
-      expect(File.read(test_css_file)).to eql(compressed(".half {\n  width: 50%; }\n"))
-    end
-
-    it "uses a compressed style" do
-      instance = site.getConverterImpl(Jekyll::Converters::Sass)
-      expect(instance.jekyll_sass_configuration).to eql({"style" => :compressed})
-      expect(instance.sass_configs[:style]).to eql(:compressed)
-    end
-  end
 end

data/spec/scss_converter_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+describe(Jekyll::Converters::Scss) do
+  let(:site) do
+    Jekyll::Site.new(site_configuration)
+  end
+  let(:content) do
+    <<-SCSS
+$font-stack: Helvetica, sans-serif;
+body {
+  font-family: $font-stack;
+  font-color: fuschia;
+}
+SCSS
+  end
+  let(:css_output) do
+    <<-CSS
+body {\n  font-family: Helvetica, sans-serif;\n  font-color: fuschia; }
+CSS
+  end
+
+  def compressed(content)
+    content.gsub(/\s+/, '').gsub(/;}/, '}') + "\n"
+  end
+
+  def converter(overrides = {})
+    Jekyll::Converters::Scss.new(site_configuration({"sass" => overrides}))
+  end
+
+  context "matching file extensions" do
+    it "matches .scss files" do
+      expect(converter.matches(".scss")).to be_true
+    end
+
+    it "does not match .sass files" do
+      expect(converter.matches(".sass")).to be_false
+    end
+  end
+
+  context "determining the output file extension" do
+    it "always outputs the .css file extension" do
+      expect(converter.output_ext(".always-css")).to eql(".css")
+    end
+  end
+
+  context "when building configurations" do
+    it "not allow caching in safe mode" do
+      verter = converter
+      verter.instance_variable_get(:@config)["safe"] = true
+      expect(verter.sass_configs[:cache]).to be_false
+    end
+
+    it "allow caching in unsafe mode" do
+      expect(converter.sass_configs[:cache]).to be_true
+    end
+
+    it "set the load paths to the _sass dir relative to site source" do
+      expect(converter.sass_configs[:load_paths]).to eql([source_dir("_sass")])
+    end
+
+    it "allow the user to specify a different sass dir" do
+      expect(converter({"sass_dir" => "_scss"}).sass_configs[:load_paths]).to eql([source_dir("_scss")])
+    end
+
+    it "allow for other styles" do
+      expect(converter({"style" => :compressed}).sass_configs[:style]).to eql(:compressed)
+    end
+
+    it "not allow sass_dirs outside of site source" do
+      expect(
+        converter({"sass_dir" => "/etc/passwd"}).sass_dir_relative_to_site_source
+      ).to eql(source_dir("etc/passwd"))
+    end
+  end
+
+  context "converting SCSS" do
+    it "produces CSS" do
+      expect(converter.convert(content)).to eql(compressed(css_output))
+    end
+  end
+
+  context "importing partials" do
+    let(:test_css_file) { dest_dir("css/main.css") }
+    before(:each) { site.process }
+
+    it "outputs the CSS file" do
+      expect(File.exist?(test_css_file)).to be_true
+    end
+
+    it "imports SCSS partial" do
+      expect(File.read(test_css_file)).to eql(compressed(".half {\n  width: 50%; }\n"))
+    end
+
+    it "uses a compressed style" do
+      instance = site.getConverterImpl(Jekyll::Converters::Scss)
+      expect(instance.jekyll_sass_configuration).to eql({"style" => :compressed})
+      expect(instance.sass_configs[:style]).to eql(:compressed)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sass-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -85,11 +85,13 @@ files:
 - lib/jekyll-sass-converter.rb
 - lib/jekyll-sass-converter/version.rb
 - lib/jekyll/converters/sass.rb
+- lib/jekyll/converters/scss.rb
 - script/bootstrap
 - script/cibuild
 - script/release
 - spec/dest/css/main.css
 - spec/sass_coverter_spec.rb
+- spec/scss_converter_spec.rb
 - spec/source/_config.yml
 - spec/source/_sass/_grid.scss
 - spec/source/css/main.scss
@@ -109,9 +111,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -121,6 +123,7 @@ summary: A basic Sass converter for Jekyll.
 test_files:
 - spec/dest/css/main.css
 - spec/sass_coverter_spec.rb
+- spec/scss_converter_spec.rb
 - spec/source/_config.yml
 - spec/source/_sass/_grid.scss
 - spec/source/css/main.scss