Skip to content

fix font related file mime type nil problem #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hothero wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix font related file mime type nil problem #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47e02e9
fix font related file mime type nil problem
hothero Feb 25, 2016
4a42923
all assets sync with cache control header
hothero Mar 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/asset_sync/multi_mime.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ def self.lookup(ext)
ext_with_dot = ".#{ext}"
Rack::Mime.mime_type(ext_with_dot)
else
::MIME::Types.type_for(ext).first
end
nil
end || ::MIME::Types.type_for(ext).first

end

Expand Down
11 changes: 3 additions & 8 deletions lib/asset_sync/storage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,11 @@ def upload_file(f)
:key => f,
:body => File.open("#{path}/#{f}"),
:public => true,
:content_type => mime
:content_type => mime,
:cache_control => "public, max-age=#{one_year}",
:expires => CGI.rfc1123_date(Time.now + one_year)
}

if /-[0-9a-fA-F]{32}$/.match(File.basename(f,File.extname(f)))
file.merge!({
:cache_control => "public, max-age=#{one_year}",
:expires => CGI.rfc1123_date(Time.now + one_year)
})
end

# overwrite headers if applicable, you probably shouldn't specific key/body, but cache-control headers etc.

if files_with_custom_headers.has_key? f
Expand Down