witch_doctor 0.4.0 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 54962706322467e1b560490fe28280d976d23c3f
4
- data.tar.gz: 3ea7185d4232c3746bd89d407ac8501d349ab4bd
3
+ metadata.gz: 3e828e4cdbef993d60a9a61aaeeb799079f8d0e0
4
+ data.tar.gz: 1a85a672f72cb45f70c383b71804bc1ea4afc5a5
5
5
  SHA512:
6
- metadata.gz: 4640ff87f365639e1ab06ce652c8395314d42ae20a23df8a93abc6e859324eeb860083cd4409fe1564147e103b8d5665b330d3f269ba3fd264954a48f23968b4
7
- data.tar.gz: 34e62b2d7077c1ea1fc10c2d3c960d38648b1223d6219b96fb92c0e8d8dfd59125cdce01878abaa17d6901bfd0b1abd1d77f4874b598fc5d76036701bcd55480
6
+ metadata.gz: 1fd886ef34aab3b3a0b351b8a92b205bc216af491528b15d3373be109876171cef9154eee05c2f121f3c2319b0c088f66eb5f150449b52ec3ed6e93ac8afecf7
7
+ data.tar.gz: 9210291c728dbfd73283318027523b0dd948291b0085ec0f60424986a75f6e6e453ebc7c3e41b99e3e97efc1f47eb9f2048a69c1243ff324fc7f72761a874952
@@ -1,15 +1,16 @@
1
1
  module WitchDoctor
2
2
  module ApplicationHelper
3
3
  def antivirus(resource, mount_point)
4
- catch(:file_not_scanned) do
5
- if (av = resource.send("#{mount_point}_antivirus")) && av.clean?
6
- yield
7
- elsif av.error?
8
- "Antivirus scan couldn't be completed"
9
- else
10
- 'File Contains Virus'
11
- end
12
- end || 'File waiting for Antivirus check'
4
+ av = resource.send("#{mount_point}_antivirus")
5
+ if !av.checked?
6
+ 'File waiting for Antivirus check<br>'.html_safe
7
+ elsif av.clean?
8
+ yield
9
+ elsif av.error?
10
+ "Antivirus scan couldn't be completed<br>".html_safe
11
+ else
12
+ 'File Contains Virus<br>'.html_safe
13
+ end
13
14
  end
14
15
  end
15
16
  end
@@ -20,17 +20,15 @@ module WitchDoctor
20
20
  end
21
21
 
22
22
  def infected?
23
- !clean? && !error?
23
+ checked? && !clean? && !error?
24
24
  end
25
25
 
26
26
  def error?
27
- throw :file_not_scanned unless checked?
28
- latest_scan.scan_result == 'FileDownloadError'
27
+ checked? && latest_scan.scan_result == 'FileDownloadError'
29
28
  end
30
29
 
31
30
  def clean?
32
- throw :file_not_scanned unless checked?
33
- latest_scan.scan_result == 'Clean'
31
+ checked? && latest_scan.scan_result == 'Clean'
34
32
  end
35
33
  end
36
34
  end
@@ -1,3 +1,3 @@
1
1
  module WitchDoctor
2
- VERSION = "0.4.0"
2
+ VERSION = "0.5.0"
3
3
  end
Binary file
@@ -1,305 +1,14 @@
1
- Connecting to database specified by database.yml
2
-  (0.2ms) select sqlite_version(*)
3
-  (23.7ms) CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL)
4
-  (14.1ms) CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
5
-  (0.1ms) SELECT "schema_migrations"."version" FROM "schema_migrations"
6
- Migrating to CreateDocument (20150209121125)
7
-  (0.1ms) begin transaction
8
-  (0.7ms) CREATE TABLE "documents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "attachment" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
9
-  (0.1ms) INSERT INTO "schema_migrations" ("version") VALUES ('20150209121125')
10
-  (22.2ms) commit transaction
11
- Migrating to CreateWitchDoctorVirusScans (20150209121818)
12
-  (0.1ms) begin transaction
13
-  (0.6ms) CREATE TABLE "virus_scans" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_type" varchar(255), "resource_id" integer, "scan_result" varchar(255), "mount_point" varchar(255), "scanned_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
14
-  (0.3ms) INSERT INTO "schema_migrations" ("version") VALUES ('20150209121818')
15
-  (19.1ms) commit transaction
16
-  (0.1ms) SELECT "schema_migrations"."version" FROM "schema_migrations" 
17
- Connecting to database specified by database.yml
18
-  (0.3ms) begin transaction
19
-  (0.0ms) rollback transaction
20
-  (0.0ms) begin transaction
21
-  (0.0ms) rollback transaction
22
-  (0.1ms) begin transaction
23
-  (0.1ms) rollback transaction
24
-  (0.0ms) begin transaction
25
-  (0.0ms) rollback transaction
26
-  (0.0ms) begin transaction
27
-  (0.0ms) rollback transaction
28
-  (0.0ms) begin transaction
29
-  (0.0ms) rollback transaction
30
-  (0.0ms) begin transaction
31
-  (0.0ms) rollback transaction
32
-  (0.0ms) begin transaction
33
-  (0.0ms) rollback transaction
34
-  (0.0ms) begin transaction
35
-  (0.0ms) rollback transaction
36
-  (0.0ms) begin transaction
37
-  (0.0ms) rollback transaction
38
-  (0.0ms) begin transaction
39
-  (0.1ms) rollback transaction
40
-  (0.0ms) begin transaction
41
-  (0.0ms) rollback transaction
42
-  (0.0ms) begin transaction
43
-  (0.0ms) rollback transaction
44
-  (0.0ms) begin transaction
45
-  (0.0ms) rollback transaction
46
-  (0.0ms) begin transaction
47
-  (0.0ms) rollback transaction
48
-  (0.1ms) begin transaction
49
-  (0.0ms) rollback transaction
50
-  (0.0ms) begin transaction
51
-  (0.0ms) rollback transaction
52
-  (0.0ms) begin transaction
53
-  (0.1ms) rollback transaction
54
-  (0.0ms) begin transaction
55
-  (0.0ms) rollback transaction
56
-  (0.0ms) begin transaction
57
-  (0.0ms) rollback transaction
58
-  (0.0ms) begin transaction
59
-  (0.0ms) rollback transaction
60
-  (0.0ms) begin transaction
61
-  (0.0ms) rollback transaction
62
-  (0.0ms) begin transaction
63
-  (0.0ms) rollback transaction
64
-  (0.0ms) begin transaction
65
-  (0.0ms) rollback transaction
66
-  (0.0ms) begin transaction
67
-  (0.0ms) rollback transaction
68
-  (0.0ms) begin transaction
69
-  (0.0ms) rollback transaction
70
-  (0.0ms) begin transaction
71
-  (0.0ms) rollback transaction
72
-  (0.0ms) begin transaction
73
-  (0.0ms) rollback transaction
74
-  (0.0ms) begin transaction
75
-  (0.0ms) rollback transaction
76
-  (0.0ms) begin transaction
77
-  (0.0ms) rollback transaction
78
-  (0.0ms) begin transaction
79
-  (0.0ms) rollback transaction
80
-  (0.0ms) begin transaction
81
-  (0.0ms) rollback transaction
82
-  (0.0ms) begin transaction
83
-  (0.0ms) rollback transaction
84
-  (0.0ms) begin transaction
85
-  (0.0ms) rollback transaction
86
-  (0.0ms) begin transaction
87
-  (0.0ms) rollback transaction
88
-  (0.0ms) begin transaction
89
-  (0.0ms) rollback transaction
90
-  (0.0ms) begin transaction
91
-  (0.0ms) rollback transaction
92
-  (0.0ms) begin transaction
93
-  (0.0ms) rollback transaction
94
-  (0.0ms) begin transaction
95
-  (0.0ms) rollback transaction
96
-  (0.0ms) begin transaction
97
-  (0.0ms) rollback transaction
98
- Connecting to database specified by database.yml
99
-  (0.1ms) SELECT "schema_migrations"."version" FROM "schema_migrations" 
100
- Migrating to CreateDocument (20150209121125)
101
- Migrating to CreateWitchDoctorVirusScans (20150209121818)
102
-  (0.1ms) select sqlite_version(*)
103
-  (0.0ms) SELECT "schema_migrations"."version" FROM "schema_migrations" 
104
- Connecting to database specified by database.yml
105
-  (0.2ms) begin transaction
106
-  (0.0ms) rollback transaction
107
-  (0.0ms) begin transaction
108
-  (0.0ms) rollback transaction
109
-  (0.0ms) begin transaction
110
-  (0.0ms) rollback transaction
111
-  (0.1ms) begin transaction
112
-  (0.0ms) rollback transaction
113
-  (0.1ms) begin transaction
114
-  (0.1ms) rollback transaction
115
-  (0.2ms) begin transaction
116
-  (0.0ms) rollback transaction
117
-  (0.0ms) begin transaction
118
-  (0.0ms) rollback transaction
119
-  (0.0ms) begin transaction
120
-  (0.0ms) rollback transaction
121
-  (0.0ms) begin transaction
122
-  (0.0ms) rollback transaction
123
-  (0.0ms) begin transaction
124
-  (0.0ms) rollback transaction
125
-  (0.0ms) begin transaction
126
-  (0.0ms) rollback transaction
127
-  (0.0ms) begin transaction
128
-  (0.0ms) rollback transaction
129
-  (0.0ms) begin transaction
130
-  (0.0ms) rollback transaction
131
-  (0.0ms) begin transaction
132
-  (0.0ms) rollback transaction
133
-  (0.0ms) begin transaction
134
-  (0.0ms) rollback transaction
135
-  (0.1ms) begin transaction
136
-  (0.1ms) rollback transaction
137
-  (0.0ms) begin transaction
138
-  (0.0ms) rollback transaction
139
-  (0.0ms) begin transaction
140
-  (0.0ms) rollback transaction
141
-  (0.0ms) begin transaction
142
-  (0.1ms) rollback transaction
143
-  (0.0ms) begin transaction
144
-  (0.0ms) rollback transaction
145
-  (0.0ms) begin transaction
146
-  (0.0ms) rollback transaction
147
-  (0.0ms) begin transaction
148
-  (0.0ms) rollback transaction
149
-  (0.0ms) begin transaction
150
-  (0.0ms) rollback transaction
151
-  (0.0ms) begin transaction
152
-  (0.0ms) rollback transaction
153
-  (0.0ms) begin transaction
154
-  (0.0ms) rollback transaction
155
-  (0.0ms) begin transaction
156
-  (0.0ms) rollback transaction
157
-  (0.0ms) begin transaction
158
-  (0.0ms) rollback transaction
159
-  (0.0ms) begin transaction
160
-  (0.0ms) rollback transaction
161
-  (0.0ms) begin transaction
162
-  (0.0ms) rollback transaction
163
-  (0.0ms) begin transaction
164
-  (0.0ms) rollback transaction
165
-  (0.0ms) begin transaction
166
-  (0.0ms) rollback transaction
167
-  (0.0ms) begin transaction
168
-  (0.0ms) rollback transaction
169
-  (0.0ms) begin transaction
170
-  (0.0ms) rollback transaction
171
-  (0.0ms) begin transaction
172
-  (0.0ms) rollback transaction
173
-  (0.0ms) begin transaction
174
-  (0.0ms) rollback transaction
175
-  (0.0ms) begin transaction
176
-  (0.0ms) rollback transaction
177
-  (0.0ms) begin transaction
178
-  (0.0ms) rollback transaction
179
-  (0.0ms) begin transaction
180
-  (0.0ms) rollback transaction
181
-  (0.0ms) begin transaction
182
-  (0.0ms) rollback transaction
183
-  (0.0ms) begin transaction
184
-  (0.0ms) rollback transaction
185
- Connecting to database specified by database.yml
186
-  (0.1ms) SELECT "schema_migrations"."version" FROM "schema_migrations" 
187
- Migrating to CreateDocument (20150209121125)
188
- Migrating to CreateWitchDoctorVirusScans (20150209121818)
189
-  (0.1ms) select sqlite_version(*)
190
-  (0.1ms) SELECT "schema_migrations"."version" FROM "schema_migrations" 
191
- Connecting to database specified by database.yml
192
-  (0.2ms) begin transaction
193
-  (0.0ms) rollback transaction
194
-  (0.0ms) begin transaction
195
-  (0.0ms) rollback transaction
196
-  (0.0ms) begin transaction
197
-  (0.0ms) rollback transaction
198
-  (0.1ms) begin transaction
199
-  (0.0ms) rollback transaction
200
-  (0.0ms) begin transaction
201
-  (0.0ms) rollback transaction
202
-  (0.0ms) begin transaction
203
-  (0.0ms) rollback transaction
204
-  (0.1ms) begin transaction
205
-  (0.1ms) rollback transaction
206
-  (0.2ms) begin transaction
207
-  (0.0ms) rollback transaction
208
-  (0.0ms) begin transaction
209
-  (0.0ms) rollback transaction
210
-  (0.0ms) begin transaction
211
-  (0.0ms) rollback transaction
212
-  (0.0ms) begin transaction
213
-  (0.0ms) rollback transaction
214
-  (0.0ms) begin transaction
215
-  (0.0ms) rollback transaction
216
-  (0.0ms) begin transaction
217
-  (0.0ms) rollback transaction
218
-  (0.0ms) begin transaction
219
-  (0.0ms) rollback transaction
220
-  (0.1ms) begin transaction
221
-  (0.0ms) rollback transaction
222
-  (0.0ms) begin transaction
223
-  (0.0ms) rollback transaction
224
-  (0.1ms) begin transaction
225
-  (0.0ms) rollback transaction
226
-  (0.1ms) begin transaction
227
-  (0.0ms) rollback transaction
228
-  (0.0ms) begin transaction
229
-  (0.0ms) rollback transaction
230
-  (0.0ms) begin transaction
231
-  (0.0ms) rollback transaction
232
-  (0.0ms) begin transaction
233
-  (0.0ms) rollback transaction
234
-  (0.0ms) begin transaction
235
-  (0.0ms) rollback transaction
236
-  (0.0ms) begin transaction
237
-  (0.0ms) rollback transaction
238
-  (0.0ms) begin transaction
239
-  (0.0ms) rollback transaction
240
-  (0.0ms) begin transaction
241
-  (0.0ms) rollback transaction
242
-  (0.0ms) begin transaction
243
-  (0.0ms) rollback transaction
244
-  (0.0ms) begin transaction
245
-  (0.0ms) rollback transaction
246
-  (0.0ms) begin transaction
247
-  (0.0ms) rollback transaction
248
-  (0.0ms) begin transaction
249
-  (0.0ms) rollback transaction
250
-  (0.0ms) begin transaction
251
-  (0.0ms) rollback transaction
252
-  (0.0ms) begin transaction
253
-  (0.0ms) rollback transaction
254
-  (0.0ms) begin transaction
255
-  (0.0ms) rollback transaction
256
-  (0.0ms) begin transaction
257
-  (0.0ms) rollback transaction
258
-  (0.0ms) begin transaction
259
-  (0.0ms) rollback transaction
260
-  (0.0ms) begin transaction
261
-  (0.0ms) rollback transaction
262
-  (0.0ms) begin transaction
263
-  (0.0ms) rollback transaction
264
-  (0.0ms) begin transaction
265
-  (0.0ms) rollback transaction
266
-  (0.0ms) begin transaction
267
-  (0.0ms) rollback transaction
268
-  (0.0ms) begin transaction
269
-  (0.0ms) rollback transaction
270
-  (0.0ms) begin transaction
271
-  (0.0ms) rollback transaction
272
- Connecting to database specified by database.yml
273
-  (0.1ms) SELECT "schema_migrations"."version" FROM "schema_migrations" 
1
+  (13.0ms) CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
2
+  (19.0ms) CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
3
+ ActiveRecord::SchemaMigration Load (0.3ms) SELECT "schema_migrations".* FROM "schema_migrations"
274
4
  Migrating to CreateDocument (20150209121125)
5
+  (0.2ms) begin transaction
6
+  (1.0ms) CREATE TABLE "documents" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "attachment" varchar(255), "created_at" datetime, "updated_at" datetime) 
7
+ SQL (0.5ms) INSERT INTO "schema_migrations" ("version") VALUES (?) [["version", "20150209121125"]]
8
+  (24.2ms) commit transaction
275
9
  Migrating to CreateWitchDoctorVirusScans (20150209121818)
276
-  (0.0ms) select sqlite_version(*)
277
-  (0.0ms) SELECT "schema_migrations"."version" FROM "schema_migrations" 
278
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
279
- ActiveRecord::SchemaMigration Load (0.3ms) SELECT "schema_migrations".* FROM "schema_migrations"
280
- ActiveRecord::SchemaMigration Load (0.2ms) SELECT "schema_migrations".* FROM "schema_migrations"
281
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
282
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
283
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
284
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
285
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
286
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
287
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
288
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
289
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
290
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
291
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
292
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
293
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
294
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
295
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
296
- ActiveRecord::SchemaMigration Load (0.3ms) SELECT "schema_migrations".* FROM "schema_migrations"
297
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
298
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
299
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
300
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
301
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
302
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
303
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
304
- ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"
10
+  (0.2ms) begin transaction
11
+  (0.7ms) CREATE TABLE "virus_scans" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_type" varchar(255), "resource_id" integer, "scan_result" varchar(255), "mount_point" varchar(255), "scanned_at" datetime, "created_at" datetime, "updated_at" datetime) 
12
+ SQL (0.3ms) INSERT INTO "schema_migrations" ("version") VALUES (?) [["version", "20150209121818"]]
13
+  (23.7ms) commit transaction
305
14
  ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations"