asset_id 0.1.3 → 0.1.4

data/lib/asset_id.rb

@@ -2,6 +2,7 @@ require 'digest/md5'
 require 'mime/types'
 require 'aws/s3'
 require 'time'
+require 'yaml'
 
 module AssetID
   
@@ -68,8 +69,12 @@ module AssetID
       )
     end
     
+    def self.expiry_date
+      @expiry_date ||= (Time.now + (60*60*24*365)).httpdate
+    end
+    
     def self.cache_headers
-      {'Expires' => (Time.now + (60*60*24*365)).httpdate, 'Cache-Control' => 'public'} # 1 year expiry
+      {'Expires' => expiry_date, 'Cache-Control' => 'public'} # 1 year expiry
     end
     
     def self.gzip_headers
@@ -89,10 +94,24 @@ module AssetID
       super(path)
     end
     
+    def self.cache_path
+      File.join(Rails.root, 'log', 'asset_id_cache.yml')
+    end
+    
     def self.upload(options={})
+      options[:cache] ||= true
       connect_to_s3
+      
+      cache = {}
+      if options[:cache]
+        cache = YAML.load_file(cache_path) rescue {}
+      end
+      
       assets.each do |asset|
-        puts "asset_id: Uploading #{asset} as #{fingerprint(asset)}" if options[:debug]
+        fp = fingerprint(asset)
+        
+        puts "asset_id: Uploading #{asset} as #{fp}" if options[:debug] 
+                
         mime_type = MIME::Types.of(asset).first.to_s
         
         headers = {
@@ -109,13 +128,22 @@ module AssetID
         
         puts "asset_id: headers: #{headers.inspect}" if options[:debug]
         
-        AWS::S3::S3Object.store(
-          fingerprint(asset),
-          data,
-          s3_bucket,
-          headers
-        ) unless options[:dry_run]
+        if options[:cache] and cache[asset] and cache[asset][:fingerprint] == fp
+          puts "asset_id: Cache hit #{asset} - doing nothing" 
+        else
+          AWS::S3::S3Object.store(
+            fp,
+            data,
+            s3_bucket,
+            headers
+          ) unless options[:dry_run]
+        end
+        
+        cache[asset] = {:expires => expiry_date.to_s, :fingerprint => fp}
       end
+      
+      puts "cache:\n#{YAML.dump(cache)}" if options[:debug]
+      File.open(cache_path, 'w') {|f| f.write(YAML.dump(cache))} unless options[:dry_run]
     end
     
   end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: asset_id
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors: 
 - Richard Taylor
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +00:00
+date: 2011-05-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
         version: "1.16"
   type: :runtime
   version_requirements: *id001
@@ -41,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 6
-        - 2
         version: 0.6.2
   type: :runtime
   version_requirements: *id002
@@ -76,23 +62,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: asset_id
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 2
 summary: asset_id is a library for uploading static assets to Amazon S3.