octopress-ink 1.0.0.rc.27 → 1.0.0.rc.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32a5b7a5dac5a077da12cd01694826f391404f5a
-  data.tar.gz: f4c9c08daa85688d2c11b75bbecf5ff781b3ffd4
+  metadata.gz: cb5a0fff7675e6e4fb71daeb25bdc9182ba46733
+  data.tar.gz: 7f7b16f0b24ed3950c4a443d78f9014d68d26814
 SHA512:
-  metadata.gz: 654770c57b1eea96fb851dcb9233ec91e19edd814e8a352e64b3260e313a3ec4cae820daa4477a052cc1d9ab13987cdd2dfd7d442883453480d7464e49f02a95
-  data.tar.gz: d9483ec25050ae5c4a956b98149eba15e817570823e92ecaa9dbc43e97834cbaa610b569a93691dfbfe67107423e376f98007226e6ec49d83c58ac95632d8493
+  metadata.gz: b42fa1b59613766cc22f41186cad54981c8dd261273e53e1bc69400b08c5a0d59ef9772ecfe71ae06ce64dbc91271525d3cacb54d72457015d97565ca88db4a2
+  data.tar.gz: 19dd65c91260292c6a6912ef3a633eb3b687100f9f26b4a58b15d761b66e8d468c93ba3c8ace4da7723e9924ac74fef24cfb9ee99427fc022c36655734117ca3

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-### 1.0.0 RC26 - 2015-01-12
+### 1.0.0 RC27 - 2015-01-14
+
+- Minified javascripts (whatever.min.js) are not re-compressed and are added first in the builds
+
+### 1.0.0 RC27 - 2015-01-12
 
 - Fixed: Invisible "dot" files are now ignored as plugin assets. [#32](https://github.com/octopress/ink/issues/32)
 

data/lib/octopress-ink/commands/new.rb

@@ -261,7 +261,6 @@ gemspec path: '../'
             gemspec: gemspec,
             gemspec_path: gemspec_path,
             spec_var: gemspec.scan(/(\w+)\.name/).flatten[0],
-            version: gemspec.scan(/version.+=\s+(.+)$/).flatten[0],
             name: gemspec.scan(/name.+['"](.+)['"]/).flatten[0],
             version: version,
             require_version: require_version,

data/lib/octopress-ink/plugin.rb

@@ -31,6 +31,7 @@ module Octopress
         @includes          = []
         @css               = []
         @js                = []
+        @no_compress_js    = []
         @coffee            = []
         @images            = []
         @sass              = []
@@ -113,6 +114,10 @@ module Octopress
         js.clone.concat coffee
       end
 
+      def no_compress_js
+        @no_compress_js.reject(&:disabled?).compact
+      end
+
       # Plugin configuration
       #
       # returns: Hash of merged user and default config.yml files
@@ -181,6 +186,7 @@ module Octopress
           'sass'        => @sass, 
           'css'         => @css,
           'js'          => @js, 
+          'minjs'       => @no_compress_js, 
           'coffee'      => @coffee, 
           'images'      => @images, 
           'fonts'       => @fonts, 
@@ -286,6 +292,7 @@ module Octopress
 
           if asset_types['javascripts']
             asset_types['js'] = true
+            asset_types['minjs'] = true
             asset_types['coffee'] = true
             asset_types.delete('javascripts')
           end
@@ -347,7 +354,9 @@ module Octopress
 
       def add_javascripts
         find_assets(@javascripts_dir).each do |asset|
-          if File.extname(asset) =~ /\.js$/
+          if asset =~ /\.min\.js$/
+            @no_compress_js << Assets::Javascript.new(self, @javascripts_dir, asset)
+          elsif asset =~ /\.js$/
             @js << Assets::Javascript.new(self, @javascripts_dir, asset)
           elsif File.extname(asset) =~ /\.coffee$/
             @coffee << Assets::Coffeescript.new(self, @javascripts_dir, asset)
@@ -384,11 +393,11 @@ module Octopress
       end
 
       def css
-        @css.reject{|f| f.disabled? }.compact
+        @css.reject(&:disabled?).compact
       end
 
       def sass
-        @sass.reject{|f| f.disabled? }.compact
+        @sass.reject(&:disabled?).compact
       end
 
       def sass_without_partials
@@ -396,11 +405,11 @@ module Octopress
       end
 
       def js
-        @js.reject{|f| f.disabled? }.compact
+        @js.reject(&:disabled?).compact
       end
 
       def coffee
-        @coffee.reject{|f| f.disabled? }.compact
+        @coffee.reject(&:disabled?).compact
       end
 
       def configuration; {}; end

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -101,7 +101,7 @@ module Octopress
       def self.stylesheet_fingerprint(media)
         @stylesheet_fingerprint ||= {}
         @stylesheet_fingerprint[media] ||=
-          fingerprint(stylesheets[media].clone.map {|f| f.path })
+          fingerprint(stylesheets[media].clone.map(&:path))
       end
 
       # Get all plugins stylesheets
@@ -127,27 +127,35 @@ module Octopress
 
       def self.javascripts
         @javascripts ||=
-          Plugins.plugins.clone.map { |p| p.javascripts }.flatten
+          Plugins.plugins.clone.map(&:javascripts).flatten
+      end
+
+      def self.no_compress_js
+        @no_compress_js ||= Plugins.plugins.clone.map(&:no_compress_js).flatten
       end
 
       def self.javascript_fingerprint
         @javascript_fingerprint ||=
-          fingerprint(javascripts.clone.map {|f| f.path })
+          fingerprint(javascripts.clone.concat(no_compress_js).map(&:path))
       end
 
       def self.combine_javascripts
-        if @combined_javascripts
-          @combined_javascripts
-        else
-          js = ""
-          javascripts.clone.each do |file| 
-            unless js =~ /#{file.plugin.name}/
-              js += "/* #{file.plugin.type.capitalize}: #{file.plugin.name} */\n" 
-            end
-            js += (file.ext.match(/.coffee/) ? file.compile : file.content)
+        @combined_javascripts ||= combine_js(javascripts)
+      end
+
+      def self.combine_no_compress_javascripts
+        @combined_no_compress_javascripts ||= combine_js(no_compress_js)
+      end
+
+      def self.combine_js(files)
+        js = ''
+        files.each do |file|
+          unless js =~ /#{file.plugin.name}/
+            js << "/* #{file.plugin.type.capitalize}: #{file.plugin.name} */\n" 
           end
-          @combined_javascripts = js
+          js << (file.ext.match(/.coffee/) ? file.compile : file.content)
         end
+        (js == '' ? false : js)
       end
 
       def self.combined_javascript_path
@@ -156,12 +164,12 @@ module Octopress
 
       def self.write_combined_javascript
         @combined_javascripts = nil
-        js = combine_javascripts
-        unless js == ''
+        if js = combine_javascripts
           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
+          js = combine_no_compress_javascripts << js
           write_files(js, combined_javascript_path)
         end
       end

data/lib/octopress-ink/version.rb

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

metadata

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