paperclip-cloudfiles 2.3.1.1.4 → 2.3.1.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/paperclip/storage.rb +3 -2
  2. data/lib/paperclip.rb +1 -1
  3. metadata +62 -33
data/lib/paperclip/storage.rb CHANGED
@@ -289,9 +289,10 @@ module Paperclip
289
289
  base.instance_eval do
290
290
  @cloudfiles_credentials = parse_credentials(@options[:cloudfiles_credentials])
291
291
  @container_name = @options[:container] || @cloudfiles_credentials[:container]
292
+ @container_name = @container_name.call(self) if @container_name.is_a?(Proc)
292
293
  @cloudfiles_options = @options[:cloudfiles_options] || {}
293
- @@cdn_url ||= cloudfiles_container.cdn_url
294
- @path_filename = ":cf_path_filename" unless @url.to_s.match(/^:cf.*filename$/)
294
+ @@cdn_url = cloudfiles_container.cdn_url
295
+ @path_filename = ":cf_path_filename" unless @url.to_s.match(/^:cf.*filename$/)
295
296
  @url = @@cdn_url + "/#{URI.encode(@path_filename).gsub(/&/,'%26')}"
296
297
  @path = (Paperclip::Attachment.default_options[:path] == @options[:path]) ? ":attachment/:id/:style/:basename.:extension" : @options[:path]
297
298
  end
data/lib/paperclip.rb CHANGED
@@ -46,7 +46,7 @@ end
46
46
  # documentation for Paperclip::ClassMethods for more useful information.
47
47
  module Paperclip
48
48
 
49
- VERSION = "2.3.1.1.4"
49
+ VERSION = "2.3.1.1.5"
50
50
 
51
51
  class << self
52
52
  # Provides configurability to Paperclip. There are a number of options available, such as:
metadata CHANGED
@@ -1,7 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: paperclip-cloudfiles
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.1.1.4
4
+ prerelease: false
5
+ segments:
6
+ - 2
7
+ - 3
8
+ - 1
9
+ - 1
10
+ - 5
11
+ version: 2.3.1.1.5
5
12
  platform: ruby
6
13
  authors:
7
14
  - Jon Yurek
@@ -10,79 +17,99 @@ autorequire:
10
17
  bindir: bin
11
18
  cert_chain: []
12
19
 
13
- date: 2010-02-01 00:00:00 -06:00
20
+ date: 2010-03-05 00:00:00 -06:00
14
21
  default_executable:
15
22
  dependencies:
16
23
  - !ruby/object:Gem::Dependency
17
24
  name: shoulda
18
- type: :development
19
- version_requirement:
20
- version_requirements: !ruby/object:Gem::Requirement
25
+ prerelease: false
26
+ requirement: &id001 !ruby/object:Gem::Requirement
21
27
  requirements:
22
28
  - - ">="
23
29
  - !ruby/object:Gem::Version
30
+ segments:
31
+ - 0
24
32
  version: "0"
25
- version:
33
+ type: :development
34
+ version_requirements: *id001
26
35
  - !ruby/object:Gem::Dependency
27
36
  name: jferris-mocha
28
- type: :development
29
- version_requirement:
30
- version_requirements: !ruby/object:Gem::Requirement
37
+ prerelease: false
38
+ requirement: &id002 !ruby/object:Gem::Requirement
31
39
  requirements:
32
40
  - - ">="
33
41
  - !ruby/object:Gem::Version
42
+ segments:
43
+ - 0
44
+ - 9
45
+ - 5
46
+ - 0
47
+ - 1241126838
34
48
  version: 0.9.5.0.1241126838
35
- version:
49
+ type: :development
50
+ version_requirements: *id002
36
51
  - !ruby/object:Gem::Dependency
37
52
  name: aws-s3
38
- type: :development
39
- version_requirement:
40
- version_requirements: !ruby/object:Gem::Requirement
53
+ prerelease: false
54
+ requirement: &id003 !ruby/object:Gem::Requirement
41
55
  requirements:
42
56
  - - ">="
43
57
  - !ruby/object:Gem::Version
58
+ segments:
59
+ - 0
44
60
  version: "0"
45
- version:
61
+ type: :development
62
+ version_requirements: *id003
46
63
  - !ruby/object:Gem::Dependency
47
64
  name: cloudfiles
48
- type: :development
49
- version_requirement:
50
- version_requirements: !ruby/object:Gem::Requirement
65
+ prerelease: false
66
+ requirement: &id004 !ruby/object:Gem::Requirement
51
67
  requirements:
52
68
  - - ">="
53
69
  - !ruby/object:Gem::Version
70
+ segments:
71
+ - 1
72
+ - 4
73
+ - 4
54
74
  version: 1.4.4
55
- version:
75
+ type: :development
76
+ version_requirements: *id004
56
77
  - !ruby/object:Gem::Dependency
57
78
  name: sqlite3-ruby
58
- type: :development
59
- version_requirement:
60
- version_requirements: !ruby/object:Gem::Requirement
79
+ prerelease: false
80
+ requirement: &id005 !ruby/object:Gem::Requirement
61
81
  requirements:
62
82
  - - ">="
63
83
  - !ruby/object:Gem::Version
84
+ segments:
85
+ - 0
64
86
  version: "0"
65
- version:
87
+ type: :development
88
+ version_requirements: *id005
66
89
  - !ruby/object:Gem::Dependency
67
90
  name: activerecord
68
- type: :development
69
- version_requirement:
70
- version_requirements: !ruby/object:Gem::Requirement
91
+ prerelease: false
92
+ requirement: &id006 !ruby/object:Gem::Requirement
71
93
  requirements:
72
94
  - - ">="
73
95
  - !ruby/object:Gem::Version
96
+ segments:
97
+ - 0
74
98
  version: "0"
75
- version:
99
+ type: :development
100
+ version_requirements: *id006
76
101
  - !ruby/object:Gem::Dependency
77
102
  name: activesupport
78
- type: :development
79
- version_requirement:
80
- version_requirements: !ruby/object:Gem::Requirement
103
+ prerelease: false
104
+ requirement: &id007 !ruby/object:Gem::Requirement
81
105
  requirements:
82
106
  - - ">="
83
107
  - !ruby/object:Gem::Version
108
+ segments:
109
+ - 0
84
110
  version: "0"
85
- version:
111
+ type: :development
112
+ version_requirements: *id007
86
113
  description: A fork of the Thoughtbot Paperclip gem/plugin, adding support for Rackspace Cloud Files. This fork is maintained by H. Wade Minter <minter@lunenburg.org>
87
114
  email:
88
115
  - jyurek@thoughtbot.com
@@ -158,18 +185,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
158
185
  requirements:
159
186
  - - ">="
160
187
  - !ruby/object:Gem::Version
188
+ segments:
189
+ - 0
161
190
  version: "0"
162
- version:
163
191
  required_rubygems_version: !ruby/object:Gem::Requirement
164
192
  requirements:
165
193
  - - ">="
166
194
  - !ruby/object:Gem::Version
195
+ segments:
196
+ - 0
167
197
  version: "0"
168
- version:
169
198
  requirements:
170
199
  - ImageMagick
171
200
  rubyforge_project: paperclip
172
- rubygems_version: 1.3.5
201
+ rubygems_version: 1.3.6
173
202
  signing_key:
174
203
  specification_version: 3
175
204
  summary: File attachments as attributes for ActiveRecord with Rackspace Cloud Files support