octopress-asset-pipeline 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9262a0c33a0c7c88bbe9306d6e7563c832cb172b
-  data.tar.gz: 160c46f0cfa00af04a5afcc573ef3aed152b9a58
+  metadata.gz: c7a7c1650a57c445019bbc0fb892ad4b0db48c68
+  data.tar.gz: edc057d9c1fe8d36c9aecf83aeedb234f45ce900
 SHA512:
-  metadata.gz: 6d6f0b53e2eb6fd4cc187cb304e8e47a06a95ac7c9508ff2e680b36ab44e7560ebe6231202746d8c5f26a8218e66a8b2fb909642d13138a95bc8e0d9f9007164
-  data.tar.gz: 5b7ae968ad75c3ef5e7cfa1671e947c71c86e4e9a7cc8790c210532c90ca1c08649b5c40baa5eb27e15a7f8c03a602852c2cff008289883de53bbe98605b57ca
+  metadata.gz: c5d5beb7b2f478cc9b927034e80043ffb84dfcde75880e9da9c5601fc2aeb0a41d73f1dd9b93e480e5b3331a896f86440eee62604cb883880f359e83e67f7720
+  data.tar.gz: 60d5ed234189d96cfccb9fa715bc9fb381dc4f0b27772533af4f399dd5eccabb81e84706c2358d5c286631530d19e010a265c47fe11e2c2e90c1d87f4b3983df

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 2.0.1 - 2015-01-28
+
+- Fix: javascripts ending in .min.js can be sorted manually.
+
 ### 2.0.0 - 2015-01-15
 
 - Change: Reads stylesheets from: `css/` and `stylesheets/`.

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

@@ -1,9 +1,12 @@
 module Octopress
   module AssetPipeline
     class Asset < Ink::Assets::Asset
-      def initialize(plugin, file)
+      attr_reader :file_object
+
+      def initialize(plugin, object)
         @plugin = plugin
-        @file = file
+        @file_object = object
+        @file = object.path
       end
 
       def info
@@ -17,7 +20,7 @@ module Octopress
       end
 
       def base
-        file.relative_path.sub(filename,'').sub(/^\/(.+)\/$/,'\1')
+        file_object.relative_path.sub(filename,'').sub(/^\/(.+)\/$/,'\1')
       end
 
       def destination
@@ -25,7 +28,7 @@ module Octopress
       end
 
       def path
-        Pathname.new file.path
+        file
       end
 
       # Copy is unncessary with local assets

data/lib/octopress-asset-pipeline/assets/coffeescript.rb

@@ -1,12 +1,12 @@
 module Octopress
   module AssetPipeline
     class Coffeescript < Javascript
-      def compile
-        ::CoffeeScript.compile(file.content)
+      def content
+        ::CoffeeScript.compile(super)
       end
 
       def path
-        Pathname.new File.join(Octopress.site.source, file.path)
+        File.join(Octopress.site.source, file)
       end
 
       def destination

data/lib/octopress-asset-pipeline/assets/css.rb

@@ -6,12 +6,16 @@ module Octopress
       end
 
       def destination
-        File.join(base, filename.sub(/@(.+?)\./,'.'))
+        File.join(base, output_file_name)
       end
-
+      
       def tag
         "<link href='#{Filters.expand_url(destination)}' media='#{media}' rel='stylesheet' type='text/css'>"
       end
+
+      def output_file_name
+        filename.sub(/@/,'-')
+      end
     end
   end
 end

data/lib/octopress-asset-pipeline/assets/sass.rb

@@ -1,12 +1,14 @@
 module Octopress
   module AssetPipeline
     class Sass < Css
+      attr_reader :render
+
       def ext
-        file.ext
+        file_object.ext
       end
 
       def path
-        Pathname.new File.join(Octopress.site.source, file.path)
+        File.join(Octopress.site.source, file)
       end
 
       def destination
@@ -14,14 +16,23 @@ module Octopress
       end
 
       def add
-        Ink::Plugins.static_files << Ink::StaticFileContent.new(compile, destination)
+        Ink::Plugins.static_files << Ink::StaticFileContent.new(content, destination)
       end
 
       def data
-        file.data
+        file_object.data
       end
 
-      def compile
+      def content
+        @render ||= begin
+          contents = super
+          if asset_payload = payload
+            Liquid::Template.parse(contents).render!(payload)
+          else
+            contents
+          end
+        end
+
         Ink::PluginAssetPipeline.compile_sass(self)
       end
     end

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

@@ -1,5 +1,5 @@
 module Octopress
   module AssetPipeline
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/lib/octopress-asset-pipeline.rb

@@ -117,15 +117,10 @@ module Octopress
       #
       def add_static_files
         find_static_assets(asset_dirs, '.js', '.css').each do |f|
-          if f.path =~ /\.js$/ 
-            if f.path =~ /\.min\.js$/i
-              @no_compress_js << Javascript.new(self, f)
-            else f.path =~ /\.js$/ 
-              @js << Javascript.new(self, f)
-            end
+          if File.extname(f.path) == '.js'
+            @js << Javascript.new(self, f)
             Octopress.site.static_files.delete(f) if combine_js
-
-          elsif f.path =~ /\.css$/
+          elsif File.extname(f.path) == '.css'
             @css << Css.new(self, f)
             Octopress.site.static_files.delete(f) if combine_css
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink