foresth-cloudfront_asset_host 1.0.4 → 1.0.6

data/README.markdown

@@ -26,7 +26,7 @@ Include the gem in your app's `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 `gzip` utility. Make sure it is available locally and on your servers.
 
 ### Configuration
 
@@ -34,6 +34,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_
 
@@ -45,10 +51,11 @@ 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" # 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.plain_prefix = ""                  # prefix for paths to uncompressed files 
+      config.s3_config    = "#{RAILS_ROOT}/config/s3.yml" # Alternative location of your s3-config file
 
       # gzip related configuration
       config.gzip = true                      # enable gzipped assets (defaults to true)
@@ -57,6 +64,8 @@ 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_ config option also accepts Proc or string with the "%d" parameter (e.g. "http://assets%d.example.com" for multiple hosts).
 
 ## Usage
 
@@ -73,10 +82,6 @@ When using in combination with SASS and/or asset_packager it is recommended to g
 
 Feel free to fork the project and send pull-requests.
 
-## Known Limitations
-
- - Does not delete old assets
-
 ## Compatibility
 
 Tested on Rails 2.3.5 with SASS and AssetPackager plugins

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.6

data/cloudfront_asset_host.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{foresth-cloudfront_asset_host}
-  s.version = "1.0.4"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Menno van der Sman"]

data/lib/cloudfront_asset_host.rb

@@ -34,7 +34,7 @@ module CloudfrontAssetHost
   mattr_accessor :gzip_prefix
   
   # Key-prefix under which to store plain (unzipped) assets
- 	mattr_accessor :plain_prefix
+  mattr_accessor :plain_prefix
   
   # Which extensions are likely to occur in css files
   mattr_accessor :image_extensions
@@ -58,7 +58,7 @@ module CloudfrontAssetHost
 
       yield(self)
 
-      if properly_configured?
+      if properly_configured? && enabled
         enable!
       end
     end
@@ -100,11 +100,15 @@ module CloudfrontAssetHost
     end
 
     def enable!
-      if enabled
-        ActionController::Base.asset_host = Proc.new { |source, request| CloudfrontAssetHost.asset_host(source, request) }
-        ActionView::Helpers::AssetTagHelper.send(:alias_method_chain, :rewrite_asset_path, :cloudfront)
-        ActionView::Helpers::AssetTagHelper.send(:alias_method_chain, :rails_asset_id, :cloudfront)
-      end
+      ActionController::Base.asset_host = Proc.new { |source, request| CloudfrontAssetHost.asset_host(source, request) }
+      ActionView::Helpers::AssetTagHelper.send(:alias_method_chain, :rewrite_asset_path, :cloudfront)
+      ActionView::Helpers::AssetTagHelper.send(:alias_method_chain, :rails_asset_id, :cloudfront)
+    end
+    
+    def disable!
+      ActionController::Base.asset_host = nil
+      ActionView::Helpers::AssetTagHelper.send(:alias_method, :rewrite_asset_path, :rewrite_asset_path_without_cloudfront)
+      ActionView::Helpers::AssetTagHelper.send(:alias_method, :rails_asset_id, :rails_asset_id_without_cloudfront)
     end
 
     def key_for_path(path)

data/lib/cloudfront_asset_host/css_rewriter.rb

@@ -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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foresth-cloudfront_asset_host
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Menno van der Sman