cloudfront_asset_host 1.0.2 → 1.1.0

data/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,40 @@
+PATH
+  remote: .
+  specs:
+    cloudfront_asset_host (1.1.0)
+      right_aws
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (2.3.9)
+      activesupport (= 2.3.9)
+      rack (~> 1.1.0)
+    activesupport (2.3.9)
+    ansi (1.2.2)
+    facets (2.8.4)
+    mocha (0.9.8)
+      rake
+    rack (1.1.0)
+    rake (0.8.7)
+    redgreen (1.2.2)
+    right_aws (2.0.0)
+      right_http_connection (>= 1.2.1)
+    right_http_connection (1.2.4)
+    shoulda (2.11.3)
+    turn (0.7.0)
+      ansi (>= 1.1.0)
+      facets (>= 2.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (= 2.3.9)
+  activesupport (= 2.3.9)
+  cloudfront_asset_host!
+  mocha
+  redgreen
+  right_aws
+  shoulda
+  turn

data/README.markdown

@@ -12,7 +12,7 @@ The best way to expire your assets on CloudFront is to upload the asset to a new
 
 ### Efficient uploading
 
-By using the MD5-hash we can easily determined which assets aren't uploaded yet. This speeds up the deployment considerably.
+By using the MD5-hash we can easily determine which assets aren't uploaded yet. This speeds up the deployment considerably.
 
 ### Compressed assets
 
@@ -22,11 +22,11 @@ CloudFront will not serve compressed assets automatically. To counter this, the
 
     gem install cloudfront_asset_host
 
-Include the gem in your app's `environment.rb` or `Gemfile`.
+Add the gem to your `environment.rb` or `Gemfile`.
 
 ### Dependencies
 
-The gem relies on `openssl md5` and `gzip` utilities. Make sure they are available locally and on your servers.
+The gem relies on the `gzip` utility. Make sure it is available locally.
 
 ### Configuration
 
@@ -35,6 +35,12 @@ Make sure your s3-credentials are stored in _config/s3.yml_ like this:
     access_key_id: 'access_key'
     secret_access_key: 'secret'
 
+or with environment specified:
+
+    production:
+      access_key_id: 'access_key'
+      secret_access_key: 'secret'
+
 Create an initializer to configure the plugin _config/initializers/cloudfront_asset_host.rb_
 
     # Simple configuration
@@ -45,10 +51,18 @@ Create an initializer to configure the plugin _config/initializers/cloudfront_as
 
     # Extended configuration
     CloudfrontAssetHost.configure do |config|
-      config.bucket     = "bucketname"        # required
-      config.cname      = "assets.domain.com" # if you have a cname configured for your distribution or bucket
-      config.key_prefix = "app/"              # if you share the bucket and want to keep things separated
-      config.s3_config  = "#{RAILS_ROOT}/config/s3.yml" # Alternative location of your s3-config file
+      config.bucket       = "bucketname"        # required
+      config.cname        = "assets.domain.com" # cname configured for your distribution or bucket
+
+      config.key_prefix   = "app/"              # prefix for paths
+      config.plain_prefix = ""                  # prefix for paths to uncompressed files
+
+      config.asset_dirs   = %w(images flash)    # specify directories to be uploaded
+      config.exclude_pattern = /pdf/            # exclude matching assets from uploading
+
+      # s3 configuration
+      config.s3_config    = "path/to/s3.yml"    # Alternative location of your s3-config file
+      config.s3_logging   = true                # enable logging for this bucket
 
       # gzip related configuration
       config.gzip = true                      # enable gzipped assets (defaults to true)
@@ -58,24 +72,54 @@ Create an initializer to configure the plugin _config/initializers/cloudfront_as
       config.enabled = true if Rails.env.production? # only enable in production
     end
 
+The _cname_ option also accepts a `Proc` or `String` with the `%d` parameter (e.g. "assets%d.example.com" for multiple hosts).
+
 ## Usage
 
 ### Uploading your assets
-Run `CloudfrontAssetHost::Uploader.upload!(:verbose => true, :dryrun => false)` before your deployment. Put it for example in your Rakefile or capistrano-recipe. Verbose output will include information about which keys are being uploaded. Enabling _dryrun_ will skip the actual upload if you're just interested to see what will be uploaded.
+Run `CloudfrontAssetHost::Uploader.upload!(:verbose => true, :dryrun => false)` before your deployment. Put it for example in your Rakefile or Capistrano-recipe. Verbose output will include information about which keys are being uploaded. Enabling _dryrun_ will skip the actual upload if you're just interested to see what will be uploaded.
 
 ### Hooks
 If the plugin is enabled. Rails' internal `asset_host` and `asset_id` functionality will be overridden to point to the location of the assets on Cloudfront.
 
 ### Other plugins
-When using in combination with SASS and/or asset_packager it is recommended to generate the css-files and package your assets before uploading them to Cloudfront. For example, call     `Sass::Plugin.update_stylesheets` and `Synthesis::AssetPackage.build_all` first.
+When using in combination with SASS and/or asset_packager it is recommended to generate the css files and package your assets before uploading them to Cloudfront. For example, call     `Sass::Plugin.update_stylesheets` and `Synthesis::AssetPackage.build_all` first.
+
+## Changelog
+
+  - 1.1
+    - New features:
+      - Add support for CNAME-interpolation [wpeterson]
+      - Add ability to specify an exclude regex for CDN content [wpeterson]
+      - Configure directories to upload through CloudfrontAssetHost.asset_dirs [wpeterson]
+      - CloudfrontAssetHost.cname accepts Proc [foresth]
+      - Rewrite all css-files when some images are modified [foresth]
+      - Enable S3-logging with CloudfrontAssetHost.s3_loggin (defaults to false) [foresth]
+      - Ability to insert prefix to paths to uncompressed files [foresth]
+      - Ability to define environment specific credentials in s3.yml [foresth]
+
+    - Fixes and improvements:
+      - Strip query-parameters from image-urls in CSS [wpeterson]
+      - Use Digest::MD5 as md5-implementation [wpeterson, mattdb, foresth]
+      - Fix bug working with paths with spaces [caleb]
+
+  - 1.0.2
+    - Fix bug serving gzipped-assets to IE
+
+  - 1.0.1
+    - First release
 
 ## Contributing
 
-Feel free to fork the project and send pull-requests.
+Feel free to fork the project and send pull requests.
+
+## Contributors
 
-## Known Limitations
+Thanks to these people who contributed patches:
 
- - Does not delete old assets
+  * [Winfield](http://github.com/wpeterson)
+  * [Caleb Land](http://github.com/caleb)
+  * [foresth](http://github.com/foresth)
 
 ## Compatibility
 
@@ -83,6 +127,6 @@ Tested on Rails 2.3.5 with SASS and AssetPackager plugins
 
 ## Copyright
 
-Created at Wakoopa
+Created at [Wakoopa](http://wakoopa.com)
 
 Copyright (c) 2010 Menno van der Sman, released under the MIT license

data/Rakefile

@@ -32,6 +32,12 @@ begin
     gemspec.homepage = "http://github.com/menno/cloudfront_asset_host"
     gemspec.authors = ["Menno van der Sman"]
     gemspec.add_dependency 'right_aws'
+    gemspec.add_development_dependency 'activesupport', '2.3.9'
+    gemspec.add_development_dependency 'actionpack', '2.3.9'
+    gemspec.add_development_dependency 'shoulda'
+    gemspec.add_development_dependency 'mocha'
+    gemspec.add_development_dependency 'redgreen'
+    gemspec.add_development_dependency 'turn'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/cloudfront_asset_host.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudfront_asset_host}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Menno van der Sman"]
-  s.date = %q{2010-03-23}
+  s.date = %q{2010-10-02}
   s.description = %q{Easy deployment of your assets on CloudFront or S3 using a simple rake-task. When enabled in production, the application's asset_host and public_paths will point to the correct location.}
   s.email = %q{menno@wakoopa.com}
   s.extra_rdoc_files = [
@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "MIT-LICENSE",
      "README.markdown",
      "Rakefile",
@@ -27,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/cloudfront_asset_host/css_rewriter.rb",
      "lib/cloudfront_asset_host/mime_types.yml",
      "lib/cloudfront_asset_host/uploader.rb",
+     "test/app/config/s3-env.yml",
      "test/app/config/s3.yml",
      "test/app/public/images/image.png",
      "test/app/public/javascripts/application.js",
@@ -39,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/menno/cloudfront_asset_host}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rails plugin to easily and efficiently deploy your assets on Amazon's S3 or CloudFront}
   s.test_files = [
     "test/cloudfront_asset_host_test.rb",
@@ -52,13 +55,31 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<right_aws>, [">= 0"])
+      s.add_development_dependency(%q<activesupport>, ["= 2.3.9"])
+      s.add_development_dependency(%q<actionpack>, ["= 2.3.9"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<redgreen>, [">= 0"])
+      s.add_development_dependency(%q<turn>, [">= 0"])
     else
       s.add_dependency(%q<right_aws>, [">= 0"])
+      s.add_dependency(%q<activesupport>, ["= 2.3.9"])
+      s.add_dependency(%q<actionpack>, ["= 2.3.9"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<redgreen>, [">= 0"])
+      s.add_dependency(%q<turn>, [">= 0"])
     end
   else
     s.add_dependency(%q<right_aws>, [">= 0"])
+    s.add_dependency(%q<activesupport>, ["= 2.3.9"])
+    s.add_dependency(%q<actionpack>, ["= 2.3.9"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<redgreen>, [">= 0"])
+    s.add_dependency(%q<turn>, [">= 0"])
   end
 end
 

data/lib/cloudfront_asset_host.rb

@@ -1,4 +1,6 @@
+require 'digest/md5'
 require 'cloudfront_asset_host/asset_tag_helper_ext'
+require 'digest/md5'
 
 module CloudfrontAssetHost
 
@@ -17,6 +19,9 @@ module CloudfrontAssetHost
   # Path to S3 config. Expects an +access_key_id+ and +secret_access_key+
   mattr_accessor :s3_config
 
+  # Log S3 server access on a bucket
+  mattr_accessor :s3_logging
+
   # Indicates whether the plugin should be enabled
   mattr_accessor :enabled
 
@@ -29,6 +34,18 @@ module CloudfrontAssetHost
   # Key-prefix under which to store gzipped assets
   mattr_accessor :gzip_prefix
 
+  # Key-prefix under which to store plain (unzipped) assets
+  mattr_accessor :plain_prefix
+
+  # Which extensions are likely to occur in css files
+  mattr_accessor :image_extensions
+
+  # Array of directories to search for asset files in
+  mattr_accessor :asset_dirs
+
+  # Key Regular Expression to filter out/exclude content
+  mattr_accessor :exclude_pattern
+
   class << self
 
     def configure
@@ -37,12 +54,20 @@ module CloudfrontAssetHost
       self.cname      = nil
       self.key_prefix = ""
       self.s3_config  = "#{RAILS_ROOT}/config/s3.yml"
+      self.s3_logging = false
       self.enabled    = false
 
+      self.asset_dirs = %w(images javascripts stylesheets)
+      self.exclude_pattern = nil
+
       self.gzip            = true
       self.gzip_extensions = %w(js css)
       self.gzip_prefix     = "gz"
 
+      self.plain_prefix = ""
+
+      self.image_extensions = %w(jpg jpeg gif png)
+
       yield(self)
 
       if properly_configured?
@@ -51,7 +76,16 @@ module CloudfrontAssetHost
     end
 
     def asset_host(source = nil, request = nil)
-      host = cname.present? ? "http://#{self.cname}" : "http://#{self.bucket_host}"
+      if cname.present?
+        if cname.is_a?(Proc)
+          host = cname.call(source, request)
+        else
+          host = (cname =~ /%d/) ? cname % (source.hash % 4) : cname.to_s
+          host = "http://#{host}"
+        end
+      else
+        host = "http://#{self.bucket_host}"
+      end
 
       if source && request && CloudfrontAssetHost.gzip
         gzip_allowed  = CloudfrontAssetHost.gzip_allowed_for_source?(source)
@@ -64,7 +98,11 @@ module CloudfrontAssetHost
 
         if gzip_accepted && gzip_allowed
           host << "/#{CloudfrontAssetHost.gzip_prefix}"
+        else
+          host << "/#{CloudfrontAssetHost.plain_prefix}" if CloudfrontAssetHost.plain_prefix.present?
         end
+      else
+        host << "/#{CloudfrontAssetHost.plain_prefix}" if CloudfrontAssetHost.plain_prefix.present?
       end
 
       host
@@ -91,6 +129,19 @@ module CloudfrontAssetHost
       CloudfrontAssetHost.gzip_extensions.include?(extension)
     end
 
+    def image?(path)
+      extension = path.split('.').last
+      CloudfrontAssetHost.image_extensions.include?(extension)
+    end
+
+    def css?(path)
+      File.extname(path) == '.css'
+    end
+
+    def disable_cdn_for_source?(source)
+      source.match(exclude_pattern) if exclude_pattern.present?
+    end
+
   private
 
     def properly_configured?
@@ -100,7 +151,7 @@ module CloudfrontAssetHost
     end
 
     def md5sum(path)
-      `openssl md5 #{path}`.split(/\s/)[1].to_s
+      Digest::MD5.hexdigest(File.read(path))
     end
 
   end

data/lib/cloudfront_asset_host/asset_tag_helper_ext.rb

@@ -10,7 +10,8 @@ module ActionView
           asset_id
         else
           path = File.join(ASSETS_DIR, source)
-          asset_id = File.exist?(path) ? CloudfrontAssetHost.key_for_path(path) : ''
+          rewrite_path = File.exist?(path) && !CloudfrontAssetHost.disable_cdn_for_source?(source)
+          asset_id = rewrite_path ? CloudfrontAssetHost.key_for_path(path) : ''
 
           if @@cache_asset_timestamps
             @@asset_timestamps_cache_guard.synchronize do

data/lib/cloudfront_asset_host/css_rewriter.rb

@@ -9,7 +9,7 @@ module CloudfrontAssetHost
 
     class << self
       # matches optional quoted url(<path>)
-      ReplaceRexeg = /url\(["']?([^\)"']+)["']?\)/i
+      ReplaceRexeg = /url\(["']?([^\)\?"']+)(\?[^"']*)?["']?\)/i
 
       # Returns the path to the temporary file that contains the
       # rewritten stylesheet
@@ -34,7 +34,7 @@ module CloudfrontAssetHost
 
           if path.present? && File.exists?(path)
             key = CloudfrontAssetHost.key_for_path(path) + path.gsub(Rails.public_path, '')
-            "url(#{CloudfrontAssetHost.asset_host}/#{key})"
+            "url(#{CloudfrontAssetHost.asset_host(url)}/#{key})"
           else
             puts "Could not extract path: #{path}"
             asset_link

data/lib/cloudfront_asset_host/uploader.rb

@@ -7,25 +7,24 @@ module CloudfrontAssetHost
     class << self
 
       def upload!(options = {})
-        dryrun = options.delete(:dryrun) || false
-        verbose = options.delete(:verbose) || false
-
-        puts "-- Updating uncompressed files" if verbose
-        upload_keys_with_paths(keys_with_paths, dryrun, verbose, false)
+        puts "-- Updating uncompressed files" if options[:verbose]
+        upload_keys_with_paths(keys_with_paths, options)
 
         if CloudfrontAssetHost.gzip
-          puts "-- Updating compressed files" if verbose
-          upload_keys_with_paths(gzip_keys_with_paths, dryrun, verbose, true)
+          puts "-- Updating compressed files" if options[:verbose]
+          upload_keys_with_paths(gzip_keys_with_paths, options.merge(:gzip => true))
         end
 
         @existing_keys = nil
       end
 
-      def upload_keys_with_paths(keys_paths, dryrun, verbose, gzip)
+      def upload_keys_with_paths(keys_paths, options={})
+        gzip = options[:gzip] || false
+        dryrun = options[:dryrun] || false
+        verbose = options[:verbose] || false
+
         keys_paths.each do |key, path|
-          if existing_keys.include?(key)
-            puts "= #{key}" if verbose
-          else
+          if should_upload?(key, options)
             puts "+ #{key}" if verbose
 
             extension = File.extname(path)[1..-1]
@@ -36,18 +35,27 @@ module CloudfrontAssetHost
             bucket.put(key, File.read(data_path), {}, 'public-read', headers_for_path(extension, gzip)) unless dryrun
 
             File.unlink(data_path) if gzip && File.exists?(data_path)
+          else
+            puts "= #{key}" if verbose
           end
         end
       end
 
+      def should_upload?(key, options={})
+        return false if CloudfrontAssetHost.disable_cdn_for_source?(key)
+        return true  if CloudfrontAssetHost.css?(key) && rewrite_all_css?
+
+        options[:force_write] || !existing_keys.include?(key)
+      end
+
       def gzipped_path(path)
         tmp = Tempfile.new("cfah-gz")
-        `gzip #{path} -q -c > #{tmp.path}`
+        `gzip '#{path}' -q -c > '#{tmp.path}'`
         tmp.path
       end
 
       def rewritten_css_path(path)
-        if File.extname(path) == '.css'
+        if CloudfrontAssetHost.css?(path)
           tmp = CloudfrontAssetHost::CssRewriter.rewrite_stylesheet(path)
           tmp.path
         else
@@ -57,7 +65,8 @@ module CloudfrontAssetHost
 
       def keys_with_paths
         current_paths.inject({}) do |result, path|
-          key = CloudfrontAssetHost.key_for_path(path) + path.gsub(Rails.public_path, '')
+          key = CloudfrontAssetHost.plain_prefix.present? ? "#{CloudfrontAssetHost.plain_prefix}/" : ""
+          key << CloudfrontAssetHost.key_for_path(path) + path.gsub(Rails.public_path, '')
 
           result[key] = path
           result
@@ -77,17 +86,23 @@ module CloudfrontAssetHost
         end
       end
 
+      def rewrite_all_css?
+        @rewrite_all_css ||= !keys_with_paths.delete_if { |key, path| existing_keys.include?(key) || !CloudfrontAssetHost.image?(path) }.empty?
+      end
+
       def existing_keys
         @existing_keys ||= begin
           keys = []
-          keys.concat bucket.keys('prefix' => CloudfrontAssetHost.key_prefix).map  { |key| key.name }
+          prefix = CloudfrontAssetHost.key_prefix
+          prefix = "#{CloudfrontAssetHost.plain_prefix}/#{prefix}" if CloudfrontAssetHost.plain_prefix.present?
+          keys.concat bucket.keys('prefix' => prefix).map  { |key| key.name }
           keys.concat bucket.keys('prefix' => CloudfrontAssetHost.gzip_prefix).map { |key| key.name }
           keys
         end
       end
 
       def current_paths
-        @current_paths ||= Dir.glob("#{Rails.public_path}/{images,javascripts,stylesheets}/**/*").reject { |path| File.directory?(path) }
+        @current_paths ||= Dir.glob("#{Rails.public_path}/{#{asset_dirs.join(',')}}/**/*").reject { |path| File.directory?(path) }
       end
 
       def headers_for_path(extension, gzip = false)
@@ -107,7 +122,11 @@ module CloudfrontAssetHost
       end
 
       def bucket
-        @bucket ||= s3.bucket(CloudfrontAssetHost.bucket)
+        @bucket ||= begin
+          bucket = s3.bucket(CloudfrontAssetHost.bucket)
+          bucket.disable_logging unless CloudfrontAssetHost.s3_logging
+          bucket
+        end
       end
 
       def s3
@@ -115,10 +134,17 @@ module CloudfrontAssetHost
       end
 
       def config
-        @config ||= YAML::load_file(CloudfrontAssetHost.s3_config)
+        @config ||= begin 
+          config = YAML::load_file(CloudfrontAssetHost.s3_config)
+          config.has_key?(Rails.env) ? config[Rails.env] : config
+        end
+      end
+
+      def asset_dirs
+        @asset_dirs ||= CloudfrontAssetHost.asset_dirs
       end
 
     end
 
   end
-end
+end

data/test/app/config/s3-env.yml

@@ -0,0 +1,6 @@
+#!/bin/bash
+production:
+  access_key_id: 'access_key'
+  secret_access_key: 'secret'
+  options:
+    use_ssl: true

data/test/app/config/s3.yml

@@ -2,4 +2,4 @@
 access_key_id: 'access_key'
 secret_access_key: 'secret'
 options:
-  use_ssl: true
+  use_ssl: true

data/test/app/public/stylesheets/style.css

@@ -1,4 +1,6 @@
 body { background-image: url(../images/image.png); }
 body { background-image: url(/images/image.png); }
 body { background-image: url('/images/image.png'); }
-body { background-image: url("/images/image.png"); }
+body { background-image: url("/images/image.png"); }
+body { background-image: url("/images/image.png?98732857"); }
+body { background-image: url("/images/image.png?fo0=bar"); }

data/test/cloudfront_asset_host_test.rb

@@ -31,29 +31,48 @@ class CloudfrontAssetHostTest < Test::Unit::TestCase
       assert_equal "prefix/8ed41cb87", CloudfrontAssetHost.key_for_path(File.join(RAILS_ROOT, 'public', 'javascripts', 'application.js'))
     end
 
+    should "default asset_dirs setting" do
+      assert_equal %w(images javascripts stylesheets), CloudfrontAssetHost.asset_dirs
+    end
+
     context "asset-host" do
 
       setup do
-        @source  = "/javascripts/application.js"
+        @source = "/javascripts/application.js"
       end
 
       should "use cname for asset_host" do
         assert_equal "http://assethost.com", CloudfrontAssetHost.asset_host(@source)
       end
 
+      should "use interpolated cname for asset_host" do
+        CloudfrontAssetHost.cname = "assethost-%d.com"
+        assert_equal "http://assethost-3.com", CloudfrontAssetHost.asset_host(@source)
+      end
+
+      should "call proc for asset_host" do
+        CloudfrontAssetHost.cname = Proc.new { |source, request| "http://assethost-proc.com" }
+        assert_equal "http://assethost-proc.com", CloudfrontAssetHost.asset_host(@source)
+      end
+
       should "use bucket_host when cname is not present" do
         CloudfrontAssetHost.cname = nil
         assert_equal "http://bucketname.s3.amazonaws.com", CloudfrontAssetHost.asset_host(@source)
       end
 
-      should "not support gzip for images" do
-        request = stub(:headers => {'User-Agent' => 'Mozilla/5.0', 'Accept-Encoding' => 'gzip, compress'})
-        source  = "/images/logo.png"
-        assert_equal "http://assethost.com", CloudfrontAssetHost.asset_host(source, request)
+      should "add plain_prefix if present" do
+        CloudfrontAssetHost.plain_prefix = "prefix"
+        assert_equal "http://assethost.com/prefix", CloudfrontAssetHost.asset_host(@source)
       end
 
       context "when taking the headers into account" do
 
+        should "not support gzip for images" do
+          request = stub(:headers => {'User-Agent' => 'Mozilla/5.0', 'Accept-Encoding' => 'gzip, compress'})
+          source  = "/images/logo.png"
+          assert_equal "http://assethost.com", CloudfrontAssetHost.asset_host(source, request)
+        end
+
         should "support gzip for IE" do
           request = stub(:headers => {'User-Agent' => 'Mozilla/4.0 (compatible; MSIE 8.0)', 'Accept-Encoding' => 'gzip, compress'})
           assert_equal "http://assethost.com/gz", CloudfrontAssetHost.asset_host(@source, request)
@@ -124,4 +143,12 @@ class CloudfrontAssetHostTest < Test::Unit::TestCase
     end
   end
 
+  should "respect custom asset_dirs" do
+    CloudfrontAssetHost.configure do |config|
+      config.bucket = "bucketname"
+      config.asset_dirs = %w(custom)
+    end
+    assert_equal %w(custom), CloudfrontAssetHost.asset_dirs
+  end
+
 end

data/test/test_helper.rb

@@ -1,9 +1,11 @@
-require 'test/unit'
 require 'rubygems'
+require 'bundler'
+Bundler.setup
 
+require 'active_support'
 require 'action_controller'
-require 'right_aws'
 
+require 'test/unit'
 require 'shoulda'
 require 'mocha'
 begin require 'redgreen'; rescue LoadError; end
@@ -20,6 +22,10 @@ module Rails
     def public_path
       File.join(RAILS_ROOT, 'public')
     end
+
+    def env
+      "production"
+    end
   end
 end
 

data/test/uploader_test.rb

@@ -4,6 +4,8 @@ class UploaderTest < Test::Unit::TestCase
 
   context "A configured uploader" do
     setup do
+      @css_md5 = md5_key('stylesheets/style.css')       #7026e6ce3
+      @js_md5 =  md5_key('javascripts/application.js')  #8ed41cb87
       CloudfrontAssetHost.configure do |config|
         config.cname  = "assethost.com"
         config.bucket = "bucketname"
@@ -19,6 +21,17 @@ class UploaderTest < Test::Unit::TestCase
       assert_equal 'secret', config['secret_access_key']
     end
 
+    should "be able to retrieve enviroment-specific config" do
+      CloudfrontAssetHost.configure do |config|
+        config.enabled = false
+        config.bucket = "bucketname"
+        config.s3_config = "#{RAILS_ROOT}/config/s3-env.yml"
+      end
+      config = CloudfrontAssetHost::Uploader.config
+      assert_equal 'access_key', config['access_key_id']
+      assert_equal 'secret', config['secret_access_key']
+    end
+
     should "be able to instantiate s3-interface" do
       RightAws::S3.expects(:new).with('access_key', 'secret').returns(mock)
       assert_not_nil CloudfrontAssetHost::Uploader.s3
@@ -31,14 +44,14 @@ class UploaderTest < Test::Unit::TestCase
     should "calculate keys for paths" do
       keys_with_paths = CloudfrontAssetHost::Uploader.keys_with_paths
       assert_equal 3, keys_with_paths.length
-      assert_match %r{/test/app/public/javascripts/application\.js$}, keys_with_paths["8ed41cb87/javascripts/application.js"]
+      assert_match %r{/test/app/public/javascripts/application\.js$}, keys_with_paths["#{@js_md5}/javascripts/application.js"]
     end
 
     should "calculate gzip keys for paths" do
       gz_keys_with_paths = CloudfrontAssetHost::Uploader.gzip_keys_with_paths
       assert_equal 2, gz_keys_with_paths.length
-      assert_match %r{/test/app/public/javascripts/application\.js$}, gz_keys_with_paths["gz/8ed41cb87/javascripts/application.js"]
-      assert_match %r{/test/app/public/stylesheets/style\.css$},      gz_keys_with_paths["gz/bd258f13d/stylesheets/style.css"]
+      assert_match %r{/test/app/public/javascripts/application\.js$}, gz_keys_with_paths["gz/#{@js_md5}/javascripts/application.js"]
+      assert_match %r{/test/app/public/stylesheets/style\.css$},      gz_keys_with_paths["gz/#{@css_md5}/stylesheets/style.css"]
     end
 
     should "return a mimetype for an extension" do
@@ -78,23 +91,36 @@ class UploaderTest < Test::Unit::TestCase
       CloudfrontAssetHost::Uploader.upload!
     end
 
-    should "not re-upload existing keys" do
+    should "not re-upload existing keys by default" do
       CloudfrontAssetHost::Uploader.expects(:bucket).never
       CloudfrontAssetHost::Uploader.stubs(:existing_keys).returns(
-        ["gz/8ed41cb87/javascripts/application.js", "8ed41cb87/javascripts/application.js",
+        ["gz/#{@js_md5}/javascripts/application.js", "#{@js_md5}/javascripts/application.js",
          "d41d8cd98/images/image.png",
-         "bd258f13d/stylesheets/style.css", "gz/bd258f13d/stylesheets/style.css"]
+         "#{@css_md5}/stylesheets/style.css", "gz/#{@css_md5}/stylesheets/style.css"]
       )
 
       CloudfrontAssetHost::Uploader.upload!
     end
 
+    should "re-upload existing keys w/ force_write" do
+      bucket_mock = mock
+      bucket_mock.expects(:put).times(5)
+      CloudfrontAssetHost::Uploader.stubs(:bucket).returns(bucket_mock)
+      CloudfrontAssetHost::Uploader.stubs(:existing_keys).returns(
+        ["gz/#{@js_md5}/javascripts/application.js", "#{@js_md5}/javascripts/application.js",
+         "d41d8cd98/images/image.png",
+         "#{@css_md5}/stylesheets/style.css", "gz/#{@css_md5}/stylesheets/style.css"]
+      )
+
+      CloudfrontAssetHost::Uploader.upload!(:force_write => true)
+    end
+
     should "correctly gzip files" do
       path = File.join(RAILS_ROOT, 'public', 'javascripts', 'application.js')
       contents = File.read(path)
 
       gz_path = CloudfrontAssetHost::Uploader.gzipped_path(path)
-      gunzip_contents = `gunzip #{gz_path} -q -c`
+      gunzip_contents = `gunzip '#{gz_path}' -q -c`
 
       assert_equal contents, gunzip_contents
     end
@@ -110,4 +136,31 @@ class UploaderTest < Test::Unit::TestCase
 
   end
 
+  context 'with exclude_pattern' do
+    setup do
+      @css_md5 = md5_key('stylesheets/style.css')       #7026e6ce3
+      @js_md5 =  md5_key('javascripts/application.js')  #8ed41cb87
+      CloudfrontAssetHost.configure do |config|
+        config.cname  = "assethost.com"
+        config.bucket = "bucketname"
+        config.key_prefix = ""
+        config.s3_config = "#{RAILS_ROOT}/config/s3.yml"
+        config.enabled = false
+        config.exclude_pattern = /style/
+      end
+    end
+
+    should "filter keys out" do
+      bucket_mock = mock
+      bucket_mock.expects(:put).times(3)
+      CloudfrontAssetHost::Uploader.stubs(:bucket).returns(bucket_mock)
+      CloudfrontAssetHost::Uploader.stubs(:existing_keys).returns([])
+
+      CloudfrontAssetHost::Uploader.upload!
+    end
+  end
+
+  def md5_key(path)
+    CloudfrontAssetHost.send(:md5sum, File.join('test/app/public', path))[0..8]
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudfront_asset_host
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Menno van der Sman
@@ -14,21 +15,111 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 +01:00
+date: 2010-10-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: right_aws
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 3
+        - 9
+        version: 2.3.9
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 3
+        - 9
+        version: 2.3.9
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: redgreen
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: turn
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Easy deployment of your assets on CloudFront or S3 using a simple rake-task. When enabled in production, the application's asset_host and public_paths will point to the correct location.
 email: menno@wakoopa.com
 executables: []
@@ -39,6 +130,8 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.markdown
 - Rakefile
@@ -49,6 +142,7 @@ files:
 - lib/cloudfront_asset_host/css_rewriter.rb
 - lib/cloudfront_asset_host/mime_types.yml
 - lib/cloudfront_asset_host/uploader.rb
+- test/app/config/s3-env.yml
 - test/app/config/s3.yml
 - test/app/public/images/image.png
 - test/app/public/javascripts/application.js
@@ -67,23 +161,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails plugin to easily and efficiently deploy your assets on Amazon's S3 or CloudFront