jammit-s3 0.5.4.0 → 0.5.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/jammit-s3.gemspec +1 -1
  2. data/lib/jammit-s3.rb +3 -2
  3. metadata +5 -5
data/jammit-s3.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'jammit-s3'
3
- s.version = '0.5.4.0'
3
+ s.version = '0.5.4.1'
4
4
 
5
5
  s.homepage = "http://documentcloud.github.com/jammit/"
6
6
  s.summary = "Asset Packaging for Rails with Deployment to S3/Cloudfront"
data/lib/jammit-s3.rb CHANGED
@@ -13,10 +13,11 @@ if defined?(Rails)
13
13
  class JammitRailtie < Rails::Railtie
14
14
  initializer "set asset host and asset id" do
15
15
  config.after_initialize do
16
+ protocol = Jammit.configuration[:ssl] ? "https" : "http"
16
17
  if Jammit.configuration[:use_cloudfront] && Jammit.configuration[:cloudfront_domain].present?
17
- asset_hostname = "http://#{Jammit.configuration[:cloudfront_domain]}"
18
+ asset_hostname = "#{protocol}://#{Jammit.configuration[:cloudfront_domain]}"
18
19
  else
19
- asset_hostname = "http://#{Jammit.configuration[:s3_bucket]}.s3.amazonaws.com"
20
+ asset_hostname = "#{protocol}://#{Jammit.configuration[:s3_bucket]}.s3.amazonaws.com"
20
21
  end
21
22
 
22
23
  if Jammit.package_assets and asset_hostname.present?
metadata CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
6
6
  - 0
7
7
  - 5
8
8
  - 4
9
- - 0
10
- version: 0.5.4.0
9
+ - 1
10
+ version: 0.5.4.1
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-11-17 00:00:00 -08:00
18
+ date: 2010-12-02 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: -2489537748017088546
95
+ hash: 4560565667654219258
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: -2489537748017088546
104
+ hash: 4560565667654219258
105
105
  segments:
106
106
  - 0
107
107
  version: "0"