jekyll-sass 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/lib/jekyll-sass.rb CHANGED
@@ -6,12 +6,17 @@ module Jekyll
6
6
  require 'sass'
7
7
 
8
8
  class SassConfig
9
+ def self.sass_config(site)
10
+ site.config['sass'] || {}
11
+ end
12
+
9
13
  def self.style(site)
14
+ sass_config = sass_config(site)
10
15
  if site.config['watch']
11
- style = site.config['sass']['style'] || 'expanded'
16
+ style = sass_config['style'] || 'expanded'
12
17
  else
13
- style = site.config['sass']['deploy_style'] ||
14
- site.config['sass']['style'] ||
18
+ style = sass_config['deploy_style'] ||
19
+ sass_config['style'] ||
15
20
  'compressed'
16
21
  end
17
22
  style.to_sym
@@ -26,7 +31,7 @@ module Jekyll
26
31
  end
27
32
 
28
33
  def self.compile_in_place?(site)
29
- site.config['sass']['compile_in_place']
34
+ sass_config(site)['compile_in_place']
30
35
  end
31
36
  end
32
37
 
@@ -1,5 +1,5 @@
1
1
  module Jekyll
2
2
  module Sass
3
- VERSION = "1.2.0"
3
+ VERSION = "1.2.1"
4
4
  end
5
5
  end
data/readme.md CHANGED
@@ -52,4 +52,4 @@ In your `_config.yml`
52
52
  Credit
53
53
  ------
54
54
  This gem is based on [@zroger's](https://github.com/zroger) [jekyll-less](https://github.com/zroger/jekyll-less),
55
- with contributions from [@zznq](https://github.com/zznq), [@Tambling](https://github.com/Tambling), and [@rebelzach](https://github.com/rebelzach).
55
+ with contributions from [@zznq](https://github.com/zznq), [@Tambling](https://github.com/Tambling), [@rebelzach](https://github.com/rebelzach), and [@kelvinst](https://github.com/kelvinst).
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: jekyll-sass
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.2.0
5
+ version: 1.2.1
6
6
  platform: ruby
7
7
  authors:
8
8
  - Jason Kozak
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2013-11-21 00:00:00 Z
13
+ date: 2013-11-28 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: jekyll