jammit-s3 0.5.3.6 → 0.5.4.0

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 +2 -2
  2. data/lib/jammit-s3.rb +9 -4
  3. metadata +18 -22
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'jammit-s3'
3
- s.version = '0.5.3.6'
3
+ s.version = '0.5.4.0'
4
4
 
5
5
  s.homepage = "http://documentcloud.github.com/jammit/"
6
6
  s.summary = "Asset Packaging for Rails with Deployment to S3/Cloudfront"
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
15
15
  s.require_paths = ['lib']
16
16
  s.executables = ['jammit-s3']
17
17
 
18
- s.add_dependency 'jammit', '>= 0.5.3'
18
+ s.add_dependency 'jammit', '>= 0.5.4'
19
19
  s.add_dependency 'mimemagic', '>= 0.1.7'
20
20
  s.add_dependency 's3', ">= 0.3.7"
21
21
 
@@ -13,12 +13,17 @@ 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
- s3_bucket = Jammit.configuration[:s3_bucket]
17
- if Jammit.package_assets and s3_bucket.present?
18
- ActionController::Base.asset_host = "http://#{Jammit.configuration[:s3_bucket]}.s3.amazonaws.com"
16
+ if Jammit.configuration[:use_cloudfront] && Jammit.configuration[:cloudfront_domain].present?
17
+ asset_hostname = "http://#{Jammit.configuration[:cloudfront_domain]}"
18
+ else
19
+ asset_hostname = "http://#{Jammit.configuration[:s3_bucket]}.s3.amazonaws.com"
20
+ end
21
+
22
+ if Jammit.package_assets and asset_hostname.present?
23
+ ActionController::Base.asset_host = asset_hostname
19
24
  end
20
25
  end
21
26
  end
22
27
  end
23
28
  end
24
- end
29
+ end
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jammit-s3
3
3
  version: !ruby/object:Gem::Version
4
- hash: 103
5
4
  prerelease: false
6
5
  segments:
7
6
  - 0
8
7
  - 5
9
- - 3
10
- - 6
11
- version: 0.5.3.6
8
+ - 4
9
+ - 0
10
+ version: 0.5.4.0
12
11
  platform: ruby
13
12
  authors:
14
13
  - Jacques Crocker
@@ -16,57 +15,54 @@ autorequire:
16
15
  bindir: bin
17
16
  cert_chain: []
18
17
 
19
- date: 2010-10-30 00:00:00 -07:00
18
+ date: 2010-11-17 00:00:00 -08:00
20
19
  default_executable:
21
20
  dependencies:
22
21
  - !ruby/object:Gem::Dependency
23
- type: :runtime
24
- prerelease: false
25
22
  name: jammit
26
- version_requirements: &id001 !ruby/object:Gem::Requirement
23
+ requirement: &id001 !ruby/object:Gem::Requirement
27
24
  none: false
28
25
  requirements:
29
26
  - - ">="
30
27
  - !ruby/object:Gem::Version
31
- hash: 13
32
28
  segments:
33
29
  - 0
34
30
  - 5
35
- - 3
36
- version: 0.5.3
37
- requirement: *id001
38
- - !ruby/object:Gem::Dependency
31
+ - 4
32
+ version: 0.5.4
39
33
  type: :runtime
40
34
  prerelease: false
35
+ version_requirements: *id001
36
+ - !ruby/object:Gem::Dependency
41
37
  name: mimemagic
42
- version_requirements: &id002 !ruby/object:Gem::Requirement
38
+ requirement: &id002 !ruby/object:Gem::Requirement
43
39
  none: false
44
40
  requirements:
45
41
  - - ">="
46
42
  - !ruby/object:Gem::Version
47
- hash: 21
48
43
  segments:
49
44
  - 0
50
45
  - 1
51
46
  - 7
52
47
  version: 0.1.7
53
- requirement: *id002
54
- - !ruby/object:Gem::Dependency
55
48
  type: :runtime
56
49
  prerelease: false
50
+ version_requirements: *id002
51
+ - !ruby/object:Gem::Dependency
57
52
  name: s3
58
- version_requirements: &id003 !ruby/object:Gem::Requirement
53
+ requirement: &id003 !ruby/object:Gem::Requirement
59
54
  none: false
60
55
  requirements:
61
56
  - - ">="
62
57
  - !ruby/object:Gem::Version
63
- hash: 29
64
58
  segments:
65
59
  - 0
66
60
  - 3
67
61
  - 7
68
62
  version: 0.3.7
69
- requirement: *id003
63
+ type: :runtime
64
+ prerelease: false
65
+ version_requirements: *id003
70
66
  description: " Jammit-S3 is an extension to the awesome Jammit library that handles deployment to s3 and cloudfront.\n"
71
67
  email: railsjedi@gmail.com
72
68
  executables:
@@ -96,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
96
92
  requirements:
97
93
  - - ">="
98
94
  - !ruby/object:Gem::Version
99
- hash: 3
95
+ hash: -2489537748017088546
100
96
  segments:
101
97
  - 0
102
98
  version: "0"
@@ -105,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
105
101
  requirements:
106
102
  - - ">="
107
103
  - !ruby/object:Gem::Version
108
- hash: 3
104
+ hash: -2489537748017088546
109
105
  segments:
110
106
  - 0
111
107
  version: "0"