Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
62ff514d
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,发现更多精彩内容 >>
提交
62ff514d
编写于
10月 12, 2017
作者:
G
George Claghorn
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Accept variation keys in #preview and #variant
上级
445c682a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
7 deletion
+12
-7
activestorage/app/models/active_storage/blob.rb
activestorage/app/models/active_storage/blob.rb
+2
-2
activestorage/app/models/active_storage/variation.rb
activestorage/app/models/active_storage/variation.rb
+10
-5
未找到文件。
activestorage/app/models/active_storage/blob.rb
浏览文件 @
62ff514d
...
...
@@ -124,7 +124,7 @@ def text?
# This will create a URL for that specific blob with that specific variant, which the ActiveStorage::VariantsController
# can then produce on-demand.
def
variant
(
transformations
)
ActiveStorage
::
Variant
.
new
(
self
,
ActiveStorage
::
Variation
.
new
(
transformations
))
ActiveStorage
::
Variant
.
new
(
self
,
ActiveStorage
::
Variation
.
wrap
(
transformations
))
end
...
...
@@ -144,7 +144,7 @@ def variant(transformations)
# whether a blob is accepted by any previewer, call ActiveStorage::Blob#previewable?.
def
preview
(
transformations
)
if
previewable?
ActiveStorage
::
Preview
.
new
(
self
,
ActiveStorage
::
Variation
.
new
(
transformations
))
ActiveStorage
::
Preview
.
new
(
self
,
ActiveStorage
::
Variation
.
wrap
(
transformations
))
else
raise
UnpreviewableError
end
...
...
activestorage/app/models/active_storage/variation.rb
浏览文件 @
62ff514d
...
...
@@ -13,16 +13,21 @@ class ActiveStorage::Variation
attr_reader
:transformations
class
<<
self
def
wrap
(
variation_or_key
)
case
variation_or_key
# Returns a Variation instance based on the given variator. If the variator is a Variation, it is
# returned unmodified. If it is a String, it is passed to ActiveStorage::Variation.decode. Otherwise,
# it is assumed to be a transformations Hash and is passed directly to the constructor.
def
wrap
(
variator
)
case
variator
when
self
variation_or_key
variator
when
String
decode
variator
else
decode
variation_or_key
new
variator
end
end
# Returns a
v
ariation instance with the transformations that were encoded by +encode+.
# Returns a
V
ariation instance with the transformations that were encoded by +encode+.
def
decode
(
key
)
new
ActiveStorage
.
verifier
.
verify
(
key
,
purpose: :variation
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录