alula 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/alula/config.rb

@@ -107,6 +107,7 @@ module Alula
       assets: {
         production: {
           compress: true,
+          gzip: true,
         },
       },
       

data/lib/alula/core_ext.rb

@@ -1,5 +1,4 @@
 require 'alula/core_ext/tag'
 require 'alula/core_ext/filter'
 
-require 'alula/core_ext/manifest'
 require 'alula/core_ext/environment'

data/lib/alula/site.rb

@@ -335,11 +335,16 @@ module Alula
       progress.create :assets, title: "Compiling assets", total: @environment.each_logical_path.count
       progress.display
       
-      @manifest = Manifest.new(@environment, @storage.path(:assets))
-      @manifest.progress = -> { progress.step(:assets) }
-
-      @manifest.compile
-
+      @environment.each_logical_path do |logical_path|
+        if asset = @environment.find_asset(logical_path)
+          target = File.join(@storage.path(:assets), asset.digest_path)
+          asset.write_to(target)
+          asset.write_to("#{target}.gz") if target =~ /\.(css|js)$/ and self.config.assets.gzip
+        end
+        
+        progress.step :assets
+      end
+      
       progress.finish(:assets)
       progress.hide
     end
@@ -394,10 +399,12 @@ module Alula
       say "==> Cleaning up"
       
       asset_path = @storage.path(:assets)
-      assets = @environment.used
-        .collect{|u| @environment[u]}
-        .reject{|u| u.nil?}
-        .collect{|u| File.join(asset_path, u.digest_path)}
+      assets = @environment.used.collect do |asset_name|
+        if asset = @environment[asset_name]
+          filename = File.join(asset_path, asset.digest_path)
+          [filename, self.config.assets.gzip ? "#{filename}.gz" : ""]
+        end
+      end.flatten.reject { |u| u.nil? or !File.exists?(u) }
       outputted = @storage.outputted.reject{|o|o[/^#{asset_path}/]}
       
       keep = (assets + outputted).collect{|p| File.expand_path(p)}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -478,7 +478,6 @@ files:
 - lib/alula/core_ext/environment.rb
 - lib/alula/core_ext/filter.rb
 - lib/alula/core_ext/filters/smilies.rb
-- lib/alula/core_ext/manifest.rb
 - lib/alula/core_ext/tag.rb
 - lib/alula/core_ext/tags/attachment.rb
 - lib/alula/core_ext/tags/blockquote.rb
@@ -644,7 +643,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1741549545950359513
+      hash: -1743979110796598187
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -653,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1741549545950359513
+      hash: -1743979110796598187
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/alula/core_ext/manifest.rb

@@ -1,30 +0,0 @@
-require 'sprockets/manifest'
-
-module Alula
-  class Manifest < Sprockets::Manifest
-    attr_accessor :progress
-    
-    def assets_with_tracking
-      @_assets ||= AssetTracker.new assets_without_tracking, @progress
-    end
-    alias_method :assets_without_tracking, :assets
-    alias_method :assets, :assets_with_tracking
-    
-    private
-    class AssetTracker
-      def initialize(hash, progress_callback)
-        @hash = hash
-        @progress_cb = progress_callback
-      end
-      
-      def [](key)
-        @hash[key]
-      end
-      
-      def []=(key, value)
-        @hash[key] = value
-        @progress_cb.call if @progress_cb
-      end
-    end
-  end
-end