jekyll-sass-converter 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5787320a28ad51c979351e93af1496add206e76c
-  data.tar.gz: b4f6d23d49bc906f7834c7a77e365bb69143ec89
+  metadata.gz: e62ef230908db14e202a28b5a34e94b977a8611b
+  data.tar.gz: 02b00a0ed7815186816adb92740dc185755f8c96
 SHA512:
-  metadata.gz: afa9fababe0d08d8b94f0ea6a26dc4e477c385725564a60d96046bfabf88deeb553a143e858e7b363da3a6d35cca537b603a1ef79d096d586b3d666c596cc49c
-  data.tar.gz: 193490607df2234630201b3d29b2590a6008145ea4b2ef710d2be691819264ab283d57d1e386424837de8c7e93e1b2962d792260936d37b75f8bcc50adb25d3d
+  metadata.gz: 2b5821d76557b12c224d9105d58d4ab68b44a53db9219bb82de0e79a2c6bcc5960d61467f6c9561b31e8f668a1a5e70ca278051fa6b1473f243c1e82e0ae9abe
+  data.tar.gz: 04f8089e22e46c36193f6131166b9af599ba272d813fd67cbaf65ce5325c37d90731e0911dccc8e45a4afc4e18c9a882127eb791b8a517b903c8db92957aeda5

data/Gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in jekyll-sass-converter.gemspec
 gemspec
 
-gem "jekyll", git: "git://github.com/jekyll/jekyll.git", branch: "no-core-ext"
+gem "jekyll", "2.0.0.alpha.2"
 gem "rouge"

data/History.markdown

@@ -2,3 +2,4 @@
 
 * Birthday!
 * Don't use core extensions (#2)
+* Allow users to set style of outputted CSS (#4)

data/README.md

@@ -2,7 +2,7 @@
 
 Let Jekyll build your Sass and SCSS!
 
-[![Build Status](https://travis-ci.org/jekyll/jekyll-sass-converter.png?branch=master)](https://travis-ci.org/jekyll/jekyll-sass-converter)
+[![Build Status](https://travis-ci.org/jekyll/jekyll-sass-converter.svg?branch=master)](https://travis-ci.org/jekyll/jekyll-sass-converter)
 
 ## Installation
 

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

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

data/lib/jekyll/converters/sass.rb

@@ -16,7 +16,11 @@ module Jekyll
       end
 
       def jekyll_sass_configuration
-        @config["sass"] || {}
+        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)

data/spec/dest/css/main.css

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

data/spec/sass_coverter_spec.rb

@@ -27,6 +27,10 @@ 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
@@ -78,6 +82,10 @@ CSS
       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
@@ -93,13 +101,13 @@ CSS
 
   context "converting sass" do
     it "produces CSS" do
-      expect(converter.convert(sass_content)).to eql(css_output)
+      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(css_output)
+      expect(converter.convert(scss_content)).to eql(compressed(css_output))
     end
   end
 
@@ -112,7 +120,13 @@ CSS
     end
 
     it "imports SCSS partial" do
-      expect(File.read(test_css_file)).to eql(".half {\n  width: 50%; }\n")
+      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/source/_config.yml

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

data/spec/spec_helper.rb

@@ -6,6 +6,8 @@ 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
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
@@ -26,8 +28,8 @@ RSpec.configure do |config|
   end
 
   def site_configuration(overrides = {})
-    Jekyll::Utils.hash_deep_merge(Jekyll::Configuration::DEFAULTS, overrides.merge({
-      "source" => source_dir,
+    Jekyll.configuration(overrides.merge({
+      "source"      => source_dir,
       "destination" => dest_dir
     }))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sass-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -90,6 +90,7 @@ files:
 - script/release
 - spec/dest/css/main.css
 - spec/sass_coverter_spec.rb
+- spec/source/_config.yml
 - spec/source/_sass/_grid.scss
 - spec/source/css/main.scss
 - spec/spec_helper.rb
@@ -120,6 +121,7 @@ summary: A basic Sass converter for Jekyll.
 test_files:
 - spec/dest/css/main.css
 - spec/sass_coverter_spec.rb
+- spec/source/_config.yml
 - spec/source/_sass/_grid.scss
 - spec/source/css/main.scss
 - spec/spec_helper.rb