asset_id 0.1.5 → 0.2.0

data/README.textile

@@ -56,7 +56,7 @@ perform the upload for use in your deploy scripts
     desc "uploads the current assets to s3 with stamped ids"
     task :upload do
       AWS::S3::DEFAULT_HOST.replace "s3-eu-west-1.amazonaws.com" # If using EU bucket
-      AssetID::Base.asset_paths += ['favicon.png'] # Configure additional asset paths
+      AssetID::Asset.asset_paths += ['favicon.png'] # Configure additional asset paths
       AssetID::S3.upload
     end
     

data/lib/asset_id.rb

@@ -1,154 +1,3 @@
-require 'digest/md5'
-require 'mime/types'
-require 'aws/s3'
-require 'time'
-require 'yaml'
-
-module AssetID
-  
-  class Base
-    DEFAULT_ASSET_PATHS = ['favicon.ico', 'images', 'javascripts', 'stylesheets']
-    @@asset_paths = DEFAULT_ASSET_PATHS
-    
-    def self.path_prefix
-      File.join Rails.root, 'public'
-    end
-    
-    def self.asset_paths=(paths)
-      @@asset_paths = paths
-    end
-    
-    def self.asset_paths
-      @@asset_paths
-    end
-    
-    def self.absolute_path(path)
-      path =~ /#{path_prefix}/ ? path : File.join(path_prefix, path)
-    end
-    
-    def self.relative_path(path)
-      path.gsub(path_prefix, '')
-    end
-    
-    def self.assets
-      asset_paths.inject([]) {|assets, path|
-        path = absolute_path(path)
-        assets << path if File.exists? path and !File.directory? path
-        assets += Dir.glob(path+'/**/*').inject([]) {|m, file| 
-          m << file unless File.directory? file; m 
-        }
-      }
-    end
-    
-    def self.fingerprint(path)
-      path = absolute_path(path)
-      d = Digest::MD5.hexdigest(File.read(path))
-      path = relative_path(path)
-      File.join File.dirname(path), "#{File.basename(path, File.extname(path))}-id-#{d}#{File.extname(path)}"
-    end
-    
-  end
-  
-  class S3 < AssetID::Base
-    
-    DEFAULT_GZIP_TYPES = ['text/css', 'application/javascript']
-    @@gzip_types = DEFAULT_GZIP_TYPES
-    
-    def self.gzip_types=(types)
-      @@gzip_types = types
-    end
-    
-    def self.gzip_types
-      @@gzip_types
-    end
-    
-    def self.s3_config
-      @@config ||= YAML.load_file(File.join(Rails.root, "config/asset_id.yml"))[Rails.env] rescue nil || {}
-    end
-    
-    def self.connect_to_s3
-      AWS::S3::Base.establish_connection!(
-        :access_key_id => s3_config['access_key_id'],
-        :secret_access_key => s3_config['secret_access_key']
-      )
-    end
-    
-    def self.expiry_date
-      @expiry_date ||= (Time.now + (60*60*24*365)).httpdate
-    end
-    
-    def self.cache_headers
-      {'Expires' => expiry_date, 'Cache-Control' => 'public'} # 1 year expiry
-    end
-    
-    def self.gzip_headers
-      {'Content-Encoding' => 'gzip', 'Vary' => 'Accept-Encoding'}
-    end
-    
-    def self.s3_permissions
-      :public_read
-    end
-    
-    def self.s3_bucket
-      s3_config['bucket']
-    end
-    
-    def self.fingerprint(path)
-      #File.join "/#{self.s3_bucket}", fingerprint(path)
-      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|
-        fp = fingerprint(asset)
-        
-        puts "asset_id: Uploading #{relative_path(asset)} as #{fp}" if options[:debug] 
-                
-        mime_type = MIME::Types.of(asset).first.to_s
-        
-        headers = {
-          :content_type => mime_type,
-          :access => s3_permissions,
-        }.merge(cache_headers)
-        
-        if gzip_types.include? mime_type
-          data = `gzip -c #{asset}`
-          headers.merge!(gzip_headers)
-        else
-          data = File.read(asset)
-        end
-        
-        puts "asset_id: headers: #{headers.inspect}" if options[:debug]
-        
-        if options[:cache] and cache[relative_path(asset)] and cache[relative_path(asset)][:fingerprint] == fp
-          puts "asset_id: Cache hit #{relative_path(asset)} - doing nothing" if options[:debug]
-        else
-          AWS::S3::S3Object.store(
-            fp,
-            data,
-            s3_bucket,
-            headers
-          ) unless options[:dry_run]
-        end
-        
-        cache[relative_path(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))} if options[:cache] and !options[:dry_run]
-    end
-    
-  end
-end
+require 'asset_id/asset'
+require 'asset_id/cache'
+require 'asset_id/backend/s3'

metadata

@@ -2,7 +2,7 @@
 name: asset_id
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Richard Taylor
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 +01:00
+date: 2011-05-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency