jammit-s3 0.5.4.2 → 0.5.4.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/jammit-s3.gemspec +1 -1
  2. data/lib/jammit-s3.rb +6 -1
  3. metadata +5 -5
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'jammit-s3'
3
- s.version = '0.5.4.2'
3
+ s.version = '0.5.4.3'
4
4
 
5
5
  s.homepage = "http://documentcloud.github.com/jammit/"
6
6
  s.summary = "Asset Packaging for Rails with Deployment to S3/Cloudfront"
@@ -21,7 +21,12 @@ if defined?(Rails)
21
21
 
22
22
  if Jammit.package_assets and asset_hostname.present?
23
23
  ActionController::Base.asset_host = Proc.new do |source, request|
24
- "#{Jammit.configuration[:ssl] || request.protocol}://#{asset_hostname}"
24
+ if Jammit.configuration.has_key?(:ssl)
25
+ protocol = Jammit.configuration[:ssl] ? "https://" : "http://"
26
+ else
27
+ protocol = request.protocol
28
+ end
29
+ "#{protocol}#{asset_hostname}"
25
30
  end
26
31
  end
27
32
  end
metadata CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
6
6
  - 0
7
7
  - 5
8
8
  - 4
9
- - 2
10
- version: 0.5.4.2
9
+ - 3
10
+ version: 0.5.4.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Jacques Crocker
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-12-02 00:00:00 -08:00
18
+ date: 2010-12-03 00:00:00 -08:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
92
92
  requirements:
93
93
  - - ">="
94
94
  - !ruby/object:Gem::Version
95
- hash: 543481238828431748
95
+ hash: 3026134510799506168
96
96
  segments:
97
97
  - 0
98
98
  version: "0"
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
101
101
  requirements:
102
102
  - - ">="
103
103
  - !ruby/object:Gem::Version
104
- hash: 543481238828431748
104
+ hash: 3026134510799506168
105
105
  segments:
106
106
  - 0
107
107
  version: "0"