octopress-asset-pipeline 2.0.5 → 2.0.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8be2a62736676fde82afaa85afbb7a2e0cc7574c
4
- data.tar.gz: 7d34940e4055544761aa7c4cca6a48d235243128
3
+ metadata.gz: e47837dbd6a94b20996b22d853d167549cc39fc5
4
+ data.tar.gz: e237de8a8f399b6d2cdca729dcea1bf02cf1d9d4
5
5
  SHA512:
6
- metadata.gz: 4fb6a81995a21c7a9db4009eed019ad77f35292581bd6b6feaf24567705be6f0c246113afa2e4e3a96a0441d70c1221def4c0780614a54676a5dcaa6e925c740
7
- data.tar.gz: 55655fbb8187066561859cfe19ef04994f41c26542db101036168ff1390d3928cb53b600f8284f1fbab5b0bc42b02d03db457fc26171767fcc32e132c08e587e
6
+ metadata.gz: c16cb46544aae5cf789f8fc9f1434f9d6e9b093b77a15b75c25fea502b4da80b2800cd0c6c29fce8c6851db75d78d5b1968a2d47dee16c93b11de69f33edd20b
7
+ data.tar.gz: 4dfecdf397da1b3ad4333f7e79f2e5553f69c569af4ec09b7bce5ecc3855dae63bb005e34697df79723a863cfe178fadd247a0e3c9a4fb71c4b4fba149af21b5
@@ -1,5 +1,10 @@
1
1
  # Changelog
2
2
 
3
+ ### 2.0.5 - 2015-07-26
4
+
5
+ - Deprecation: Configuration keys `stylesheets_dir` and `javascripts_dir` have been renamed to `stylesheets_source` and `javascripts_source` to be more Jekyll-like.
6
+
7
+
3
8
  ### 2.0.5 - 2015-05-24
4
9
 
5
10
  - Now js and css files with YAML front-matter are now rendered as pages before added to asset pipeline.
data/README.md CHANGED
@@ -2,8 +2,8 @@
2
2
 
3
3
  Combine and compress and fingerprint Stylesheets (CSS and Sass) and Javascripts (JS and Coffeescript) to a single fingerprinted .css or .js file.
4
4
 
5
- [![Build Status](https://travis-ci.org/octopress/asset-pipeline.png?branch=master)](https://travis-ci.org/octopress/asset-pipeline)
6
- [![Gem Version](https://badge.fury.io/rb/octopress-asset-pipeline.png)](http://badge.fury.io/rb/octopress-asset-pipeline)
5
+ [![Build Status](https://travis-ci.org/octopress/asset-pipeline.svg?branch=master)](https://travis-ci.org/octopress/asset-pipeline)
6
+ [![Gem Version](https://badge.fury.io/rb/octopress-asset-pipeline.svg)](http://badge.fury.io/rb/octopress-asset-pipeline)
7
7
 
8
8
  **How it works:** This plugin will automatically read .js, .coffee, .css, .scss and .sass files from your site, combine, compress and fingerprint them so they're ready for deployment. Then add the liquid tags to your site layout to write
9
9
  the necessary script or link tags.
@@ -40,9 +40,21 @@ module Octopress
40
40
  def config(*args)
41
41
  @config ||= begin
42
42
  c = Ink.configuration['asset_pipeline']
43
+
44
+ # Deprecation warning - remove in 2.1
45
+ if c['javascripts_dir']
46
+ warn('Deprecation Warning:'.yellow + ' Asset_pipeline configuration key `javascripts_dir` has been renamed to `javascripts_source`. Please update your configuration.')
47
+ c['javascripts_source'] = c.delete('javascripts_dir')
48
+ end
49
+
50
+ if c['stylesheets_dir']
51
+ warn('Deprecation Warning:'.yellow + ' Asset_pipeline configuration key `stylesheets_dir` has been renamed to `stylesheets_source`. Please update your configuration.')
52
+ c['stylesheets_source'] = c.delete('stylesheets_dir')
53
+ end
54
+
43
55
  {
44
- 'stylesheets_dir' => ['stylesheets', 'css'],
45
- 'javascripts_dir' => ['javascripts', 'js']
56
+ 'stylesheets_source' => ['stylesheets', 'css'],
57
+ 'javascripts_source' => ['javascripts', 'js']
46
58
  }.merge(c).merge({ 'disable' => {} })
47
59
  end
48
60
  end
@@ -50,11 +62,7 @@ module Octopress
50
62
  private
51
63
 
52
64
  def asset_dirs
53
- [config['stylesheets_dir'], config['javascripts_dir']].flatten
54
- end
55
-
56
- def css_dirs
57
- config['stylesheets_dir']
65
+ [config['stylesheets_source'], config['javascripts_source']].flatten
58
66
  end
59
67
 
60
68
  def combine_css
@@ -1,5 +1,5 @@
1
1
  module Octopress
2
2
  module AssetPipeline
3
- VERSION = "2.0.5"
3
+ VERSION = "2.0.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress-asset-pipeline
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.5
4
+ version: 2.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-24 00:00:00.000000000 Z
11
+ date: 2015-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: octopress-ink
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
117
117
  version: '0'
118
118
  requirements: []
119
119
  rubyforge_project:
120
- rubygems_version: 2.4.6
120
+ rubygems_version: 2.4.7
121
121
  signing_key:
122
122
  specification_version: 4
123
123
  summary: Combine and compress CSS and Sass, Javascript and Coffeescript to a single