potatosalad-carrierwave 0.5.7 → 0.5.7.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/carrierwave/orm/mongoid.rb +16 -9
  2. data/lib/carrierwave/uploader/configuration.rb +0 -2
  3. data/lib/carrierwave/uploader/store.rb +2 -2
  4. data/lib/carrierwave/version.rb +1 -1
  5. metadata +38 -38
data/lib/carrierwave/orm/mongoid.rb CHANGED
@@ -33,16 +33,23 @@ module CarrierWave
33
33
  def #{column}=(new_file)
34
34
  column = _mounter(:#{column}).serialization_column
35
35
 
36
- # Note (Didier L.): equivalent of the <column>_will_change! ActiveModel method
37
- begin
38
- value = __send__(column)
39
- value = value.duplicable? ? value.clone : value
40
- rescue TypeError, NoMethodError
41
- end
42
- setup_modifications
36
+ # Note (potatosalad): compatibility for mongoid < 2.1
37
+ if self.respond_to?(:setup_modifications)
38
+ # Note (Didier L.): equivalent of the <column>_will_change! ActiveModel method
39
+ begin
40
+ value = __send__(column)
41
+ value = value.duplicable? ? value.clone : value
42
+ rescue TypeError, NoMethodError
43
+ end
44
+ setup_modifications
43
45
 
44
- super.tap do
45
- @modifications[column] = [value, __send__(column)]
46
+ super.tap do
47
+ @modifications[column] = [value, __send__(column)]
48
+ end
49
+ else
50
+ # Note (potatosalad): compatibility for mongoid >= 2.1
51
+ send(:"\#{column}_will_change!")
52
+ super
46
53
  end
47
54
  end
48
55
 
data/lib/carrierwave/uploader/configuration.rb CHANGED
@@ -37,7 +37,6 @@ module CarrierWave
37
37
  add_config :enable_processing
38
38
  add_config :ensure_multipart_form
39
39
  add_config :delete_tmp_file_after_storage
40
- add_config :delete_cache_id_after_storage
41
40
  add_config :remove_previously_stored_files_after_update
42
41
 
43
42
  # fog
@@ -145,7 +144,6 @@ module CarrierWave
145
144
  config.store_dir = 'uploads'
146
145
  config.cache_dir = 'uploads/tmp'
147
146
  config.delete_tmp_file_after_storage = true
148
- config.delete_cache_id_after_storage = true
149
147
  config.remove_previously_stored_files_after_update = true
150
148
  config.ignore_integrity_errors = true
151
149
  config.ignore_processing_errors = true
data/lib/carrierwave/uploader/store.rb CHANGED
@@ -58,13 +58,13 @@ module CarrierWave
58
58
  with_callbacks(:store, new_file) do
59
59
  new_file = storage.store!(@file)
60
60
  @file.delete if delete_tmp_file_after_storage
61
- delete_cache_id if delete_cache_id_after_storage
61
+ delete_cache_id
62
62
  @file = new_file
63
63
  @cache_id = nil
64
64
  end
65
65
  end
66
66
  end
67
-
67
+
68
68
  ##
69
69
  # Deletes a cache id (tmp dir in cache)
70
70
  #
data/lib/carrierwave/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CarrierWave
2
- VERSION = "0.5.7"
2
+ VERSION = "0.5.7.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: potatosalad-carrierwave
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.7
4
+ version: 0.5.7.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-07-19 00:00:00.000000000Z
12
+ date: 2011-08-02 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
16
- requirement: &2156936920 !ruby/object:Gem::Requirement
16
+ requirement: &2163505140 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2156936920
24
+ version_requirements: *2163505140
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rails
27
- requirement: &2156934900 !ruby/object:Gem::Requirement
27
+ requirement: &2163504020 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '3.0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *2156934900
35
+ version_requirements: *2163504020
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rspec
38
- requirement: &2156934300 !ruby/object:Gem::Requirement
38
+ requirement: &2163502980 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '2.0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2156934300
46
+ version_requirements: *2163502980
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: excon
49
- requirement: &2156933700 !ruby/object:Gem::Requirement
49
+ requirement: &2163502400 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *2156933700
57
+ version_requirements: *2163502400
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: fog
60
- requirement: &2156932800 !ruby/object:Gem::Requirement
60
+ requirement: &2163501260 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *2156932800
68
+ version_requirements: *2163501260
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: cucumber
71
- requirement: &2156932260 !ruby/object:Gem::Requirement
71
+ requirement: &2163500380 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2156932260
79
+ version_requirements: *2163500380
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: sqlite3
82
- requirement: &2156931740 !ruby/object:Gem::Requirement
82
+ requirement: &2163499780 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2156931740
90
+ version_requirements: *2163499780
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rmagick
93
- requirement: &2156931260 !ruby/object:Gem::Requirement
93
+ requirement: &2163499120 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *2156931260
101
+ version_requirements: *2163499120
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: RubyInline
104
- requirement: &2156930820 !ruby/object:Gem::Requirement
104
+ requirement: &2163498360 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *2156930820
112
+ version_requirements: *2163498360
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: image_science
115
- requirement: &2156930280 !ruby/object:Gem::Requirement
115
+ requirement: &2163497700 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *2156930280
123
+ version_requirements: *2163497700
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: mini_magick
126
- requirement: &2156929840 !ruby/object:Gem::Requirement
126
+ requirement: &2163496860 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *2156929840
134
+ version_requirements: *2163496860
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: bson_ext
137
- requirement: &2156929280 !ruby/object:Gem::Requirement
137
+ requirement: &2163496140 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *2156929280
145
+ version_requirements: *2163496140
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: mongoid
148
- requirement: &2156928480 !ruby/object:Gem::Requirement
148
+ requirement: &2163495180 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *2156928480
156
+ version_requirements: *2163495180
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: timecop
159
- requirement: &2156927660 !ruby/object:Gem::Requirement
159
+ requirement: &2163494500 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '0'
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *2156927660
167
+ version_requirements: *2163494500
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: json
170
- requirement: &2156926780 !ruby/object:Gem::Requirement
170
+ requirement: &2163493880 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *2156926780
178
+ version_requirements: *2163493880
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: cloudfiles
181
- requirement: &2156925080 !ruby/object:Gem::Requirement
181
+ requirement: &2163493180 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '0'
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *2156925080
189
+ version_requirements: *2163493180
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: sham_rack
192
- requirement: &2156923220 !ruby/object:Gem::Requirement
192
+ requirement: &2163492540 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,7 +197,7 @@ dependencies:
197
197
  version: '0'
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *2156923220
200
+ version_requirements: *2163492540
201
201
  description: Upload files in your Ruby applications, map them to a range of ORMs,
202
202
  store them on different backends.
203
203
  email:
@@ -261,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
261
261
  version: '0'
262
262
  segments:
263
263
  - 0
264
- hash: 574789017334926446
264
+ hash: 2321682565582900172
265
265
  required_rubygems_version: !ruby/object:Gem::Requirement
266
266
  none: false
267
267
  requirements:
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
270
270
  version: '0'
271
271
  segments:
272
272
  - 0
273
- hash: 574789017334926446
273
+ hash: 2321682565582900172
274
274
  requirements: []
275
275
  rubyforge_project: carrierwave
276
276
  rubygems_version: 1.8.5