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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a5a330647c5fc08383c7fa2e975581efb5f5e2d
-  data.tar.gz: 70b8fbc1a5c00bfbfae9860505de0ef96471a6b3
+  metadata.gz: 8872dece081bf7022cec20041d682e1ec4da2f2e
+  data.tar.gz: 469fab7a59a58ee0669b4c0d1c77da480bf9d212
 SHA512:
-  metadata.gz: e295fa24ed3f62353c8f525a7f803f6139305a238f8b0fa554a163a3dedbc19c1a9f6ca6be0ef6bd13a57b11ad665aafe73c11106143a2b04fc974d46c5220e8
-  data.tar.gz: 03786d64805e0578ae2a52346c53a4f64e60ba52f1308b88ee6630304e029d10c2b17c193691f096172151587f460cc8889e8e96e2cae4bc34f2828c69fe96ea
+  metadata.gz: f20b4c8e0d4a698c6081744eb9a874fbf41c15ab2482635c3eec08c46d9aacab9054e0f3a327d385f378ffda08cd458c4887cf9f1723b97bdaaa7b6ca054710a
+  data.tar.gz: c9c534bf301950127c70a978fc56e3fafa48fd51fa35f89820749fa18edc0ac8f8276766e0280a74136758fcce74f66dc269c7f935cb5489d6a495c71a068323

data/Gemfile

@@ -2,3 +2,6 @@ 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 "rouge"

data/History.markdown

@@ -0,0 +1,4 @@
+## HEAD
+
+* Birthday!
+* Don't use core extensions (#2)

data/jekyll-sass-converter.gemspec

@@ -21,6 +21,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "jekyll"
   spec.add_development_dependency "rspec"
 end

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

@@ -1,3 +1,3 @@
 module JekyllSassConverter
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc2"
 end

data/lib/jekyll/converters/sass.rb

@@ -1,4 +1,5 @@
 require 'sass'
+require 'jekyll/utils'
 
 module Jekyll
   module Converters
@@ -19,7 +20,9 @@ module Jekyll
       end
 
       def sass_build_configuration_options(overrides)
-        jekyll_sass_configuration.deep_merge(overrides).symbolize_keys
+        Jekyll::Utils.hash_symbolize_keys(
+          Jekyll::Utils.hash_deep_merge(jekyll_sass_configuration, overrides)
+        )
       end
 
       def syntax_type_of_content(content)
@@ -37,11 +40,7 @@ module Jekyll
 
       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)
-        File.join(
-          @config["source"],
-          File.expand_path(sass_dir, "/")
-        )
+        Jekyll.sanitized_path(@config["source"], sass_dir)
       end
 
       def allow_caching?

data/spec/spec_helper.rb

@@ -26,9 +26,9 @@ RSpec.configure do |config|
   end
 
   def site_configuration(overrides = {})
-    Jekyll::Configuration::DEFAULTS.deep_merge(overrides).deep_merge({
+    Jekyll::Utils.hash_deep_merge(Jekyll::Configuration::DEFAULTS, overrides.merge({
       "source" => source_dir,
       "destination" => dest_dir
-    })
+    }))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sass-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jekyll
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +77,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- History.markdown
 - LICENSE.txt
 - README.md
 - Rakefile