progstr-filer 0.8.9 → 0.8.10
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/lib/filer/attachment.rb +10 -1
- data/lib/filer/uploader.rb +4 -1
- data/test/test_upload_on_save.rb +11 -0
- data/test/user_data.rb +1 -0
- metadata +31 -31
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.8.
|
1
|
+
0.8.10
|
data/lib/filer/attachment.rb
CHANGED
@@ -141,8 +141,17 @@ module Progstr
|
|
141
141
|
}
|
142
142
|
end
|
143
143
|
|
144
|
+
def uploaded?
|
145
|
+
@uploaded == true
|
146
|
+
end
|
147
|
+
def mark_uploaded!
|
148
|
+
@uploaded = true
|
149
|
+
end
|
150
|
+
|
144
151
|
def need_upload?
|
145
|
-
if
|
152
|
+
if uploaded?
|
153
|
+
false
|
154
|
+
elsif file.nil?
|
146
155
|
false
|
147
156
|
elsif file.kind_of?(FileLike)
|
148
157
|
false
|
data/lib/filer/uploader.rb
CHANGED
@@ -26,6 +26,7 @@ module Progstr
|
|
26
26
|
|
27
27
|
def upload_attachment(attachment)
|
28
28
|
url = "#{Progstr::Filer.url_prefix}upload/new"
|
29
|
+
puts "upload to: #{url}"
|
29
30
|
begin
|
30
31
|
response = RestClient.post(url, {
|
31
32
|
:upload1 => attachment.file,
|
@@ -33,7 +34,9 @@ module Progstr
|
|
33
34
|
:uploader => self.class.name,
|
34
35
|
:id => attachment.id
|
35
36
|
}, json_headers)
|
36
|
-
UploadStatus.new MultiJson.decode(response)
|
37
|
+
result = UploadStatus.new MultiJson.decode(response)
|
38
|
+
attachment.mark_uploaded!
|
39
|
+
result
|
37
40
|
rescue => e
|
38
41
|
if e.respond_to?(:response) && !e.response.nil?
|
39
42
|
raise ApiError.new(MultiJson.decode(e.response))
|
data/test/test_upload_on_save.rb
CHANGED
@@ -31,6 +31,17 @@ class TestUploadOnSave < UserTest
|
|
31
31
|
assert_equal "7933ad9a0f93457ab625a070fec3544f", saved_id
|
32
32
|
end
|
33
33
|
|
34
|
+
should "not upload already uploaded attachments" do
|
35
|
+
u = User.new
|
36
|
+
f = FileMock.new
|
37
|
+
u.avatar = f
|
38
|
+
u.save!
|
39
|
+
|
40
|
+
$lastUploadedAtachment = nil
|
41
|
+
u.save!
|
42
|
+
assert_nil $lastUploadedAtachment
|
43
|
+
end
|
44
|
+
|
34
45
|
should "delete the previous attachment on save" do
|
35
46
|
u = User.new
|
36
47
|
f1 = FileMock.new
|
data/test/user_data.rb
CHANGED
@@ -25,6 +25,7 @@ $lastDeletedAtachment = nil
|
|
25
25
|
class MockUploader < Progstr::Filer::Uploader
|
26
26
|
def upload_attachment(attachment)
|
27
27
|
$lastUploadedAtachment = attachment
|
28
|
+
attachment.mark_uploaded!
|
28
29
|
end
|
29
30
|
def delete_attachment(attachment)
|
30
31
|
$lastDeletedAtachment = attachment
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: progstr-filer
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.8.
|
4
|
+
version: 0.8.10
|
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: 2012-05-
|
12
|
+
date: 2012-05-21 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: activerecord
|
16
|
-
requirement: &
|
16
|
+
requirement: &26366140 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 3.0.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *26366140
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: activemodel
|
27
|
-
requirement: &
|
27
|
+
requirement: &26365420 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 3.0.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *26365420
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: actionpack
|
38
|
-
requirement: &
|
38
|
+
requirement: &26364340 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 3.0.0
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *26364340
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: uuid
|
49
|
-
requirement: &
|
49
|
+
requirement: &26363520 !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: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *26363520
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: rest-client
|
60
|
-
requirement: &
|
60
|
+
requirement: &26362840 !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: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *26362840
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: multi_json
|
71
|
-
requirement: &
|
71
|
+
requirement: &26362100 !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: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *26362100
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: sqlite3
|
82
|
-
requirement: &
|
82
|
+
requirement: &26361440 !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: *
|
90
|
+
version_requirements: *26361440
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: guard-test
|
93
|
-
requirement: &
|
93
|
+
requirement: &26360420 !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: *
|
101
|
+
version_requirements: *26360420
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: rb-inotify
|
104
|
-
requirement: &
|
104
|
+
requirement: &26359500 !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: *
|
112
|
+
version_requirements: *26359500
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: libnotify
|
115
|
-
requirement: &
|
115
|
+
requirement: &26358600 !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: *
|
123
|
+
version_requirements: *26358600
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: shoulda
|
126
|
-
requirement: &
|
126
|
+
requirement: &26357640 !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: *
|
134
|
+
version_requirements: *26357640
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: bundler
|
137
|
-
requirement: &
|
137
|
+
requirement: &26356560 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ! '>='
|
@@ -142,10 +142,10 @@ dependencies:
|
|
142
142
|
version: 1.0.0
|
143
143
|
type: :development
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *26356560
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: jeweler
|
148
|
-
requirement: &
|
148
|
+
requirement: &26354480 !ruby/object:Gem::Requirement
|
149
149
|
none: false
|
150
150
|
requirements:
|
151
151
|
- - ~>
|
@@ -153,10 +153,10 @@ dependencies:
|
|
153
153
|
version: 1.6.4
|
154
154
|
type: :development
|
155
155
|
prerelease: false
|
156
|
-
version_requirements: *
|
156
|
+
version_requirements: *26354480
|
157
157
|
- !ruby/object:Gem::Dependency
|
158
158
|
name: rdoc
|
159
|
-
requirement: &
|
159
|
+
requirement: &26353660 !ruby/object:Gem::Requirement
|
160
160
|
none: false
|
161
161
|
requirements:
|
162
162
|
- - ! '>='
|
@@ -164,7 +164,7 @@ dependencies:
|
|
164
164
|
version: '0'
|
165
165
|
type: :development
|
166
166
|
prerelease: false
|
167
|
-
version_requirements: *
|
167
|
+
version_requirements: *26353660
|
168
168
|
description: Progstr Filer is a developer-friendly file and attachment hosting service
|
169
169
|
that lets you easily build apps that store and share files.
|
170
170
|
email: hristo@deshev.com
|
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
217
217
|
version: '0'
|
218
218
|
segments:
|
219
219
|
- 0
|
220
|
-
hash:
|
220
|
+
hash: 654969669640343783
|
221
221
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
222
222
|
none: false
|
223
223
|
requirements:
|