octopress-asset-pipeline 1.1.6 → 1.1.7

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: 5399a157bed09b392503478d7beb4306cbe708bb
4
- data.tar.gz: 9ea16b684e79fdef9525b797238c3150bf343c37
3
+ metadata.gz: 64ced752758764404dd6615c838cce1b38652f2b
4
+ data.tar.gz: a158ae6dc1ec401c138c27122144f5be0cac02c4
5
5
  SHA512:
6
- metadata.gz: a573b81b822f6de19fe54f92fa812e4bedeee29b7a2324c82cd9c55a544224838758ea5a56f415388720cf2ac0c448cb179771486b09f3eb4bf3eb40bc26e201
7
- data.tar.gz: fce5b672fdb695ac313582e072e1614b64bc60d9b832562606b00fa102c14ec8730f015671e757c96efb8a6adae30175ddc517b423544243a0c19a72e06168f9
6
+ metadata.gz: 61fa65441c3a9756af0b1265d69a419a0d72bbcf749e11e5eade3a47135bc3636ffa1d786a014a568eccc68d0e448641c2fc15b1954979baac834b6d6259cef6
7
+ data.tar.gz: d4cc5d32193f506c8f5e7791528081af39b74ca2c30d79249980c068ca36c97566ee5233ffb40f973ca991b89dc1691c2f9ea10fd60c9e336667ef1063d2b248
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ### 1.1.7 - 2015-01-14
4
+
5
+ - Minified js support - file.min.js isn't compressed again, and is added first to build.
6
+
3
7
  ### 1.1.6 - 2015-01-09
4
8
 
5
9
  - Fixed: Enforced default sorting by path.
@@ -1,5 +1,5 @@
1
1
  module Octopress
2
2
  module AssetPipeline
3
- VERSION = "1.1.6"
3
+ VERSION = "1.1.7"
4
4
  end
5
5
  end
@@ -2,7 +2,7 @@ require 'octopress'
2
2
  require 'octopress-ink'
3
3
  require 'octopress-asset-pipeline/version'
4
4
 
5
- require 'octopress-asset-pipeline/assets/local'
5
+ require 'octopress-asset-pipeline/assets/asset'
6
6
  require 'octopress-asset-pipeline/assets/css'
7
7
  require 'octopress-asset-pipeline/assets/sass'
8
8
  require 'octopress-asset-pipeline/assets/javascript'
@@ -109,7 +109,7 @@ module Octopress
109
109
  # Finds all Sass files registered by Jekyll
110
110
  #
111
111
  def add_sass
112
- Octopress.site.pages.dup.sort_by{|f| f.path}.each do |f|
112
+ Octopress.site.pages.dup.sort_by(&:path).each do |f|
113
113
  if f.ext =~ /\.s[ca]ss/
114
114
  @sass << Sass.new(self, f)
115
115
  Octopress.site.pages.delete(f)
@@ -120,7 +120,7 @@ module Octopress
120
120
  # Finds all CSS files registered by Jekyll
121
121
  #
122
122
  def add_css
123
- Octopress.site.static_files.dup.sort_by{|f| f.path}.each do |f|
123
+ Octopress.site.static_files.dup.sort_by(&:path).each do |f|
124
124
  if f.path =~ /\.css$/
125
125
  @css << Css.new(self, f)
126
126
  Octopress.site.static_files.delete(f) if combine_css
@@ -131,7 +131,7 @@ module Octopress
131
131
  # Finds all Coffeescript files registered by Jekyll
132
132
  #
133
133
  def add_coffee
134
- Octopress.site.pages.dup.sort_by{|f| f.path}.each do |f|
134
+ Octopress.site.pages.dup.sort_by(&:path).each do |f|
135
135
  if f.ext =~ /\.coffee$/
136
136
  @coffee << Coffeescript.new(self, f)
137
137
  Octopress.site.pages.delete(f) if combine_js
@@ -142,9 +142,13 @@ module Octopress
142
142
  # Finds all Javascript files registered by Jekyll
143
143
  #
144
144
  def add_js
145
- Octopress.site.static_files.dup.sort_by{|f| f.path}.each do |f|
145
+ Octopress.site.static_files.dup.sort_by(&:path).each do |f|
146
146
  if f.path =~ /\.js$/
147
- @js << Javascript.new(self, f)
147
+ if f.path =~ /\.min\.js$/i
148
+ @no_compress_js << Javascript.new(self, f)
149
+ else
150
+ @js << Javascript.new(self, f)
151
+ end
148
152
  Octopress.site.static_files.delete(f) if combine_js
149
153
  end
150
154
  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: 1.1.6
4
+ version: 1.1.7
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-01-10 00:00:00.000000000 Z
11
+ date: 2015-01-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: octopress-ink
@@ -92,10 +92,10 @@ files:
92
92
  - LICENSE.txt
93
93
  - README.md
94
94
  - lib/octopress-asset-pipeline.rb
95
+ - lib/octopress-asset-pipeline/assets/asset.rb
95
96
  - lib/octopress-asset-pipeline/assets/coffeescript.rb
96
97
  - lib/octopress-asset-pipeline/assets/css.rb
97
98
  - lib/octopress-asset-pipeline/assets/javascript.rb
98
- - lib/octopress-asset-pipeline/assets/local.rb
99
99
  - lib/octopress-asset-pipeline/assets/sass.rb
100
100
  - lib/octopress-asset-pipeline/version.rb
101
101
  homepage: https://github.com/octopress/asset-pipeline