0
@@ -1,3 +1,7 @@
0
+== 0.8.2 ??? release
0
+ * Added Mack adapter [markbates]
0
+ * Allow rackup .rb files by getting a conventionally named constant as the app [bmizerany]
0
+
0
 == 0.8.1 Rebel Porpoise release
0
  * [bug] Rescue all types of errors when processing request, fixes #62
0
  * [bug] Use Swiftiply backend when -y option is specified, fixes #63 and #64

0
@@ -0,0 +1 @@
0
+Myapp = lambda { |env| [200, {}, 'this is my app!'] }
0
\ No newline at end of file

0
@@ -161,8 +161,16 @@ module Thin
0
         end
0
         
0
         def load_rackup_config
0
-          rackup_code = File.read(@options[:rackup])
0
-          eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, @options[:rackup])
0
+          case @options[:rackup]
0
+          when /\.rb$/
0
+            Kernel.load(@options[:rackup])
0
+            Object.const_get(File.basename(@options[:rackup], '.rb').capitalize.to_sym)
0
+          when /\.ru$/
0
+            rackup_code = File.read(@options[:rackup])
0
+            eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, @options[:rackup])
0
+          else
0
+            raise "Invalid rackup file.  please specify either a .ru or .rb file"
0
+          end
0
         end
0
     end
0
   end

0
@@ -63,11 +63,25 @@ describe Controller, 'start' do
0
   end
0
   
0
   it "should load app from Rack config" do
0
-    @controller.options[:rackup] = 'example/config.ru'    
0
+    @controller.options[:rackup] = File.dirname(__FILE__) + '/../../example/config.ru'    
0
     @controller.start
0
     
0
     @server.app.class.should == Proc
0
   end
0
+
0
+  it "should load app from ruby file" do
0
+    @controller.options[:rackup] = filename = File.dirname(__FILE__) + '/../../example/myapp.rb'    
0
+    @controller.start
0
+    
0
+    @server.app.should == Myapp
0
+  end
0
+
0
+  it "should throwup if rackup is not a .ru or .rb file" do
0
+    proc do
0
+      @controller.options[:rackup] = filename = File.dirname(__FILE__) + '/../../example/myapp.foo'    
0
+      @controller.start
0
+    end.should raise_error(RuntimeError, /please/)
0
+  end
0
   
0
   it "should set server as threaded" do
0
     @controller.options[:threaded] = true
0
@@ -75,6 +89,7 @@ describe Controller, 'start' do
0
     
0
     @server.threaded.should be_true
0
   end
0
+    
0
 end
0
 
0
 describe Controller do