cdn_fu 0.6.1 → 0.6.2

data/lib/cdn_fu/config.rb

@@ -27,6 +27,11 @@ module CdnFu
       @asset_id = args[0]
     end
 
+    def asset_host(*args)
+      return @asset_host if args.size == 0
+      @asset_host = args[0]
+    end
+
     def verbose(*args)
       return @verbose if args.size == 0
       @verbose = args[0]
@@ -52,15 +57,17 @@ module CdnFu
       @tmp_dir ||= "/tmp"
       FileUtils.mkdir_p(@tmp_dir)
 
+
+      file_list = @lister.list
+
+      puts "Here"
       case @preprocessor
       when Proc
         @preprocessor.call
-      when Class
-        @preprocessor.preprocess
+      else
+        @preprocessor.preprocess(file_list)
       end
 
-      file_list = @lister.list
-
       case @minifier
       when Proc
         @minifier.call(file_list)
@@ -76,17 +83,28 @@ module CdnFu
       end
     end
 
-    def preprocess
+    def setup(&block)
+      if block_given?
+        @setup_task = block
+      else 
+        raise ConfigError,"No setup block given"
+      end
+    end
+
+    def preprocess(&block)
       if block_given?
-        @preprocessor = proc
+        @preprocessor = block
       else 
         raise ConfigError,"No preprocess block given"
       end
     end
 
-    def preprocessor(klass)
-      @preprocessor = klass
-      yield @preprocessor if block_given?
+    def preprocessor(*args, &block)
+      return @preprocessor if args.size == 0
+      preprocessor_class = args[0]
+      @preprocessor = preprocessor_class.new
+      puts "Setting up preprocessor_class #{@preprocessor}"
+      @preprocessor.instance_eval &block if block_given?
     end
 
     def files(&block)

data/lib/cdn_fu/file_info.rb

@@ -1,7 +1,7 @@
 module CdnFu
   class FileInfo
-    attr_accessor :local_path,:minified_path,:remote_path
-    attr_writer :gzip,:minify
+    attr_accessor :local_path,:minified_path,:remote_path,:processed_path
+    attr_writer :gzip,:minify,:preprocess
 
     def gzip?
       @gzip
@@ -10,5 +10,9 @@ module CdnFu
     def minify?
       @minify
     end
+
+    def preprocess?
+      @preprocess
+    end
   end
 end

data/lib/cdn_fu/lister.rb

@@ -24,6 +24,7 @@ module CdnFu
         Dir.glob(File.join(asset_root,glob_str)).each do |file|
           fi = FileInfo.new
           fi.local_path = File.expand_path(file)
+          fi.preprocess = glob[:preprocess]
           fi.gzip = glob[:gzip]
           fi.minify = glob[:minify]
           root_sub_path = fi.local_path.gsub(asset_root,'')

data/lib/cdn_fu/minifiers/yui_minifier.rb

@@ -27,9 +27,12 @@ class YuiMinifier < CdnFu::Minifier
   private
 
   def one_minification(file)
-    modified_path = File.join(CdnFu::Config.config.tmp_dir,"minified_#{File.basename(file.local_path)}")
-    `java -jar #{@yui_jar_path} #{file.local_path} > #{modified_path}`
-    puts "[minify] #{file.local_path}" if CdnFu::Config.config.verbose
-    file.minified_path = modified_path
+    minified_dir = File.join(CdnFu::Config.config.tmp_dir,"cdnfu_minified",File.dirname(file.local_path))
+    FileUtils.mkdir_p(minified_dir)
+    minified_path = File.join(minified_dir,"minified_#{File.basename(file.local_path)}")
+    input_path = file.processed_path ? file.processed_path : file.local_path
+    `java -jar #{@yui_jar_path} #{input_path} > #{minified_path}`
+    puts "[minify] #{input_path} to #{minified_path}" if CdnFu::Config.config.verbose
+    file.minified_path = minified_path 
   end
 end

data/lib/cdn_fu/uploaders/cloudfront_uploader.rb

@@ -18,7 +18,8 @@ class CloudfrontUploader < CdnFu::Uploader
       :secret_access_key => secret_key
     )
 
-    checksums = populate_existing_asset_checksums
+    populate_existing_asset_checksums(file_list)
+
     file_list.each do |file|
       upload_single_file(file)
     end
@@ -40,22 +41,25 @@ class CloudfrontUploader < CdnFu::Uploader
   end
 
   private
-  def populate_existing_asset_checksums 
+  def populate_existing_asset_checksums(file_list)
+    puts "Populating Existing Checksums...(could take a minute)" if CdnFu::Config.config.verbose
     @existing_asset_checksums = {}
     objects = []
     bucket = Bucket.find(@s3_bucket)
-    objects += bucket.objects(:max_keys => MAX_KEYS)
-    if objects.size == MAX_KEYS
-      loop do
-        new_objects = bucket.objects(:max_keys => MAX_KEYS,:marker => objects.last)
-        objects += new_objects
-        break if new_objects.size < MAX_KEYS
+
+    file_list.each do |cf_file|
+      versioned_filename = CdnFu::Config.config.asset_id.to_s + cf_file.remote_path
+      begin
+        obj = S3Object.about(versioned_filename,@s3_bucket)
+        if obj
+          existing_sha1 = obj.metadata["x-amz-meta-sha1-hash"]
+          if existing_sha1
+            @existing_asset_checksums[versioned_filename] = existing_sha1
+          end
+        end
+      rescue NoSuchKey
       end
     end
-    objects.each do |obj|
-      @existing_asset_checksums[obj.path] = obj.metadata['x-amz-meta-sha1-hash']
-    end
-    return objects
   end
 
   def upload_single_file(cf_file)
@@ -66,7 +70,7 @@ class CloudfrontUploader < CdnFu::Uploader
     path_to_upload ||= cf_file.local_path
     fstat = File.stat(path_to_upload)
     sha1sum = Digest::SHA1.hexdigest(File.open(path_to_upload).read)
-    if remote_sha1 = @existing_asset_checksums["/" + s3_bucket + "/" + versioned_filename]
+    if remote_sha1 = @existing_asset_checksums[versioned_filename]
       if remote_sha1 != sha1sum
         puts "Your assets are different from the ones in s3 with this asset_id.  Please increment your asset_id in cdn_fu.rb"
         exit
@@ -91,8 +95,8 @@ class CloudfrontUploader < CdnFu::Uploader
 
       eight_years = 8 * 60 * 60 * 24 * 365
       eight_years_from_now = Time.now + eight_years
-      options[:cache_control] = "max-age=#{eight_years}"
-      options[:expires] = eight_years_from_now.httpdate
+      options["Cache-Control"] = "public, max-age=#{eight_years}"
+      options["Expires"] = eight_years_from_now.httpdate
       S3Object.store(versioned_filename,file_content,s3_bucket, options)
       puts "[upload] #{s3_bucket} #{versioned_filename}" if CdnFu::Config.config.verbose
     end

data/lib/cdn_fu/version.rb

@@ -1,3 +1,3 @@
 module CdnFu 
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Curtis Spencer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -07:00
+date: 2011-05-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency