@@ -1,4 +1,6 @@ == 0.8.0 Dodgy Dentist release + * List supported adapters in command usage. + * Add file adapter to built-in adapter, serve static files in current directory. * Allow disabling signal handling in Server with :signals => false * Make Server.new arguments more flexible, can now specify any of host, port, app or hash options. * Add --backend option to specified which backend to use, closes #55 CHANGELOG @@ -1,20 +1,27 @@ module Rack class AdapterNotFound < RuntimeError; end - - module Adapter + + # Hash used to guess which adapter to use in <tt>Adapter.for</tt>. + # Framework name => file unique to this framework. + # +nil+ for value to never guess. + ADAPTERS = { + :rails => "config/environment.rb", + :ramaze => "start.rb", + :merb => "config/init.rb", + :halcyon => 'runner.ru', + :file => nil + } + + module Adapter # Guess which adapter to use based on the directory structure # or file content. # Returns a symbol representing the name of the adapter to use # to load the application under <tt>dir/</tt>. def self.guess(dir) - case - when ::File.exist?("#{dir}/config/environment.rb") then :rails - when ::File.exist?("#{dir}/start.rb") then :ramaze - when ::File.exist?("#{dir}/config/init.rb") then :merb - when ::File.exist?("#{dir}/runner.ru") then :halcyon - else - raise AdapterNotFound, "No adapter found for #{dir}" + ADAPTERS.each_pair do |adapter, file| + return adapter if file && ::File.exist?(::File.join(dir, file)) end + raise AdapterNotFound, "No adapter found for #{dir}" end # Loads an adapter identified by +name+ using +options+ hash. @@ -50,6 +57,9 @@ module Rack return Halcyon::Runner.new + when :file + return Rack::File.new(options[:chdir]) + else raise AdapterNotFound, "Adapter not found: #{name}" lib/rack/adapter/loader.rb @@ -62,17 +62,16 @@ module Thin opts.on("-p", "--port PORT", "use PORT (default: #{@options[:port]})") { |port| @options[:port] = port.to_i } opts.on("-S", "--socket FILE", "bind to unix domain socket") { |file| @options[:socket] = file } opts.on("-y", "--swiftiply [KEY]", "Run using swiftiply") { |key| @options[:swiftiply] = key } - opts.on("-A", "--adapter NAME", "Rack adapter to use " + - "(default: auto-detected)") { |name| @options[:adapter] = name } - opts.on("-b", "--backend CLASS", "Backend to use, full classname") { |name| @options[:backend] = name } - opts.on("-c", "--chdir DIR", "Change to dir before starting") { |dir| @options[:chdir] = File.expand_path(dir) } + opts.on("-A", "--adapter NAME", "Rack adapter to use (default: autodetect)", + "(#{Rack::ADAPTERS.keys.join(', ')})") { |name| @options[:adapter] = name } opts.on("-r", "--rackup FILE", "Load a Rack config file instead of " + - "Rails adapter") { |file| @options[:rackup] = file } + "Rack adapter") { |file| @options[:rackup] = file } + opts.on("-c", "--chdir DIR", "Change to dir before starting") { |dir| @options[:chdir] = File.expand_path(dir) } opts.on( "--stats PATH", "Mount the Stats adapter under PATH") { |path| @options[:stats] = path } opts.separator "" - opts.separator "Rails options:" - opts.on("-e", "--environment ENV", "Rails environment " + + opts.separator "Adapter options:" + opts.on("-e", "--environment ENV", "Framework environment " + "(default: #{@options[:environment]})") { |env| @options[:environment] = env } opts.on( "--prefix PATH", "Mount the app under PATH (start with /)") { |path| @options[:prefix] = path } @@ -100,6 +99,7 @@ module Thin opts.separator "" opts.separator "Tuning options:" + opts.on("-b", "--backend CLASS", "Backend to use, full classname") { |name| @options[:backend] = name } opts.on("-t", "--timeout SEC", "Request or command timeout in sec " + "(default: #{@options[:timeout]})") { |sec| @options[:timeout] = sec.to_i } opts.on( "--max-conns NUM", "Maximum number of connections " + lib/thin/runner.rb @@ -9,7 +9,7 @@ describe Rack::Adapter do Rack::Adapter.guess(@rails_path).should == :rails end - it "should raise error when can't guess from dir" do + it "should return nil when can't guess from dir" do proc { Rack::Adapter.guess('.') }.should raise_error(Rack::AdapterNotFound) end @@ -18,6 +18,11 @@ describe Rack::Adapter do Rack::Adapter.for(:rails, :chdir => @rails_path) end + it "should load File adapter" do + Rack::File.should_receive(:new) + Rack::Adapter.for(:file) + end + it "should raise error when adapter can't be found" do proc { Rack::Adapter.for(:fart, {}) }.should raise_error(Rack::AdapterNotFound) end spec/rack/loader_spec.rb f3c09c3075e413c48e076a52ea0016a0250a53da macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/dc472b681619c0134db30e7d68b2edbfb1a02076 dc472b681619c0134db30e7d68b2edbfb1a02076 2008-04-05T11:52:25-07:00 2008-04-05T11:52:25-07:00 Refactor Rack loader. List supported adapters in command usage. Add file adapter to built-in adapter, serve static files in current directory. 9282fe22e4104fb25a5352343ca1817837669c0d macournoyer macournoyer@gmail.com