jammit-s3 0.5.4.1 → 0.5.4.2

data/jammit-s3.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit-s3'
-  s.version   = '0.5.4.1'
+  s.version   = '0.5.4.2'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Asset Packaging for Rails with Deployment to S3/Cloudfront"

data/lib/jammit-s3.rb

@@ -13,15 +13,16 @@ if defined?(Rails)
     class JammitRailtie < Rails::Railtie
       initializer "set asset host and asset id" do
         config.after_initialize do
-          protocol = Jammit.configuration[:ssl] ? "https" : "http"
           if Jammit.configuration[:use_cloudfront] && Jammit.configuration[:cloudfront_domain].present?
-            asset_hostname = "#{protocol}://#{Jammit.configuration[:cloudfront_domain]}"
+            asset_hostname = Jammit.configuration[:cloudfront_domain]
           else
-            asset_hostname = "#{protocol}://#{Jammit.configuration[:s3_bucket]}.s3.amazonaws.com"
+            asset_hostname = "#{Jammit.configuration[:s3_bucket]}.s3.amazonaws.com"
           end
 
           if Jammit.package_assets and asset_hostname.present?
-            ActionController::Base.asset_host = asset_hostname
+            ActionController::Base.asset_host = Proc.new do |source, request|
+              "#{Jammit.configuration[:ssl] || request.protocol}://#{asset_hostname}"
+            end
           end
         end
       end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 5
   - 4
-  - 1
-  version: 0.5.4.1
+  - 2
+  version: 0.5.4.2
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4560565667654219258
+      hash: 543481238828431748
       segments: 
       - 0
       version: "0"
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4560565667654219258
+      hash: 543481238828431748
       segments: 
       - 0
       version: "0"