Merge branch 'master' of git://github.com/rails/rails

5 files changed, 223 insertions, 98 deletions

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index b9d8c002d7..959914bcea 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'isolation/abstract_unit'
 require 'active_support/core_ext/kernel/reporting'
 require 'rack/test'
@@ -37,7 +38,7 @@ module ApplicationTests
 
     test "assets do not require compressors until it is used" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
-      add_to_config "config.assets.compile = true"
+      app_file "config/initializers/compile.rb", "Rails.application.config.assets.compile = true"
 
       ENV["RAILS_ENV"] = "production"
       require "#{app_path}/config/environment"
@@ -64,6 +65,34 @@ module ApplicationTests
       end
     end
 
+    test "precompile application.js and application.css and all other files not ending with .js or .css by default" do
+      app_file "app/assets/javascripts/application.js", "alert();"
+      app_file "app/assets/stylesheets/application.css", "body{}"
+      app_file "app/assets/javascripts/something.min.js", "alert();"
+      app_file "app/assets/stylesheets/something.min.css", "body{}"
+
+      images_should_compile = ["a.png", "happyface.png", "happy_face.png", "happy.face.png",
+                               "happy-face.png", "happy.happy_face.png", "happy_happy.face.png", 
+                               "happy.happy.face.png", "happy", "happy.face", "-happyface",
+                               "-happy.png", "-happy.face.png", "_happyface", "_happy.face.png",
+                               "_happy.png"]
+      images_should_compile.each do |filename|
+        app_file "app/assets/images/#{filename}", "happy"
+      end
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      images_should_compile.each do |filename|
+        assert File.exists?("#{app_path}/public/assets/#{filename}")
+      end
+      assert File.exists?("#{app_path}/public/assets/application.js")
+      assert File.exists?("#{app_path}/public/assets/application.css")
+      assert !File.exists?("#{app_path}/public/assets/something.min.js")
+      assert !File.exists?("#{app_path}/public/assets/something.min.css")
+    end
+
     test "asset pipeline should use a Sprockets::Index when config.assets.digest is true" do
       add_to_config "config.assets.digest = true"
       add_to_config "config.action_controller.perform_caching = false"
@@ -147,6 +176,7 @@ module ApplicationTests
 
     test "assets do not require any assets group gem when manifest file is present" do
       app_file "app/assets/javascripts/application.js", "alert();"
+      app_file "config/initializers/serve_static_assets.rb", "Rails.application.config.serve_static_assets = true"
 
       ENV["RAILS_ENV"] = "production"
       capture(:stdout) do
@@ -240,6 +270,36 @@ module ApplicationTests
       assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file))
     end
 
+    test "precompile ignore asset_host" do
+      app_file "app/assets/javascripts/application.css.erb", "<%= asset_path 'rails.png' %>"
+      add_to_config "config.action_controller.asset_host = Proc.new { |source, request| 'http://www.example.com/' }"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      file = Dir["#{app_path}/public/assets/application.css"].first
+      content = File.read(file)
+      assert_match(/\/assets\/rails.png/, content)
+      assert_no_match(/www\.example\.com/, content)
+    end
+
+    test "precompile should handle utf8 filenames" do
+      app_file "app/assets/images/レイルズ.png", "not a image really"
+      add_to_config "config.assets.precompile = [ /\.png$$/, /application.(css|js)$/ ]"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+
+      assert File.exists?("#{app_path}/public/assets/レイルズ.png")
+
+      manifest = "#{app_path}/public/assets/manifest.yml"
+
+      assets = YAML.load_file(manifest)
+      assert_equal "レイルズ.png", assets["レイルズ.png"]
+    end
+
     test "assets are cleaned up properly" do
       app_file "public/assets/application.js", "alert();"
       app_file "public/assets/application.css", "a { color: green; }"
@@ -253,6 +313,17 @@ module ApplicationTests
       assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}"
     end
 
+    test "assets routes are not drawn when compilation is disabled" do
+      app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
+      add_to_config "config.assets.compile = false"
+
+      ENV["RAILS_ENV"] = "production"
+      require "#{app_path}/config/environment"
+
+      get "/assets/demo.js"
+      assert_equal 404, last_response.status
+    end
+
     test "does not stream session cookies back" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
 
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 0e03c3dc2d..c76bc3d526 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -1,3 +1,4 @@
+# coding:utf-8
 require "isolation/abstract_unit"
 
 module ApplicationTests
@@ -85,7 +86,7 @@ module ApplicationTests
       end
     end
 
-    def test_rake_routes_output_strips_anchors_from_http_verbs
+    def test_rake_routes_calls_the_route_inspector
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
           get '/cart', :to => 'cart#show'
@@ -94,99 +95,6 @@ module ApplicationTests
       assert_equal "cart GET /cart(.:format) cart#show\n", Dir.chdir(app_path){ `rake routes` }
     end
 
-    def test_rake_routes_shows_custom_assets
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          get '/custom/assets', :to => 'custom_assets#show'
-        end
-      RUBY
-      assert_equal "custom_assets GET /custom/assets(.:format) custom_assets#show\n",
-        Dir.chdir(app_path){ `rake routes` }
-    end
-
-    def test_rake_routes_shows_resources_route
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          resources :articles
-        end
-      RUBY
-      expected =
-        "    articles GET    /articles(.:format)          articles#index\n" <<
-        "             POST   /articles(.:format)          articles#create\n" <<
-        " new_article GET    /articles/new(.:format)      articles#new\n" <<
-        "edit_article GET    /articles/:id/edit(.:format) articles#edit\n" <<
-        "     article GET    /articles/:id(.:format)      articles#show\n" <<
-        "             PUT    /articles/:id(.:format)      articles#update\n" <<
-        "             DELETE /articles/:id(.:format)      articles#destroy\n"
-      assert_equal expected, Dir.chdir(app_path){ `rake routes` }
-    end
-
-    def test_rake_routes_shows_root_route
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          root :to => 'pages#main'
-        end
-      RUBY
-      assert_equal "root  / pages#main\n", Dir.chdir(app_path){ `rake routes` }
-    end
-
-    def test_rake_routes_shows_controller_and_action_only_route
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          match ':controller/:action'
-        end
-      RUBY
-      assert_equal "  /:controller/:action(.:format) \n", Dir.chdir(app_path){ `rake routes` }
-    end
-
-    def test_rake_routes_shows_controller_and_action_route_with_constraints
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          match ':controller(/:action(/:id))', :id => /\\d+/
-        end
-      RUBY
-      assert_equal "  /:controller(/:action(/:id))(.:format) {:id=>/\\d+/}\n", Dir.chdir(app_path){ `rake routes` }
-    end
-
-    def test_rake_routes_shows_route_with_defaults
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          match 'photos/:id' => 'photos#show', :defaults => {:format => 'jpg'}
-        end
-      RUBY
-      assert_equal %Q[  /photos/:id(.:format) photos#show {:format=>"jpg"}\n], Dir.chdir(app_path){ `rake routes` }
-    end
-
-    def test_rake_routes_shows_route_with_constraints
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          match 'photos/:id' => 'photos#show', :id => /[A-Z]\\d{5}/
-        end
-      RUBY
-      assert_equal "  /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}\n", Dir.chdir(app_path){ `rake routes` }
-    end
-
-    def test_rake_routes_shows_route_with_rack_app
-      app_file "lib/rack_app.rb", <<-RUBY
-        class RackApp
-          class << self
-            def call(env)
-            end
-          end
-        end
-      RUBY
-
-      app_file "config/routes.rb", <<-RUBY
-        require 'rack_app'
-
-        AppTemplate::Application.routes.draw do
-          match 'foo/:id' => RackApp, :id => /[A-Z]\\d{5}/
-        end
-      RUBY
-
-      assert_equal "  /foo/:id(.:format) RackApp {:id=>/[A-Z]\\d{5}/}\n", Dir.chdir(app_path){ `rake routes` }
-    end
-
     def test_logger_is_flushed_when_exiting_production_rake_tasks
       add_to_config <<-RUBY
         rake_tasks do
@@ -219,6 +127,55 @@ module ApplicationTests
       assert_match(/AddEmailToUsers: reverted/, output)
     end
 
+    def test_migration_status_when_schema_migrations_table_is_not_present
+      output = Dir.chdir(app_path){ `rake db:migrate:status` }
+      assert_equal "Schema migrations table does not exist yet.\n", output
+    end
+
+    def test_migration_status
+      Dir.chdir(app_path) do
+        `rails generate model user username:string password:string`
+        `rails generate migration add_email_to_users email:string`
+      end
+
+      Dir.chdir(app_path) { `rake db:migrate`}
+      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+      assert_match(/up\s+\d{14}\s+Create users/, output)
+      assert_match(/up\s+\d{14}\s+Add email to users/, output)
+
+      Dir.chdir(app_path) { `rake db:rollback STEP=1` }
+      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+      assert_match(/up\s+\d{14}\s+Create users/, output)
+      assert_match(/down\s+\d{14}\s+Add email to users/, output)
+    end
+
+    def test_migration_status_after_rollback_and_redo
+      Dir.chdir(app_path) do
+        `rails generate model user username:string password:string`
+        `rails generate migration add_email_to_users email:string`
+      end
+
+      Dir.chdir(app_path) { `rake db:migrate`}
+      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+      assert_match(/up\s+\d{14}\s+Create users/, output)
+      assert_match(/up\s+\d{14}\s+Add email to users/, output)
+
+      Dir.chdir(app_path) { `rake db:rollback STEP=2` }
+      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+      assert_match(/down\s+\d{14}\s+Create users/, output)
+      assert_match(/down\s+\d{14}\s+Add email to users/, output)
+
+      Dir.chdir(app_path) { `rake db:migrate:redo` }
+      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+      assert_match(/up\s+\d{14}\s+Create users/, output)
+      assert_match(/up\s+\d{14}\s+Add email to users/, output)
+    end
+
     def test_loading_specific_fixtures
       Dir.chdir(app_path) do
         `rails generate model user username:string password:string`
@@ -245,4 +202,4 @@ module ApplicationTests
       assert_match(/7 tests, 10 assertions, 0 failures, 0 errors/, content)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
new file mode 100644
index 0000000000..add8256b5d
--- /dev/null
+++ b/railties/test/application/route_inspect_test.rb
@@ -0,0 +1,97 @@
+require 'test/unit'
+require 'rails/application/route_inspector'
+require 'action_controller'
+
+module ApplicationTests
+  class RouteInspectTest < Test::Unit::TestCase
+    def setup
+      @set = ActionDispatch::Routing::RouteSet.new
+      @inspector = Rails::Application::RouteInspector.new
+    end
+
+    def test_cart_inspect
+      @set.draw do
+        get '/cart', :to => 'cart#show'
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["cart GET /cart(.:format) cart#show"], output
+    end
+
+    def test_inspect_shows_custom_assets
+      @set.draw do
+        get '/custom/assets', :to => 'custom_assets#show'
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["custom_assets GET /custom/assets(.:format) custom_assets#show"], output
+    end
+
+    def test_inspect_routes_shows_resources_route
+      @set.draw do
+        resources :articles
+      end
+      output = @inspector.format @set.routes
+      expected = [
+        "    articles GET    /articles(.:format)          articles#index",
+        "             POST   /articles(.:format)          articles#create",
+        " new_article GET    /articles/new(.:format)      articles#new",
+        "edit_article GET    /articles/:id/edit(.:format) articles#edit",
+        "     article GET    /articles/:id(.:format)      articles#show",
+        "             PUT    /articles/:id(.:format)      articles#update",
+        "             DELETE /articles/:id(.:format)      articles#destroy" ]
+      assert_equal expected, output
+    end
+
+    def test_inspect_routes_shows_root_route
+      @set.draw do
+        root :to => 'pages#main'
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["root  / pages#main"], output
+    end
+
+    def test_inspect_routes_shows_controller_and_action_only_route
+      @set.draw do
+        match ':controller/:action'
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["  /:controller/:action(.:format) "], output
+    end
+
+    def test_inspect_routes_shows_controller_and_action_route_with_constraints
+      @set.draw do
+        match ':controller(/:action(/:id))', :id => /\d+/
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["  /:controller(/:action(/:id))(.:format) {:id=>/\\d+/}"], output
+    end
+
+    def test_rake_routes_shows_route_with_defaults
+      @set.draw do
+        match 'photos/:id' => 'photos#show', :defaults => {:format => 'jpg'}
+      end
+      output = @inspector.format @set.routes
+      assert_equal [%Q[  /photos/:id(.:format) photos#show {:format=>"jpg"}]], output
+    end
+
+    def test_rake_routes_shows_route_with_constraints
+      @set.draw do
+        match 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["  /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}"], output
+    end
+
+    class RackApp
+      def self.call(env)
+      end
+    end
+
+    def test_rake_routes_shows_route_with_rack_app
+      @set.draw do
+        match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["  /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"], output
+    end
+  end
+end
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 685d1b154b..4a6bdb0320 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -282,7 +282,7 @@ Module.new do
     require_environment = "-r #{environment}"
   end
 
-  `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/bin/rails new #{tmp_path('app_template')}`
+  `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails new #{tmp_path('app_template')}`
   File.open("#{tmp_path}/app_template/config/boot.rb", 'w') do |f|
     if require_environment
       f.puts "Dir.chdir('#{File.dirname(environment)}') do"
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
index 1d4ba0e5b6..f8540d69d9 100644
--- a/railties/test/railties/generators_test.rb
+++ b/railties/test/railties/generators_test.rb
@@ -28,7 +28,7 @@ module RailtiesTests
       if File.exist?("#{environment}.rb")
         require_environment = "-r #{environment}"
       end
-      `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/bin/rails #{cmd}`
+      `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{cmd}`
     end
 
     def build_engine(is_mountable=false)