turbo-sprockets-rails3 0.2.3 → 0.2.4

data/README.md

@@ -45,7 +45,7 @@ Enjoy your lightning fast deploys!
 `turbo-sprockets-rails3` can now remove expired assets after each compile. If the environment variable `CLEAN_EXPIRED_ASSETS` is set to `true`, the `assets:clean_expired` task will be run after `assets:precompile`.
 An asset will be deleted if it is no longer referenced by `manifest.yml`, and is more than 7 days (default) older than the **previous** compiled assets.
 
-Before the `assets:precompile` task runs, it stores the modification time of the current `manifest.yml` in a file called `expire_assets_after.yml`. When the `assets:clean_expired` task runs, it looks up the time in `expire_assets_after.yml`, and won't expire any assets that were created more recently than that time.
+Before the `assets:precompile` task runs, it stores the modification time of the current `manifest.yml` in a file called `expire_assets_after.yml`. When the `assets:clean_expired` task runs, it looks up the time in `expire_assets_after.yml`, and won't expire any assets that were created on or after than that time.
 
 To expire old assets after precompile, you should compile assets by running `CLEAN_EXPIRED_ASSETS=true rake assets:precompile`. Alternatively, you can run `rake assets:precompile assets:clean_expired`.
 

data/Rakefile

@@ -2,6 +2,9 @@
 require 'rake/testtask'
 ENV["TEST_CORES"] = "1"
 
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 namespace :test do
   task :isolated do
     Dir["test/assets*_test.rb"].each do |file|

data/lib/turbo-sprockets/tasks/assets.rake

@@ -35,6 +35,15 @@ namespace :assets do
     end
   end
 
+  # Returns an array of assets recognized by config.assets.digests,
+  # including gzipped assets and manifests
+  def known_assets
+    assets = Rails.application.config.assets.digests.to_a.flatten.map do |asset|
+      [asset, "#{asset}.gz"]
+    end.flatten
+    assets + %w(manifest.yml sources_manifest.yml)
+  end
+
   desc "Compile all the assets named in config.assets.precompile"
   task :precompile do
     invoke_or_reboot_rake_task "assets:precompile:all"
@@ -61,14 +70,14 @@ namespace :assets do
       env    = Rails.application.assets
       target = File.join(::Rails.public_path, config.assets.prefix)
 
-      # Create `public/assets/expire_assets_after.yml`, containing the timestamp of the previous manifest.yml
-      # (Only for first run)
+      # Before first compile, set the mtime of all current assets to current time.
+      # This time reflects the last time the assets were being used.
       if digest.nil?
-        manifest_path = config.assets.manifest || target
-        manifest_file = File.join(manifest_path, 'manifest.yml')
-        if File.exist?(manifest_file)
-          File.open(File.join(target, 'expire_assets_after.yml'), 'w') do |f|
-            f.puts YAML.dump(:expire_assets_after => File.mtime(manifest_file))
+        ::Rails.logger.debug "Updating mtimes for current assets..."
+        known_assets.each do |asset|
+          full_path = File.join(target, asset)
+          if File.exist?(full_path)
+            File.utime(Time.now, Time.now, full_path)
           end
         end
       end
@@ -119,39 +128,26 @@ namespace :assets do
     invoke_or_reboot_rake_task "assets:clean_expired:all"
   end
 
+  # Remove assets that haven't been deployed since `config.assets.expire_after` (default 7 days).
+  # The precompile task updates the mtime of the current assets before compiling,
+  # which indicates when they were last in use.
+  #
+  # The current assets are ignored, which is faster than the alternative of
+  # setting their mtimes only to check them again.
   namespace :clean_expired do
     task :all => ["assets:environment"] do
-      # Remove assets that aren't referenced by manifest.yml,
-      # and are older than `config.assets.expire_after` (default 7 days),
-      # counting from the **previous** compile.
       config = ::Rails.application.config
       expire_after = config.assets.expire_after || 7.days
       public_asset_path = File.join(::Rails.public_path, config.assets.prefix)
-
-      # Also handle gzipped assets
-      known_assets = config.assets.digests.to_a.flatten.map do |asset|
-        [asset, "#{asset}.gz"]
-      end.flatten
-      known_assets += %w(manifest.yml sources_manifest.yml)
+      @known_assets = known_assets
 
       Dir.glob(File.join(public_asset_path, '**/*')).each do |asset|
         next if File.directory?(asset)
         logical_path = asset.sub("#{public_asset_path}/", '')
 
-        unless logical_path.in?(known_assets)
-          # If 'expire_assets_after.yml' file exists, use that as the base time for expire_after
-          # Otherwise, use Time.now
-          expire_after_base_time = Time.now
-
-          expire_after_file = File.join(::Rails.public_path, config.assets.prefix, 'expire_assets_after.yml')
-          if File.exist?(expire_after_file)
-            if time = YAML.load_file(expire_after_file)[:expire_assets_after]
-              expire_after_base_time = time
-            end
-          end
-
-          # Delete asset if older than expire_after seconds
-          if File.mtime(asset) < (expire_after_base_time - expire_after)
+        unless logical_path.in?(@known_assets)
+          # Delete asset if not used for more than expire_after seconds
+          if File.mtime(asset) < (Time.now - expire_after)
             ::Rails.logger.debug "Removing expired asset: #{logical_path}"
             FileUtils.rm_f asset
           end

data/lib/turbo-sprockets/version.rb

@@ -1,3 +1,3 @@
 module TurboSprockets
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-sprockets-rails3
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -100,12 +100,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4460991150311061382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4460991150311061382
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -134,4 +140,3 @@ test_files:
 - test/assets_debugging_test.rb
 - test/sprockets_helper_with_routes_test.rb
 - test/abstract_unit.rb
-has_rdoc: