Precompile bookmarklet to use in production
`Rails.application.assets` is only available when `config.assets.compile` is true (which is false in production). So the old way with a separate rake task doesn't work in production. But we can get the filename of the precompiled file from `Rails.application.assets_manifest.assets`.
This commit is contained in:
parent
c42315f3ee
commit
7f8108e4ac
3 changed files with 18 additions and 15 deletions
|
|
@ -72,6 +72,7 @@ module Diaspora
|
||||||
jquery_ujs.js
|
jquery_ujs.js
|
||||||
main.js
|
main.js
|
||||||
jsxc.js
|
jsxc.js
|
||||||
|
bookmarklet.js
|
||||||
mobile/bookmarklet.js
|
mobile/bookmarklet.js
|
||||||
mobile/mobile.js
|
mobile/mobile.js
|
||||||
templates.js
|
templates.js
|
||||||
|
|
|
||||||
|
|
@ -2,27 +2,35 @@
|
||||||
class BookmarkletRenderer
|
class BookmarkletRenderer
|
||||||
class << self
|
class << self
|
||||||
def cached_name
|
def cached_name
|
||||||
@cached ||= Rails.root.join("public", "assets", "bookmarklet.js")
|
@cached_name ||= if Rails.application.config.assets.compile
|
||||||
|
"bookmarklet.js"
|
||||||
|
else
|
||||||
|
Rails.application.assets_manifest.assets["bookmarklet.js"]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def source_name
|
def cached_path
|
||||||
|
@cached_path ||= Rails.root.join("public", "assets", cached_name)
|
||||||
|
end
|
||||||
|
|
||||||
|
def source
|
||||||
@source ||= Rails.application.assets["bookmarklet.js"].pathname.to_s
|
@source ||= Rails.application.assets["bookmarklet.js"].pathname.to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
def body
|
def body
|
||||||
if !File.exist?(cached_name) && Rails.env.production?
|
unless File.exist?(cached_path) || Rails.application.config.assets.compile
|
||||||
raise "please run the Rake task to compile the bookmarklet: `bundle exec rake assets:uglify_bookmarklet`"
|
raise "Please run the rake task to compile the bookmarklet: `bin/rake assets:precompile`"
|
||||||
end
|
end
|
||||||
|
|
||||||
compile unless Rails.env.production? # don't make me re-run rake in development
|
compile if Rails.application.config.assets.compile
|
||||||
@body ||= File.read(cached_name)
|
@body ||= File.read(cached_path)
|
||||||
end
|
end
|
||||||
|
|
||||||
def compile
|
def compile
|
||||||
src = File.read(source_name)
|
src = File.read(source)
|
||||||
@body = Uglifier.compile(src)
|
@body = Uglifier.compile(src)
|
||||||
FileUtils.mkdir_p cached_name.dirname
|
FileUtils.mkdir_p cached_path.dirname
|
||||||
File.open(cached_name, "w") {|f| f.write(@body) }
|
File.open(cached_path, "w") {|f| f.write(@body) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,6 @@ namespace :assets do
|
||||||
renderer.render
|
renderer.render
|
||||||
end
|
end
|
||||||
|
|
||||||
desc "Uglify bookmarklet snippet"
|
|
||||||
task :uglify_bookmarklet => :environment do
|
|
||||||
BookmarkletRenderer.compile
|
|
||||||
end
|
|
||||||
|
|
||||||
desc "Create non digest assets"
|
desc "Create non digest assets"
|
||||||
task non_digest_assets: :environment do
|
task non_digest_assets: :environment do
|
||||||
logger = ::Logging::Logger["assets:non_digest_assets"]
|
logger = ::Logging::Logger["assets:non_digest_assets"]
|
||||||
|
|
@ -35,7 +30,6 @@ namespace :assets do
|
||||||
# Augment precompile with error page generation
|
# Augment precompile with error page generation
|
||||||
task :precompile do
|
task :precompile do
|
||||||
Rake::Task["assets:generate_error_pages"].invoke
|
Rake::Task["assets:generate_error_pages"].invoke
|
||||||
Rake::Task["assets:uglify_bookmarklet"].invoke
|
|
||||||
Rake::Task["assets:non_digest_assets"].invoke
|
Rake::Task["assets:non_digest_assets"].invoke
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue