@@ -1,3 +1,3 @@ -v0.5.2. Fix for Safari Rendering. - -v0.5.1. Initial Release. \ No newline at end of file +* v0.5.3: Make asset installation automatic, fix sharing routing bug +* v0.5.2: Fix for Safari Rendering. +* v0.5.1: Initial Release. \ No newline at end of file CHANGELOG @@ -22,11 +22,7 @@ See http://blog.fiveruns.com/2008/10/11/fiveruns-tuneup-for-merb for the announc dependency 'fiveruns_tuneup_merb' -3. Run the following in your Merb.root: - - rake slices:fiveruns_tuneup_merb:install - -4. Add the following to your config/router.rb: +3. Add the following to your config/router.rb: slice FiverunsTuneupMerb README @@ -4,9 +4,7 @@ if defined?(Merb::Plugins) load_dependency 'merb-slices' load_dependency 'fiveruns_tuneup_core' - - Merb::Plugins.add_rakefiles "fiveruns_tuneup_merb/merbtasks" - + require File.dirname(__FILE__) / 'fiveruns_tuneup_merb' / 'instrumentation' require File.dirname(__FILE__) / 'fiveruns_tuneup_merb' / 'api_key' @@ -55,15 +53,16 @@ if defined?(Merb::Plugins) # Initialization hook - runs before AfterAppLoads BootLoader def self.init if Merb::Config[:adapter] != 'irb' - Merb.logger.info "Instrumenting with TuneUp" + Merb.logger.info "Instrumenting with FiveRuns TuneUp" ::Merb::Request.extend(FiverunsTuneupMerb::Instrumentation::Merb::Request) ::Merb::Controller.extend(FiverunsTuneupMerb::Instrumentation::Merb::Controller) if defined?(::DataMapper) ::DataMapper::Repository.extend(FiverunsTuneupMerb::Instrumentation::DataMapper::Repository) end log_share_status + copy_assets! else - Merb.logger.info "Not instrumenting with TuneUp (adapter is '#{Merb::Config[:adapter]}')" + Merb.logger.info "Not instrumenting with FiveRuns TuneUp (adapter is '#{Merb::Config[:adapter]}')" end end @@ -91,6 +90,12 @@ if defined?(Merb::Plugins) end end + def self.copy_assets! + Merb.logger.info "Automatically copying assets for FiveRuns TuneUp" + copied, preserved = mirror_public! + preserved.each { |f| Merb.logger.warn "! preserved override as #{f}" } + end + end # Setup the slice layout for FiverunsTuneupMerb lib/fiveruns_tuneup_merb.rb lib/fiveruns_tuneup_merb/merbtasks.rb 7f4ec3b6117a072ad9f0dca34e5b5f5bd3854f9b Bruce Williams bruce@codefluency.com http://github.com/fiveruns/fiveruns_tuneup_merb/commit/dabad5ecb12be8ff97bb4d2c3985e6b932688b79 dabad5ecb12be8ff97bb4d2c3985e6b932688b79 2008-11-08T07:28:02-08:00 2008-11-08T07:28:02-08:00 Make asset copying automatic 7680e2f92878910aca1102ae5ef0a3e5167e98a8 Bruce Williams bruce@codefluency.com