unicorn 0.990.0 → 0.990.0.5.gbfb1

data/bin/unicorn_rails

@@ -109,13 +109,31 @@ end
 
 ru = ARGV[0] || (File.exist?('config.ru') ? 'config.ru' : nil)
 
+def rails_dispatcher
+  if ::Rails::VERSION::MAJOR >= 3 && ::File.exist?('config/application.rb')
+    if ::File.read('config/application.rb') =~ /^module\s+([\w:]+)\s*$/
+      app_module = Object.const_get($1)
+      begin
+        result = app_module::Application
+      rescue NameError
+      end
+    end
+  end
+
+  if result.nil? && defined?(ActionController::Dispatcher)
+    result = ActionController::Dispatcher.new
+  end
+
+  result || abort("Unable to locate the application dispatcher class")
+end
+
 def rails_builder(daemonize)
   # this lambda won't run until after forking if preload_app is false
   lambda do ||
     # Load Rails and (possibly) the private version of Rack it bundles.
     begin
-      require 'config/boot'
-      require 'config/environment'
+      require ::File.expand_path('config/boot')
+      require ::File.expand_path('config/environment')
     rescue LoadError => err
       abort "#$0 must be run inside RAILS_ROOT: #{err.inspect}"
     end
@@ -149,8 +167,12 @@ def rails_builder(daemonize)
         use Rails::Rack::LogTailer unless daemonize
         use Rails::Rack::Debugger if $DEBUG
         map(map_path) do
-          use Rails::Rack::Static
-          run ActionController::Dispatcher.new
+          if defined?(ActionDispatch::Static)
+            use ActionDispatch::Static, "#{Rails.root}/public"
+          else
+            use Rails::Rack::Static
+          end
+          run rails_dispatcher
         end
       end
     end.to_app

data/t/t0300-rails3-basic.sh

@@ -1,33 +1,5 @@
 #!/bin/sh
-RAILS_VERSION=${RAILS_VERSION-3.0.0.beta3}
-
-. ./test-lib.sh
-
-case $RUBY_VERSION in
-1.8.7|1.9.2) ;;
-*)
-	t_info "RUBY_VERSION=$RUBY_VERSION unsupported for Rails 3"
-	exit 0
-	;;
-esac
-
-arch_gems=../tmp/isolate/ruby-$RUBY_VERSION/gems
-rails_gems=../tmp/isolate/rails-$RAILS_VERSION/gems
-rails_bin="$rails_gems/rails-$RAILS_VERSION/bin/rails"
-if ! test -d "$arch_gems" || ! test -d "$rails_gems" || ! test -x "$rails_bin"
-then
-	( cd ../ && $RAKE isolate )
-fi
-
-for i in $arch_gems/*-* $rails_gems/*-*
-do
-	if test -d $i/lib
-	then
-		RUBYLIB=$(cd $i/lib && pwd):$RUBYLIB
-	fi
-done
-
-export RUBYLIB
+. ./test-rails3.sh
 
 t_plan 3 "Rails 3 (beta) tests"
 
@@ -40,7 +12,7 @@ t_begin "setup and start" && {
 	$RAKE db:sessions:create
 	$RAKE db:migrate
 	unicorn_setup
-	unicorn -D -c $unicorn_config
+	unicorn_rails -D -c $unicorn_config
 	unicorn_wait_start
 }
 

data/t/t0301-rails3-missing-config-ru.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+. ./test-rails3.sh
+
+t_plan 4 "Rails 3 (beta) tests for config.ru haters"
+
+t_begin "setup and start" && {
+	rails3_app=$(cd rails3-app && pwd)
+	rm -rf $t_pfx.app
+	mkdir $t_pfx.app
+	cd $t_pfx.app
+	( cd $rails3_app && tar cf - . ) | tar xf -
+	rm config.ru
+	$RAKE db:sessions:create
+	$RAKE db:migrate
+	unicorn_setup
+	unicorn_rails -D -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "static file serving works" && {
+	test x"$(curl -sSf http://$listen/x.txt)" = xHELLO
+}
+
+# add more tests here
+t_begin "hit with curl" && {
+	curl -v http://$listen/ || :
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_done

data/t/test-rails3.sh

@@ -0,0 +1,27 @@
+. ./test-lib.sh
+RAILS_VERSION=${RAILS_VERSION-3.0.0.beta3}
+case $RUBY_VERSION in
+1.8.7|1.9.2) ;;
+*)
+	t_info "RUBY_VERSION=$RUBY_VERSION unsupported for Rails 3"
+	exit 0
+	;;
+esac
+
+arch_gems=../tmp/isolate/ruby-$RUBY_VERSION/gems
+rails_gems=../tmp/isolate/rails-$RAILS_VERSION/gems
+rails_bin="$rails_gems/rails-$RAILS_VERSION/bin/rails"
+if ! test -d "$arch_gems" || ! test -d "$rails_gems" || ! test -x "$rails_bin"
+then
+	( cd ../ && $RAKE isolate )
+fi
+
+for i in $arch_gems/*-* $rails_gems/*-*
+do
+	if test -d $i/lib
+	then
+		RUBYLIB=$(cd $i/lib && pwd):$RUBYLIB
+	fi
+done
+
+export RUBYLIB

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.990.0
+  version: 0.990.0.5.gbfb1
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -188,7 +188,9 @@ files:
 - t/t0001-reload-bad-config.sh
 - t/t0002-config-conflict.sh
 - t/t0300-rails3-basic.sh
+- t/t0301-rails3-missing-config-ru.sh
 - t/test-lib.sh
+- t/test-rails3.sh
 - test/aggregate.rb
 - test/benchmark/README
 - test/benchmark/dd.ru
@@ -304,9 +306,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []