compressed-gzipped-assets 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/compressed-gzipped-assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{compressed-gzipped-assets}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Shaw"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-01-26}
   s.description = %q{for more info see the readme.}
   s.email = %q{ryankshaw@gmail.com}
   s.extra_rdoc_files = [

data/lib/compressed-gzipped-assets.rb

@@ -9,16 +9,6 @@ raise "GoogleClosureCompiler only Supports Rails >= 2.1.x" unless Rails.version
 # Supports Rails >= 2.1.x
 module ActionView::Helpers::AssetTagHelper
 private
-  def join_asset_file_contents_with_compilation(files)
-    content = join_asset_file_contents_without_compilation(files)
-    if !files.grep(%r[/javascripts]).empty?
-      content = AssetCompressorWithGoogleClosureOrYUI.javascript_compressor.compress(content)
-    elsif !files.grep(%r[/stylesheets]).empty?
-      content = AssetCompressorWithGoogleClosureOrYUI.css_compressor.compress(content)
-    end
-    content
-  end
-  alias_method_chain :join_asset_file_contents, :compilation
   
   # this helps the NginxHttpGzipStaticModule do it's thing.
   # from it's website:
@@ -31,12 +21,31 @@ private
     contents = join_asset_file_contents(asset_paths)
     File.open(joined_asset_path, "w+") { |cache| cache.write(contents) }
     
-    zip_name = "#{joined_asset_path}.gz"
-    Zlib::GzipWriter.open(zip_name, Zlib::BEST_COMPRESSION) {|f| f.write(contents) }
+    mt = asset_paths.map { |p| File.mtime(asset_file_path(p)) }.max
     # Set mtime to the latest of the combined files to allow for
     # consistent ETag without a shared filesystem.
-    mt = asset_paths.map { |p| File.mtime(asset_file_path(p)) }.max
-    File.utime(mt, mt, joined_asset_path, zip_name)
+    File.utime(mt, mt, joined_asset_path)
+    
+    # ok, now that we have created the dum concatenation of the files so they have the bare minimum 
+    # for what they need to show the page, lets create a new thread and compress the file in the background and 
+    # replace the original so they dont have to wait while we work.
+    Thread.new do  
+      if !asset_paths.grep(%r[/javascripts]).empty?
+        compressed_content = AssetCompressorWithGoogleClosureOrYUI.javascript_compressor.compress(contents)
+      elsif !asset_paths.grep(%r[/stylesheets]).empty?
+        compressed_content = AssetCompressorWithGoogleClosureOrYUI.css_compressor.compress(contents)
+      else
+        raise "I expected that you were either going to cache javascript files or css files"
+      end
+      File.open(joined_asset_path, "w+") { |cache| cache.write(compressed_content) }
+
+      zip_name = "#{joined_asset_path}.gz"
+      Zlib::GzipWriter.open(zip_name, Zlib::BEST_COMPRESSION) {|f| f.write(compressed_content) }
+      # Set mtime to the latest of the combined files to allow for
+      # consistent ETag without a shared filesystem.
+      # reset the mtime for the new files we just created
+      File.utime(mt, mt, joined_asset_path, zip_name)
+    end
   end
   alias_method_chain :write_asset_file_contents, :create_static_gziped_files
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: compressed-gzipped-assets
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ryan Shaw
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -07:00
+date: 2010-01-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency