Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
229394b5
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
229394b5
编写于
7月 23, 2017
作者:
D
David Heinemeier Hansson
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into explore-polymorphism
上级
a4f36f95
df698991
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
9 addition
and
9 deletion
+9
-9
app/controllers/active_storage/disk_controller.rb
app/controllers/active_storage/disk_controller.rb
+1
-1
app/models/active_storage/blob.rb
app/models/active_storage/blob.rb
+2
-2
app/models/active_storage/service/disk_service.rb
app/models/active_storage/service/disk_service.rb
+1
-1
app/models/active_storage/variation.rb
app/models/active_storage/variation.rb
+2
-2
test/controllers/disk_controller_test.rb
test/controllers/disk_controller_test.rb
+2
-2
test/models/blob_test.rb
test/models/blob_test.rb
+1
-1
未找到文件。
app/controllers/active_storage/disk_controller.rb
浏览文件 @
229394b5
...
...
@@ -24,7 +24,7 @@ def disk_service
end
def
decode_verified_key
ActiveStorage
.
verifier
.
verified
(
params
[
:encoded_key
])
ActiveStorage
.
verifier
.
verified
(
params
[
:encoded_key
]
,
purpose: :blob_key
)
end
def
disposition_param
...
...
app/models/active_storage/blob.rb
浏览文件 @
229394b5
...
...
@@ -15,7 +15,7 @@ class ActiveStorage::Blob < ActiveRecord::Base
class
<<
self
def
find_signed
(
id
)
find
ActiveStorage
.
verifier
.
verify
(
id
)
find
ActiveStorage
.
verifier
.
verify
(
id
,
purpose: :blob_id
)
end
def
build_after_upload
(
io
:,
filename
:,
content_type:
nil
,
metadata:
nil
)
...
...
@@ -39,7 +39,7 @@ def create_before_direct_upload!(filename:, byte_size:, checksum:, content_type:
def
signed_id
ActiveStorage
.
verifier
.
generate
(
id
)
ActiveStorage
.
verifier
.
generate
(
id
,
purpose: :blob_id
)
end
def
key
...
...
app/models/active_storage/service/disk_service.rb
浏览文件 @
229394b5
...
...
@@ -53,7 +53,7 @@ def exist?(key)
def
url
(
key
,
expires_in
:,
disposition
:,
filename
:)
instrument
:url
,
key
do
|
payload
|
verified_key_with_expiration
=
ActiveStorage
.
verifier
.
generate
(
key
,
expires_in:
expires_in
)
verified_key_with_expiration
=
ActiveStorage
.
verifier
.
generate
(
key
,
expires_in:
expires_in
,
purpose: :blob_key
)
generated_url
=
if
defined?
(
Rails
)
&&
defined?
(
Rails
.
application
)
...
...
app/models/active_storage/variation.rb
浏览文件 @
229394b5
...
...
@@ -6,11 +6,11 @@ class ActiveStorage::Variation
class
<<
self
def
decode
(
key
)
new
ActiveStorage
.
verifier
.
verify
(
key
)
new
ActiveStorage
.
verifier
.
verify
(
key
,
purpose: :variation
)
end
def
encode
(
transformations
)
ActiveStorage
.
verifier
.
generate
(
transformations
)
ActiveStorage
.
verifier
.
generate
(
transformations
,
purpose: :variation
)
end
end
...
...
test/controllers/disk_controller_test.rb
浏览文件 @
229394b5
...
...
@@ -11,13 +11,13 @@ class ActiveStorage::DiskControllerTest < ActionController::TestCase
end
test
"showing blob inline"
do
get
:show
,
params:
{
filename:
@blob
.
filename
,
encoded_key:
ActiveStorage
.
verifier
.
generate
(
@blob
.
key
,
expires_in:
5
.
minutes
)
}
get
:show
,
params:
{
filename:
@blob
.
filename
,
encoded_key:
ActiveStorage
.
verifier
.
generate
(
@blob
.
key
,
expires_in:
5
.
minutes
,
purpose: :blob_key
)
}
assert_equal
"inline; filename=
\"
#{
@blob
.
filename
}
\"
"
,
@response
.
headers
[
"Content-Disposition"
]
assert_equal
"text/plain"
,
@response
.
headers
[
"Content-Type"
]
end
test
"sending blob as attachment"
do
get
:show
,
params:
{
filename:
@blob
.
filename
,
encoded_key:
ActiveStorage
.
verifier
.
generate
(
@blob
.
key
,
expires_in:
5
.
minutes
),
disposition: :attachment
}
get
:show
,
params:
{
filename:
@blob
.
filename
,
encoded_key:
ActiveStorage
.
verifier
.
generate
(
@blob
.
key
,
expires_in:
5
.
minutes
,
purpose: :blob_key
),
disposition: :attachment
}
assert_equal
"attachment; filename=
\"
#{
@blob
.
filename
}
\"
"
,
@response
.
headers
[
"Content-Disposition"
]
assert_equal
"text/plain"
,
@response
.
headers
[
"Content-Type"
]
end
...
...
test/models/blob_test.rb
浏览文件 @
229394b5
...
...
@@ -35,6 +35,6 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase
private
def
expected_url_for
(
blob
,
disposition: :inline
)
"/rails/active_storage/disk/
#{
ActiveStorage
.
verifier
.
generate
(
blob
.
key
,
expires_in:
5
.
minutes
)
}
/
#{
blob
.
filename
}
?disposition=
#{
disposition
}
"
"/rails/active_storage/disk/
#{
ActiveStorage
.
verifier
.
generate
(
blob
.
key
,
expires_in:
5
.
minutes
,
purpose: :blob_key
)
}
/
#{
blob
.
filename
}
?disposition=
#{
disposition
}
"
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录