octopress-asset-pipeline 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5399a157bed09b392503478d7beb4306cbe708bb
-  data.tar.gz: 9ea16b684e79fdef9525b797238c3150bf343c37
+  metadata.gz: 64ced752758764404dd6615c838cce1b38652f2b
+  data.tar.gz: a158ae6dc1ec401c138c27122144f5be0cac02c4
 SHA512:
-  metadata.gz: a573b81b822f6de19fe54f92fa812e4bedeee29b7a2324c82cd9c55a544224838758ea5a56f415388720cf2ac0c448cb179771486b09f3eb4bf3eb40bc26e201
-  data.tar.gz: fce5b672fdb695ac313582e072e1614b64bc60d9b832562606b00fa102c14ec8730f015671e757c96efb8a6adae30175ddc517b423544243a0c19a72e06168f9
+  metadata.gz: 61fa65441c3a9756af0b1265d69a419a0d72bbcf749e11e5eade3a47135bc3636ffa1d786a014a568eccc68d0e448641c2fc15b1954979baac834b6d6259cef6
+  data.tar.gz: d4cc5d32193f506c8f5e7791528081af39b74ca2c30d79249980c068ca36c97566ee5233ffb40f973ca991b89dc1691c2f9ea10fd60c9e336667ef1063d2b248

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.1.7 - 2015-01-14
+
+- Minified js support - file.min.js isn't compressed again, and is added first to build.
+
 ### 1.1.6 - 2015-01-09
 
 - Fixed: Enforced default sorting by path.

data/lib/octopress-asset-pipeline/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module AssetPipeline
-    VERSION = "1.1.6"
+    VERSION = "1.1.7"
   end
 end

data/lib/octopress-asset-pipeline.rb

@@ -2,7 +2,7 @@ require 'octopress'
 require 'octopress-ink'
 require 'octopress-asset-pipeline/version'
 
-require 'octopress-asset-pipeline/assets/local'
+require 'octopress-asset-pipeline/assets/asset'
 require 'octopress-asset-pipeline/assets/css'
 require 'octopress-asset-pipeline/assets/sass'
 require 'octopress-asset-pipeline/assets/javascript'
@@ -109,7 +109,7 @@ module Octopress
       # Finds all Sass files registered by Jekyll
       #
       def add_sass
-        Octopress.site.pages.dup.sort_by{|f| f.path}.each do |f| 
+        Octopress.site.pages.dup.sort_by(&:path).each do |f| 
           if f.ext =~ /\.s[ca]ss/ 
             @sass << Sass.new(self, f)
             Octopress.site.pages.delete(f)
@@ -120,7 +120,7 @@ module Octopress
       # Finds all CSS files registered by Jekyll
       #
       def add_css
-        Octopress.site.static_files.dup.sort_by{|f| f.path}.each do |f| 
+        Octopress.site.static_files.dup.sort_by(&:path).each do |f| 
           if f.path =~ /\.css$/ 
             @css << Css.new(self, f)
             Octopress.site.static_files.delete(f) if combine_css
@@ -131,7 +131,7 @@ module Octopress
       # Finds all Coffeescript files registered by Jekyll
       #
       def add_coffee
-        Octopress.site.pages.dup.sort_by{|f| f.path}.each do |f| 
+        Octopress.site.pages.dup.sort_by(&:path).each do |f| 
           if f.ext =~ /\.coffee$/ 
             @coffee << Coffeescript.new(self, f)
             Octopress.site.pages.delete(f) if combine_js
@@ -142,9 +142,13 @@ module Octopress
       # Finds all Javascript files registered by Jekyll
       #
       def add_js
-        Octopress.site.static_files.dup.sort_by{|f| f.path}.each do |f| 
+        Octopress.site.static_files.dup.sort_by(&:path).each do |f| 
           if f.path =~ /\.js$/ 
-            @js << Javascript.new(self, f)
+            if f.path =~ /\.min\.js$/i
+              @no_compress_js << Javascript.new(self, f)
+            else
+              @js << Javascript.new(self, f)
+            end
             Octopress.site.static_files.delete(f) if combine_js
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink
@@ -92,10 +92,10 @@ files:
 - LICENSE.txt
 - README.md
 - lib/octopress-asset-pipeline.rb
+- lib/octopress-asset-pipeline/assets/asset.rb
 - lib/octopress-asset-pipeline/assets/coffeescript.rb
 - lib/octopress-asset-pipeline/assets/css.rb
 - lib/octopress-asset-pipeline/assets/javascript.rb
-- lib/octopress-asset-pipeline/assets/local.rb
 - lib/octopress-asset-pipeline/assets/sass.rb
 - lib/octopress-asset-pipeline/version.rb
 homepage: https://github.com/octopress/asset-pipeline