spec/public/controller/controllers/streaming.rb spec/public/controller/streaming_spec.rb @@ -51,7 +51,7 @@ spec = Gem::Specification.new do |s| s.description = PROJECT_DESCRIPTION s.executables = %w( merb ) s.require_path = "lib" - s.files = %w( LICENSE README Rakefile TODO CHANGELOG PUBLIC_CHANGELOG CONTRIBUTORS ) + Dir["{bin,lib}/**/*"] + s.files = %w( LICENSE README Rakefile TODO CHANGELOG PUBLIC_CHANGELOG CONTRIBUTORS ) + Dir["{doc/rdoc,bin,lib}/**/*"] # use minigems by default # s.minigems = true Rakefile @@ -10,9 +10,9 @@ root = root.to_a.empty? ? Dir.getwd : root if File.directory?(gems_dir = File.join(root, 'gems')) $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir) # Warn if local merb-core is available but not loaded. - if !($0 =~ /^(\.\/)?bin\/merb$/) && + if File.expand_path($0).index(root) != 0 && (local_mc = Dir[File.join(gems_dir, 'specifications', 'merb-core-*.gemspec')].last) - puts "Warning: please use bin/merb to load #{File.basename(local_mc, '.gemspec')} from ./gems" + puts "Warning: please use bin/#{File.basename($0)} to load #{File.basename(local_mc, '.gemspec')} from ./gems" end end lib/merb-core.rb @@ -237,7 +237,11 @@ module Merb opts.on("-V", "--verbose", "Print extra information") do options[:verbose] = true end - + + opts.on("-C", "--console-trap", "Enter an irb console on ^C") do + options[:console_trap] = true + end + opts.on("-?", "-H", "--help", "Show this help message") do puts opts exit lib/merb-core/config.rb @@ -239,10 +239,30 @@ module Merb # from nginx. For more information, see the nginx wiki: # http://wiki.codemongers.com/NginxXSendfile # + # and the following sample gist: + # http://gist.github.com/11225 + # + # there's also example application up on GitHub: + # + # http://github.com/michaelklishin/nginx-x-accel-redirect-example-application/tree/master + # + # Unless Content-Disposition is set before calling this method, + # it is set to attachment with streamed file name. + # # ==== Parameters - # file<String>:: Path to file to send to the client. - def nginx_send_file(file) - headers['X-Accel-Redirect'] = file + # path<String>:: Path to file to send to the client. + # content_type<String>:: content type header value. By default is set to empty string to let + # Nginx detect it. + # + # ==== Return + # One space string. + def nginx_send_file(path, content_type = "") + # Let Nginx detect content type unless it is explicitly set + headers['Content-Type'] = content_type + headers["Content-Disposition"] ||= "attachment; filename=#{path.split('/').last}" + + headers['X-Accel-Redirect'] = path + return ' ' end lib/merb-core/controller/mixins/controller.rb @@ -46,7 +46,13 @@ module Merb end else trap('TERM') { exit } - trap('INT') { puts "\nExiting"; exit } + + if Merb::Config[:console_trap] + add_irb_trap + else + trap('INT') { puts "\nExiting"; exit } + end + puts "Running bootloaders..." if Merb::Config[:verbose] BootLoader.run puts "Starting Rack adapter..." if Merb::Config[:verbose] @@ -249,6 +255,30 @@ module Merb rescue Errno::EPERM => e puts "Couldn't change user and group to #{user}:#{group}: #{e}" end + + def add_irb_trap + trap('INT') do + exit if @interrupted + @interrupted = true + puts "Interrupt a second time to quit" + Kernel.sleep 1.5 + ARGV.clear # Avoid passing args to IRB + + if @irb.nil? + require 'irb' + IRB.setup(nil) + @irb = IRB::Irb.new(nil) + IRB.conf[:MAIN_CONTEXT] = @irb.context + end + + trap(:INT) { @irb.signal_handle } + catch(:IRB_EXIT) { @irb.eval_input } + + puts "Exiting IRB mode, back in server mode" + @interrupted = false + add_irb_trap + end + end end end end lib/merb-core/server.rb @@ -9,5 +9,6 @@ require File.join(__DIR__, "controllers", "authentication") require File.join(__DIR__, "controllers", "redirect") require File.join(__DIR__, "controllers", "cookies") require File.join(__DIR__, "controllers", "conditional_get") +require File.join(__DIR__, "controllers", "streaming") Merb.start :environment => 'test', :init_file => File.join(__DIR__, 'config', 'init') spec/public/controller/spec_helper.rb tools/allison-2.0.2/cache/BODY tools/allison-2.0.2/cache/CLASS_INDEX tools/allison-2.0.2/cache/CLASS_PAGE tools/allison-2.0.2/cache/FILE_INDEX tools/allison-2.0.2/cache/FILE_PAGE tools/allison-2.0.2/cache/FONTS tools/allison-2.0.2/cache/FR_INDEX_BODY tools/allison-2.0.2/cache/INDEX tools/allison-2.0.2/cache/JAVASCRIPT tools/allison-2.0.2/cache/METHOD_INDEX tools/allison-2.0.2/cache/METHOD_LIST tools/allison-2.0.2/cache/PROJECT tools/allison-2.0.2/cache/SRC_PAGE tools/allison-2.0.2/cache/STYLE f447f2bd7e7a408f279da7e9f47323e42a0b94e8 bc4ce1d748021893cd2ac1486529af534565d776 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/3d0d9f05b71cb0e442a72356a96cd74705938cdc 3d0d9f05b71cb0e442a72356a96cd74705938cdc 2008-09-18T07:46:55-07:00 2008-09-18T07:46:55-07:00 Merge branch 'master' into experiments 986f426495c885eab53ac4003e5bd63c700fe7a5 Fabien Franzen info@atelierfabien.be