octopress-ink 1.0.0.rc.21 → 1.0.0.rc.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f537a9fba193fcd94d397c8ba99b25c8e7d1b02
-  data.tar.gz: c17b345185bf16c0b37b9778afbb6886de3bb4f4
+  metadata.gz: 647bcbdbcf354195f3990d5a63ad12b63b52b9cd
+  data.tar.gz: 86d6463658166fc12f5ef709144d0b247911a5d2
 SHA512:
-  metadata.gz: c469002b6db39ef5315845dc649cbd6bb77e5d38ca63e050d44d1ee7d952e831450bc3bbc63e8f66e7031ca045a19ea0b1d42ba7e1f5acbe781dbcaadf409f40
-  data.tar.gz: 9e3910263a34f3f44a49a2cf340f66266a4fef28cadc982c61b721fd1301d4f9e8e875c1f55d40868fd41a3f347873e77b57e1f48983c1360bd68a9306f2ec95
+  metadata.gz: 7280f35abb690a97429b47c58a4b62fad146b2cd8a2de8a8903003cf7fcf424c433e6f26f0f9f05ee64f692ade152d6be887f28b22d891105d80152923baba09
+  data.tar.gz: d12f8f562636a17c2ee61c52bbd74b870a2d2f0c43595bedc941a67aee624a8c0c2161f47f89c070705bbcb7a71de03cc7eccc26be2503dac18d76dcedec23ba

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC22 - 2015-01-01
+
+- Moved Asset pipeline configuration under `asset_pipline` key in _config.yml 
+
 ### 1.0.0 RC21 - 2014-12-13
 
 - Documentation fixes

data/lib/octopress-ink/configuration.rb

@@ -1,20 +1,21 @@
 # encoding: UTF-8
-require 'yaml'
 
 module Octopress
   module Ink
     DEFAULT_OPTIONS = {
-      'combine_css' => true,
-      'compress_css' => true,
-      'combine_js' => true,
-      'compress_js' => true,
-      'uglifier' => {},
-      'disable' => [],
+      'asset_pipeline' => {
+        'combine_css' => true,
+        'compress_css' => true,
+        'combine_js' => true,
+        'compress_js' => true,
+        'uglifier' => {},
+      },
+
       'date_format' => 'ordinal',
     }
 
     def self.configuration(options={})
-      @config ||= DEFAULT_OPTIONS.merge(Octopress.configuration(options))
+      @config ||= Jekyll::Utils.deep_merge_hashes(DEFAULT_OPTIONS, Octopress.configuration(options))
     end
 
   end

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -7,7 +7,7 @@ module Octopress
       def self.compile_css(content)
         configs = sass_converter.sass_configs
         configs[:syntax] = :scss
-        configs[:style] ||= :compressed if Ink.configuration['compress_css']
+        configs[:style] ||= :compressed if Ink.configuration['asset_pipeline']['compress_css']
 
         Sass.compile(content, configs)
       end
@@ -158,8 +158,8 @@ module Octopress
         @combined_javascripts = nil
         js = combine_javascripts
         unless js == ''
-          if Ink.configuration['compress_js']
-            settings = Jekyll::Utils.symbolize_hash_keys(Ink.configuration['uglifier'])
+          if Ink.configuration['asset_pipeline']['compress_js']
+            settings = Jekyll::Utils.symbolize_hash_keys(Ink.configuration['asset_pipeline']['uglifier'])
             js = Uglifier.new(settings).compile(js)
           end
           write_files(js, combined_javascript_path)

data/lib/octopress-ink/plugins.rb

@@ -117,7 +117,7 @@ module Octopress
       # Copy/Generate Stylesheets
       #
       def self.add_stylesheets
-        if Ink.configuration['combine_css']
+        if Ink.configuration['asset_pipeline']['combine_css']
           PluginAssetPipeline.write_combined_stylesheet
         else
           add_assets(%w{css sass})
@@ -127,7 +127,7 @@ module Octopress
       # Copy/Generate Javascripts
       #
       def self.add_javascripts
-        if Ink.configuration['combine_js']
+        if Ink.configuration['asset_pipeline']['combine_js']
           PluginAssetPipeline.write_combined_javascript
         else
           add_assets(%w{js coffee})
@@ -135,7 +135,7 @@ module Octopress
       end
 
       def self.css_tags
-        if Ink.configuration['combine_css']
+        if Ink.configuration['asset_pipeline']['combine_css']
           PluginAssetPipeline.combined_stylesheet_tag
         else
           @css_tags.join('')
@@ -143,7 +143,7 @@ module Octopress
       end
 
       def self.js_tags
-        if Ink.configuration['combine_js']
+        if Ink.configuration['asset_pipeline']['combine_js']
           PluginAssetPipeline.combined_javascript_tag
         else
           @js_tags.join('')

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.21"
+    VERSION = "1.0.0.rc.22"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.21
+  version: 1.0.0.rc.22
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll