carrierwave_securefile 0.2.3 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/README.md +4 -0
  2. data/VERSION +1 -1
  3. data/carrierwave_securefile.gemspec +3 -3
  4. data/lib/carrierwave/securefile/downloader.rb +17 -12
  5. metadata +47 -17
data/README.md CHANGED
@@ -39,6 +39,10 @@ It hasn't been tested.
39
39
  * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
40
40
  * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
41
41
 
42
+ ### Thanks To
43
+
44
+ [sirvine](https://github.com/sirvine) for help with the downloader.
45
+
42
46
  ### Copyright
43
47
 
44
48
  Copyright (c) 2011 Doug Clark. See LICENSE.txt for further details.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.3
1
+ 0.3.0
data/carrierwave_securefile.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "carrierwave_securefile"
8
- s.version = "0.2.3"
8
+ s.version = "0.3.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Doug Clark"]
12
- s.date = "2011-12-05"
12
+ s.date = "2012-05-27"
13
13
  s.description = "Secure, encrypted file uploads using Crypt19 and CarrierWave"
14
14
  s.email = "doug@dougclarkonline.com"
15
15
  s.extra_rdoc_files = [
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
39
39
  s.homepage = "http://github.com/dougc84/carrierwave_securefile"
40
40
  s.licenses = ["MIT"]
41
41
  s.require_paths = ["lib"]
42
- s.rubygems_version = "1.8.10"
42
+ s.rubygems_version = "1.8.23"
43
43
  s.summary = "Secure, encrypted file uploads using Crypt19 and CarrierWave"
44
44
 
45
45
  if s.respond_to? :specification_version then
data/lib/carrierwave/securefile/downloader.rb CHANGED
@@ -12,22 +12,27 @@ module CarrierWave
12
12
  filename = eval("uploaded_file.#{file_field.to_s}").to_s
13
13
  begin
14
14
  downloader.download!(filename)
15
- file = downloader.to_s
15
+ file = downloader.file.path.to_s
16
16
  rescue Exception => e
17
+ Rails.logger.debug "Unable to download file: #{e}"
17
18
  file = filename
18
19
  end
19
- ext_file = file + ".x1"
20
- File.rename(file,ext_file)
21
- configuration = CarrierWave::SecureFile.configuration
22
- bf = CarrierWave::SecureFile.cryptable.new(configuration.cypher)
23
- bf.decrypt_file(ext_file, file)
24
- File.unlink(ext_file)
25
- return { :file => file, :content_type => uploaded_file.content_type }
26
- end
27
-
28
- end
29
-
20
+ if File.exists? file
21
+ ext_file = file + ".x1"
22
+ File.rename(file,ext_file)
23
+ configuration = CarrierWave::SecureFile.configuration
24
+ bf = CarrierWave::SecureFile.cryptable.new(configuration.cypher)
25
+ bf.decrypt_file(ext_file, file)
26
+ File.unlink(ext_file)
27
+ return { :file => file, :content_type => uploaded_file.content_type }
28
+ else
29
+ # return nil if no file was found
30
+ Rails.logger.debug "Unable to find the target file."
31
+ nil
32
+ end
33
+ end
30
34
 
35
+ end
31
36
  end
32
37
  end
33
38
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: carrierwave_securefile
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
4
+ version: 0.3.0
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-12-05 00:00:00.000000000 Z
12
+ date: 2012-05-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: carrierwave
16
- requirement: &70174230513560 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,21 +21,31 @@ dependencies:
21
21
  version: 0.5.8
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70174230513560
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: 0.5.8
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: crypt19
27
- requirement: &70174230513020 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
- - - =
35
+ - - '='
31
36
  - !ruby/object:Gem::Version
32
37
  version: 1.2.1
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *70174230513020
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - '='
44
+ - !ruby/object:Gem::Version
45
+ version: 1.2.1
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: shoulda
38
- requirement: &70174230512460 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
43
53
  version: '0'
44
54
  type: :development
45
55
  prerelease: false
46
- version_requirements: *70174230512460
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: bundler
49
- requirement: &70174230528220 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
54
69
  version: '0'
55
70
  type: :development
56
71
  prerelease: false
57
- version_requirements: *70174230528220
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: jeweler
60
- requirement: &70174230527700 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
83
  - - ~>
@@ -65,10 +85,15 @@ dependencies:
65
85
  version: 1.6.4
66
86
  type: :development
67
87
  prerelease: false
68
- version_requirements: *70174230527700
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ version: 1.6.4
69
94
  - !ruby/object:Gem::Dependency
70
95
  name: rcov
71
- requirement: &70174230527140 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
72
97
  none: false
73
98
  requirements:
74
99
  - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
76
101
  version: '0'
77
102
  type: :development
78
103
  prerelease: false
79
- version_requirements: *70174230527140
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
80
110
  description: Secure, encrypted file uploads using Crypt19 and CarrierWave
81
111
  email: doug@dougclarkonline.com
82
112
  executables: []
@@ -118,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
118
148
  version: '0'
119
149
  segments:
120
150
  - 0
121
- hash: -2571430752752545148
151
+ hash: 3217374329195837703
122
152
  required_rubygems_version: !ruby/object:Gem::Requirement
123
153
  none: false
124
154
  requirements:
@@ -127,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
127
157
  version: '0'
128
158
  requirements: []
129
159
  rubyforge_project:
130
- rubygems_version: 1.8.10
160
+ rubygems_version: 1.8.23
131
161
  signing_key:
132
162
  specification_version: 3
133
163
  summary: Secure, encrypted file uploads using Crypt19 and CarrierWave