jekyll-sass-converter 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2378debab502ac8be28921965bf56e8090f3c871
-  data.tar.gz: 5a71a60854bef153d688423634a9f7d70fff67d1
+  metadata.gz: f666e5d408f21c6a615d9d0e4012b8fc5b390db5
+  data.tar.gz: 39961610cc568a0ea9164fd3261a6580441390b8
 SHA512:
-  metadata.gz: 21b5e7c01f43a6423f0e7013fde7952aa8b3f8f80d897da80e3f111da68be399eabe906cab23a1e7d623686bf3e909981249395b15b8cca811d3bacca3600193
-  data.tar.gz: 5c8f0cfd2b0c1ca3116f3de158b4f34f0a265f9f6156a19881e4d26662a3ac0eb35d9abab9830e0e8fa7c11be9582e3f4657b04cda8a587fec9d0834de520347
+  metadata.gz: d0256dc05f45df12d1003985f1543f12f89a294d8d54257378931891f378aa024c80c0e5353e99051d93a878e6b6e88e774f6800739fe4f29e3a106320b9a855
+  data.tar.gz: 7a35e110fb21584266a7b76af7d65aad5793baa5303497f839fa2997d5c95d8977283a7d4be222221d10e14316d20c5205b3bfd348ca4139735a0ee2d8b09cb4

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

@@ -1,3 +1,3 @@
 module JekyllSassConverter
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/jekyll/converters/scss.rb

@@ -7,6 +7,8 @@ module Jekyll
       safe true
       priority :low
 
+      ALLOWED_STYLES = %w(nested expanded compact compressed).freeze
+
       def matches(ext)
         ext =~ /^\.scss$/i
       end
@@ -32,6 +34,7 @@ module Jekyll
           {
             :load_paths => sass_load_paths,
             :syntax     => syntax,
+            :style      => sass_style,
             :cache      => false
           }
         else
@@ -53,6 +56,11 @@ module Jekyll
         jekyll_sass_configuration["sass_dir"]
       end
 
+      def sass_style
+        style = jekyll_sass_configuration.fetch("style", :compact)
+        ALLOWED_STYLES.include?(style.to_s) ? style.to_sym : :compact
+      end
+
       def user_sass_load_paths
         Array(jekyll_sass_configuration["load_paths"])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sass-converter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -87,30 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- History.markdown
-- LICENSE.txt
-- README.md
-- Rakefile
-- jekyll-sass-converter.gemspec
 - 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/other_sass_library/css/main.scss
-- spec/sass_coverter_spec.rb
-- spec/scss_converter_spec.rb
-- spec/source/_config.yml
-- spec/source/_sass/_color.scss
-- spec/source/_sass/_grid.scss
-- spec/source/css/main.scss
-- spec/spec_helper.rb
 homepage: https://github.com/jekyll/jekyll-sass-converter
 licenses:
 - MIT
@@ -135,12 +115,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A basic Sass converter for Jekyll.
-test_files:
-- spec/other_sass_library/css/main.scss
-- spec/sass_coverter_spec.rb
-- spec/scss_converter_spec.rb
-- spec/source/_config.yml
-- spec/source/_sass/_color.scss
-- spec/source/_sass/_grid.scss
-- spec/source/css/main.scss
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.sass-cache
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-spec/dest/css*

data/.rspec

@@ -1,2 +0,0 @@
---color
---format doc

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-script : script/cibuild
-rvm:
-- 2.1.0
-- 2.0.0
-- 1.9.3
-notifications:
-  email: false

data/Gemfile

@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gemspec

data/History.markdown

@@ -1,13 +0,0 @@
-## 1.1.0 / 2014-07-29
-
-### Minor Enhancements
-
-  * Implement custom load paths (#14)
-  * Lock down sass configuration when in safe mode. (#15)
-
-## 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/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Parker Moore
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,36 +0,0 @@
-# Jekyll Sass Converter
-
-Let Jekyll build your Sass and SCSS!
-
-[![Build Status](https://travis-ci.org/jekyll/jekyll-sass-converter.svg?branch=master)](https://travis-ci.org/jekyll/jekyll-sass-converter)
-
-## Installation
-
-**Jekyll Sass Converter requires Jekyll 2.0.0 or greater and is bundled
-with Jekyll so you don't need to install it if you're already using Jekyll.**
-
-Add this line to your application's Gemfile:
-
-    gem 'jekyll-sass-converter'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install jekyll-sass-converter
-
-## Usage
-
-Jekyll Sass Converter comes bundled with Jekyll 2.0.0 and greater. For more
-information about usage, visit the [Jekyll Assets Documentation
-page](http://jekyllrb.com/docs/assets/).
-
-## Contributing
-
-1. Fork it ( http://github.com/jekyll/jekyll-sass-converter/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/jekyll-sass-converter.gemspec

@@ -1,26 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jekyll-sass-converter/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "jekyll-sass-converter"
-  spec.version       = JekyllSassConverter::VERSION
-  spec.authors       = ["Parker Moore"]
-  spec.email         = ["parkrmoore@gmail.com"]
-  spec.summary       = %q{A basic Sass converter for Jekyll.}
-  spec.homepage      = "https://github.com/jekyll/jekyll-sass-converter"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "sass", "~> 3.2"
-
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "jekyll", "~> 2.0"
-end

data/script/bootstrap

@@ -1,3 +0,0 @@
-#! /bin/bash
-
-bundle install

data/script/cibuild

@@ -1,3 +0,0 @@
-#! /bin/bash
-
-bundle exec rspec

data/spec/other_sass_library/css/main.scss

@@ -1,4 +0,0 @@
----
----
-
-@import "color";

data/spec/sass_coverter_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe(Jekyll::Converters::Sass) do
-  let(:site) do
-    Jekyll::Site.new(site_configuration)
-  end
-  let(:content) do
-    <<-SASS
-// tl;dr some sass
-$font-stack: Helvetica, sans-serif
-body
-  font-family: $font-stack
-  font-color: fuschia
-SASS
-  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::Sass.new(site_configuration({"sass" => overrides}))
-  end
-
-  context "matching file extensions" do
-    it "does not match .scss files" do
-      expect(converter.matches(".scss")).to be_falsey
-    end
-
-    it "matches .sass files" do
-      expect(converter.matches(".sass")).to be_truthy
-    end
-  end
-
-  context "converting sass" do
-    it "produces CSS" do
-      expect(converter.convert(content)).to eql(compressed(css_output))
-    end
-  end
-
-end

data/spec/scss_converter_spec.rb

@@ -1,185 +0,0 @@
-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_truthy
-    end
-
-    it "does not match .sass files" do
-      expect(converter.matches(".sass")).to be_falsey
-    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 "allow caching in unsafe mode" do
-      expect(converter.sass_configs[:cache]).to be_truthy
-    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
-
-    context "in safe mode" do
-      let(:verter) {
-        c = converter
-        c.instance_variable_get(:@config)["safe"] = true
-        c
-      }
-
-      it "does not allow caching" do
-        expect(verter.sass_configs[:cache]).to be_falsey
-      end
-
-      it "forces load_paths to be just the local load path" do
-        expect(verter.sass_configs[:load_paths]).to eql([source_dir("_sass")])
-      end
-
-      it "only contains :syntax, :cache, and :load_paths keys" do
-        expect(verter.sass_configs.keys).to eql([:load_paths, :syntax, :cache])
-      end
-    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_truthy
-    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
-
-  context "importing from external libraries" do
-    let(:external_library) { source_dir("_sass") }
-    let(:verter) { site.getConverterImpl(Jekyll::Converters::Scss) }
-    let(:test_css_file) { dest_dir('css', 'main.css') }
-
-    context "unsafe mode" do
-      let(:site) do
-        Jekyll::Site.new(site_configuration.merge({
-          "source" => sass_lib,
-          "sass"   => {
-            "load_paths" => external_library
-          }
-        }))
-      end
-
-      it "recognizes the new load path" do
-        expect(verter.sass_load_paths).to include(external_library)
-      end
-
-      it "ensures the sass_dir is still in the load path" do
-        expect(verter.sass_load_paths).to include(sass_lib("_sass"))
-      end
-
-      it "brings in the grid partial" do
-        site.process
-        expect(File.read(test_css_file)).to eql("a {\n  color: #999999; }\n")
-      end
-
-      context "with the sass_dir specified twice" do
-        let(:site) do
-          Jekyll::Site.new(site_configuration.merge({
-            "source" => sass_lib,
-            "sass"   => {
-              "load_paths" => [
-                external_library,
-                sass_lib("_sass")
-              ]
-            }
-          }))
-        end
-
-        it "ensures the sass_dir only occurrs once in the load path" do
-          expect(verter.sass_load_paths).to eql([external_library, sass_lib("_sass")])
-        end
-      end
-    end
-
-    context "safe mode" do
-      let(:site) do
-        Jekyll::Site.new(site_configuration.merge({
-          "safe"   => true,
-          "source" => sass_lib,
-          "sass"   => {
-            "load_paths" => external_library
-          }
-        }))
-      end
-
-      it "ignores the new load path" do
-        expect(verter.sass_load_paths).not_to include(external_library)
-      end
-
-      it "ensures the sass_dir is the entire load path" do
-        expect(verter.sass_load_paths).to eql([sass_lib("_sass")])
-      end
-    end
-
-  end
-
-end

data/spec/source/_config.yml

@@ -1,3 +0,0 @@
-sass:
-  style: :compressed
-highlighter: rouge

data/spec/source/_sass/_color.scss

@@ -1,2 +0,0 @@
-$black: #999;
-a { color: $black; }

data/spec/source/_sass/_grid.scss

@@ -1 +0,0 @@
-.half { width: 50%; }

data/spec/source/css/main.scss

@@ -1,4 +0,0 @@
----
----
-
-@import "grid";

data/spec/spec_helper.rb

@@ -1,44 +0,0 @@
-# coding: utf-8
-require 'fileutils'
-require 'jekyll'
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jekyll-sass-converter'
-
-if Jekyll::VERSION > "1"
-  Jekyll.logger.log_level = :error
-else
-  Jekyll.logger.log_level = Jekyll::Stevenson::ERROR
-end
-
-RSpec.configure do |config|
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-  config.order = 'random'
-
-  SOURCE_DIR   = File.expand_path("../source", __FILE__)
-  DEST_DIR     = File.expand_path("../dest",   __FILE__)
-  SASS_LIB_DIR = File.expand_path("../other_sass_library", __FILE__)
-  FileUtils.rm_rf(DEST_DIR)
-  FileUtils.mkdir_p(DEST_DIR)
-
-  def source_dir(*files)
-    File.join(SOURCE_DIR, *files)
-  end
-
-  def dest_dir(*files)
-    File.join(DEST_DIR, *files)
-  end
-
-  def sass_lib(*files)
-    File.join(SASS_LIB_DIR, *files)
-  end
-
-  def site_configuration(overrides = {})
-    Jekyll.configuration(overrides.merge({
-      "source"      => source_dir,
-      "destination" => dest_dir
-    }))
-  end
-end