Skip to content
Extraits de code Groupes Projets
Non vérifiée Valider 7f8108e4 rédigé par Benjamin Neff's avatar Benjamin Neff
Parcourir les fichiers

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`.
parent c42315f3
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -72,6 +72,7 @@ module Diaspora
jquery_ujs.js
main.js
jsxc.js
bookmarklet.js
mobile/bookmarklet.js
mobile/mobile.js
templates.js
......
......@@ -2,27 +2,35 @@
class BookmarkletRenderer
class << self
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
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
end
def body
if !File.exist?(cached_name) && Rails.env.production?
raise "please run the Rake task to compile the bookmarklet: `bundle exec rake assets:uglify_bookmarklet`"
unless File.exist?(cached_path) || Rails.application.config.assets.compile
raise "Please run the rake task to compile the bookmarklet: `bin/rake assets:precompile`"
end
compile unless Rails.env.production? # don't make me re-run rake in development
@body ||= File.read(cached_name)
compile if Rails.application.config.assets.compile
@body ||= File.read(cached_path)
end
def compile
src = File.read(source_name)
src = File.read(source)
@body = Uglifier.compile(src)
FileUtils.mkdir_p cached_name.dirname
File.open(cached_name, "w") {|f| f.write(@body) }
FileUtils.mkdir_p cached_path.dirname
File.open(cached_path, "w") {|f| f.write(@body) }
end
end
end
......@@ -5,11 +5,6 @@ namespace :assets do
renderer.render
end
desc "Uglify bookmarklet snippet"
task :uglify_bookmarklet => :environment do
BookmarkletRenderer.compile
end
desc "Create non digest assets"
task non_digest_assets: :environment do
logger = ::Logging::Logger["assets:non_digest_assets"]
......@@ -35,7 +30,6 @@ namespace :assets do
# Augment precompile with error page generation
task :precompile do
Rake::Task["assets:generate_error_pages"].invoke
Rake::Task["assets:uglify_bookmarklet"].invoke
Rake::Task["assets:non_digest_assets"].invoke
end
end
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter