jekyll-sass-converter 1.0.0.rc1 → 1.0.0.rc2

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4a5a330647c5fc08383c7fa2e975581efb5f5e2d
4
- data.tar.gz: 70b8fbc1a5c00bfbfae9860505de0ef96471a6b3
3
+ metadata.gz: 8872dece081bf7022cec20041d682e1ec4da2f2e
4
+ data.tar.gz: 469fab7a59a58ee0669b4c0d1c77da480bf9d212
5
5
  SHA512:
6
- metadata.gz: e295fa24ed3f62353c8f525a7f803f6139305a238f8b0fa554a163a3dedbc19c1a9f6ca6be0ef6bd13a57b11ad665aafe73c11106143a2b04fc974d46c5220e8
7
- data.tar.gz: 03786d64805e0578ae2a52346c53a4f64e60ba52f1308b88ee6630304e029d10c2b17c193691f096172151587f460cc8889e8e96e2cae4bc34f2828c69fe96ea
6
+ metadata.gz: f20b4c8e0d4a698c6081744eb9a874fbf41c15ab2482635c3eec08c46d9aacab9054e0f3a327d385f378ffda08cd458c4887cf9f1723b97bdaaa7b6ca054710a
7
+ data.tar.gz: c9c534bf301950127c70a978fc56e3fafa48fd51fa35f89820749fa18edc0ac8f8276766e0280a74136758fcce74f66dc269c7f935cb5489d6a495c71a068323
data/Gemfile CHANGED
@@ -2,3 +2,6 @@ source 'https://rubygems.org'
2
2
 
3
3
  # Specify your gem's dependencies in jekyll-sass-converter.gemspec
4
4
  gemspec
5
+
6
+ gem "jekyll", git: "git://github.com/jekyll/jekyll.git", branch: "no-core-ext"
7
+ gem "rouge"
data/History.markdown ADDED
@@ -0,0 +1,4 @@
1
+ ## HEAD
2
+
3
+ * Birthday!
4
+ * Don't use core extensions (#2)
@@ -21,6 +21,5 @@ Gem::Specification.new do |spec|
21
21
 
22
22
  spec.add_development_dependency "bundler", "~> 1.5"
23
23
  spec.add_development_dependency "rake"
24
- spec.add_development_dependency "jekyll"
25
24
  spec.add_development_dependency "rspec"
26
25
  end
@@ -1,3 +1,3 @@
1
1
  module JekyllSassConverter
2
- VERSION = "1.0.0.rc1"
2
+ VERSION = "1.0.0.rc2"
3
3
  end
@@ -1,4 +1,5 @@
1
1
  require 'sass'
2
+ require 'jekyll/utils'
2
3
 
3
4
  module Jekyll
4
5
  module Converters
@@ -19,7 +20,9 @@ module Jekyll
19
20
  end
20
21
 
21
22
  def sass_build_configuration_options(overrides)
22
- jekyll_sass_configuration.deep_merge(overrides).symbolize_keys
23
+ Jekyll::Utils.hash_symbolize_keys(
24
+ Jekyll::Utils.hash_deep_merge(jekyll_sass_configuration, overrides)
25
+ )
23
26
  end
24
27
 
25
28
  def syntax_type_of_content(content)
@@ -37,11 +40,7 @@ module Jekyll
37
40
 
38
41
  def sass_dir_relative_to_site_source
39
42
  # FIXME: Not Windows-safe. Can only change once Jekyll 2.0.0 is out
40
- # Jekyll.sanitized_path(@config["source"], sass_dir)
41
- File.join(
42
- @config["source"],
43
- File.expand_path(sass_dir, "/")
44
- )
43
+ Jekyll.sanitized_path(@config["source"], sass_dir)
45
44
  end
46
45
 
47
46
  def allow_caching?
data/spec/spec_helper.rb CHANGED
@@ -26,9 +26,9 @@ RSpec.configure do |config|
26
26
  end
27
27
 
28
28
  def site_configuration(overrides = {})
29
- Jekyll::Configuration::DEFAULTS.deep_merge(overrides).deep_merge({
29
+ Jekyll::Utils.hash_deep_merge(Jekyll::Configuration::DEFAULTS, overrides.merge({
30
30
  "source" => source_dir,
31
31
  "destination" => dest_dir
32
- })
32
+ }))
33
33
  end
34
34
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-sass-converter
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc1
4
+ version: 1.0.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Parker Moore
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-25 00:00:00.000000000 Z
11
+ date: 2014-03-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass
@@ -52,20 +52,6 @@ dependencies:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
- - !ruby/object:Gem::Dependency
56
- name: jekyll
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - ">="
60
- - !ruby/object:Gem::Version
61
- version: '0'
62
- type: :development
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - ">="
67
- - !ruby/object:Gem::Version
68
- version: '0'
69
55
  - !ruby/object:Gem::Dependency
70
56
  name: rspec
71
57
  requirement: !ruby/object:Gem::Requirement
@@ -91,6 +77,7 @@ files:
91
77
  - ".rspec"
92
78
  - ".travis.yml"
93
79
  - Gemfile
80
+ - History.markdown
94
81
  - LICENSE.txt
95
82
  - README.md
96
83
  - Rakefile