jammit-s3 0.5.4.2 → 0.5.4.3

data/jammit-s3.gemspec

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

data/lib/jammit-s3.rb

@@ -21,7 +21,12 @@ if defined?(Rails)
 
           if Jammit.package_assets and asset_hostname.present?
             ActionController::Base.asset_host = Proc.new do |source, request|
-              "#{Jammit.configuration[:ssl] || request.protocol}://#{asset_hostname}"
+              if Jammit.configuration.has_key?(:ssl)
+                protocol = Jammit.configuration[:ssl] ? "https://" : "http://"
+              else
+                protocol = request.protocol
+              end
+              "#{protocol}#{asset_hostname}"
             end
           end
         end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 5
   - 4
-  - 2
-  version: 0.5.4.2
+  - 3
+  version: 0.5.4.3
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 -08:00
+date: 2010-12-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 543481238828431748
+      hash: 3026134510799506168
       segments: 
       - 0
       version: "0"
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 543481238828431748
+      hash: 3026134510799506168
       segments: 
       - 0
       version: "0"