jekyll-sass-converter 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa33b7fb6d5090ac41ac28b7a66caf53bbaa2679
-  data.tar.gz: 08eab1bad34f5d3ceb7d95f320f414b32a60e4cf
+  metadata.gz: 2378debab502ac8be28921965bf56e8090f3c871
+  data.tar.gz: 5a71a60854bef153d688423634a9f7d70fff67d1
 SHA512:
-  metadata.gz: 3a7888bd4ae43c7c83d20fa46c9664a45f278c58561704f4d0dbc646b8b368c985a0b1a01490a7c55d44af930978e800cd75e97ef4f5702de45510ae141de6c5
-  data.tar.gz: add1ac2e2f6d4ba6c06487af52c556ad40139e1008221f5c9b5d1d16e752857da492a088b733b9f963884853df12962befd225158a8105b80895aebbc64adb73
+  metadata.gz: 21b5e7c01f43a6423f0e7013fde7952aa8b3f8f80d897da80e3f111da68be399eabe906cab23a1e7d623686bf3e909981249395b15b8cca811d3bacca3600193
+  data.tar.gz: 5c8f0cfd2b0c1ca3116f3de158b4f34f0a265f9f6156a19881e4d26662a3ac0eb35d9abab9830e0e8fa7c11be9582e3f4657b04cda8a587fec9d0834de520347

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+spec/dest/css*

data/.rspec

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

data/Gemfile

@@ -1,7 +1,2 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in jekyll-sass-converter.gemspec
 gemspec
-
-gem "jekyll", "2.0.0.alpha.2"
-gem "rouge"

data/History.markdown

@@ -1,8 +1,13 @@
-## HEAD
+## 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)
+  * 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/jekyll-sass-converter.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   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/lib/jekyll-sass-converter/version.rb

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

data/lib/jekyll/converters/scss.rb

@@ -15,6 +15,10 @@ module Jekyll
         ".css"
       end
 
+      def safe?
+        !!@config["safe"]
+      end
+
       def jekyll_sass_configuration
         options = @config["sass"] || {}
         unless options["style"].nil?
@@ -24,9 +28,20 @@ module Jekyll
       end
 
       def sass_build_configuration_options(overrides)
-        Jekyll::Utils.symbolize_hash_keys(
-          Jekyll::Utils.deep_merge_hashes(jekyll_sass_configuration, overrides)
-        )
+        if safe?
+          {
+            :load_paths => sass_load_paths,
+            :syntax     => syntax,
+            :cache      => false
+          }
+        else
+          Jekyll::Utils.symbolize_hash_keys(
+            Jekyll::Utils.deep_merge_hashes(
+              jekyll_sass_configuration,
+              overrides
+            )
+          )
+        end
       end
 
       def syntax
@@ -38,25 +53,36 @@ module Jekyll
         jekyll_sass_configuration["sass_dir"]
       end
 
+      def user_sass_load_paths
+        Array(jekyll_sass_configuration["load_paths"])
+      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 sass_load_paths
+        if safe?
+          [sass_dir_relative_to_site_source]
+        else
+          (user_sass_load_paths + [sass_dir_relative_to_site_source]).uniq
+        end
+      end
+
       def allow_caching?
-        !@config["safe"]
+        !safe?
       end
 
-      def sass_configs(content = "")
+      def sass_configs
         sass_build_configuration_options({
           "syntax"     => syntax,
           "cache"      => allow_caching?,
-          "load_paths" => [sass_dir_relative_to_site_source]
+          "load_paths" => sass_load_paths
         })
       end
 
       def convert(content)
-        ::Sass.compile(content, sass_configs(content))
+        ::Sass.compile(content, sass_configs)
       end
     end
   end

data/spec/other_sass_library/css/main.scss

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

data/spec/sass_coverter_spec.rb

@@ -29,11 +29,11 @@ CSS
 
   context "matching file extensions" do
     it "does not match .scss files" do
-      expect(converter.matches(".scss")).to be_false
+      expect(converter.matches(".scss")).to be_falsey
     end
 
     it "matches .sass files" do
-      expect(converter.matches(".sass")).to be_true
+      expect(converter.matches(".sass")).to be_truthy
     end
   end
 

data/spec/scss_converter_spec.rb

@@ -29,11 +29,11 @@ CSS
 
   context "matching file extensions" do
     it "matches .scss files" do
-      expect(converter.matches(".scss")).to be_true
+      expect(converter.matches(".scss")).to be_truthy
     end
 
     it "does not match .sass files" do
-      expect(converter.matches(".sass")).to be_false
+      expect(converter.matches(".sass")).to be_falsey
     end
   end
 
@@ -44,14 +44,9 @@ CSS
   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
+      expect(converter.sass_configs[:cache]).to be_truthy
     end
 
     it "set the load paths to the _sass dir relative to site source" do
@@ -71,6 +66,26 @@ CSS
         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
@@ -84,7 +99,7 @@ CSS
     before(:each) { site.process }
 
     it "outputs the CSS file" do
-      expect(File.exist?(test_css_file)).to be_true
+      expect(File.exist?(test_css_file)).to be_truthy
     end
 
     it "imports SCSS partial" do
@@ -98,4 +113,73 @@ CSS
     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/_sass/_color.scss

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

data/spec/spec_helper.rb

@@ -6,16 +6,20 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jekyll-sass-converter'
 
-Jekyll.logger.log_level = Jekyll::Stevenson::ERROR
+if Jekyll::VERSION > "1"
+  Jekyll.logger.log_level = :error
+else
+  Jekyll.logger.log_level = Jekyll::Stevenson::ERROR
+end
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   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__)
+  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)
 
@@ -27,6 +31,10 @@ RSpec.configure do |config|
     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,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sass-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: 
 email:
 - parkrmoore@gmail.com
@@ -89,10 +103,11 @@ files:
 - script/bootstrap
 - script/cibuild
 - script/release
-- spec/dest/css/main.css
+- 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
@@ -121,10 +136,11 @@ signing_key:
 specification_version: 4
 summary: A basic Sass converter for Jekyll.
 test_files:
-- spec/dest/css/main.css
+- 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

data/spec/dest/css/main.css

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