From 74598fe7e9097484c4029e2731e462c6c82836f9 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sat, 25 Sep 2010 19:02:14 +0200
Subject: Do not overwrite _railtie method on namespace while creating isolated
 engine or application.

In order to run Engine as standalone application, you will need
Rails::Application instance in the same namespace that engine
one. It's very important to leave _railtie bound to whatever
used "namespace" method first.
---
 railties/lib/rails/engine.rb | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 0620b8608e..ababf6a242 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -333,21 +333,22 @@ module Rails
       def namespace(mod)
         engine_name(generate_railtie_name(mod))
 
-        _railtie = self
         name = engine_name
-        mod.singleton_class.instance_eval do
-          define_method(:_railtie) do
-            _railtie
-          end
-
-          define_method(:table_name_prefix) do
-            "#{name}_"
-          end
-        end
-
         self.routes.default_scope = {:module => name}
-
         self.namespaced = true
+
+        unless mod.respond_to?(:_railtie)
+          _railtie = self
+          mod.singleton_class.instance_eval do
+            define_method(:_railtie) do
+              _railtie
+            end
+
+            define_method(:table_name_prefix) do
+              "#{name}_"
+            end
+         end
+        end
       end
 
       def namespaced?
-- 
cgit v1.2.3


From ec5d846ac6137e60d81257041e4fde82c0480b32 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sun, 26 Sep 2010 00:17:06 +0200
Subject: Properly reload routes defined in class definition

Sometimes it's easier to define routes inside Engine or
Application class definition (e.g. one file applications). The
problem with such case is that if there is a plugin that
has config/routes.rb file, it will trigger routes reload on application.
Since routes definition for application is not in config/routes.rb
file routes_reloader will fail to reload application's routes
properly. With this commit you can pass routes definition as a block
to routes method, which will allow to properly reload it:

class MyApp::Application < Rails::Application
  routes do
    resources :users
  end
end
---
 railties/lib/rails/application.rb | 21 ++++++++++++++++-----
 railties/lib/rails/engine.rb      |  7 ++++++-
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 0e85e6d1d5..2db131261c 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -85,13 +85,24 @@ module Rails
     end
 
     def reload_routes!
-      _routes = self.routes
-      _routes.disable_clear_and_finalize = true
-      _routes.clear!
+      routes_to_reload.each do |_routes, draw_block|
+        _routes = self.routes
+        _routes.disable_clear_and_finalize = true
+        _routes.clear!
+        _routes.draw(&draw_block) if draw_block
+      end
       routes_reloader.paths.each { |path| load(path) }
-      ActiveSupport.on_load(:action_controller) { _routes.finalize! }
+      routes_to_reload.each do |_routes, draw_block|
+        ActiveSupport.on_load(:action_controller) { _routes.finalize! }
+      end
     ensure
-      _routes.disable_clear_and_finalize = false
+      routes_to_reload.each do |_routes, draw_block|
+        _routes.disable_clear_and_finalize = false
+      end
+    end
+
+    def routes_to_reload
+      @routes_to_reload ||= {}
     end
 
     def initialize!
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index ababf6a242..aa82a82b19 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -399,8 +399,10 @@ module Rails
       }
     end
 
-    def routes
+    def routes(&block)
       @routes ||= ActionDispatch::Routing::RouteSet.new
+      self.routes_draw_block = block if block_given?
+      @routes
     end
 
     def initializers
@@ -447,6 +449,7 @@ module Rails
     end
 
     initializer :add_routing_paths do |app|
+      app.routes_to_reload[self.routes] = routes_draw_block
       paths.config.routes.to_a.each do |route|
         app.routes_reloader.paths.unshift(route) if File.exists?(route)
       end
@@ -499,6 +502,8 @@ module Rails
     end
 
   protected
+    attr_accessor :routes_draw_block
+
     def find_root_with_flag(flag, default=nil)
       root_path = self.class.called_from
 
-- 
cgit v1.2.3


From 57aa79e6bedeffcff899688546ef0a508948b4a5 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 28 Sep 2010 23:42:29 +0200
Subject: Move routes_reloader to a class: RoutesReloader

---
 railties/lib/rails/application.rb     | 24 ++--------------
 railties/lib/rails/engine.rb          |  2 +-
 railties/lib/rails/routes_reloader.rb | 54 +++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 23 deletions(-)
 create mode 100644 railties/lib/rails/routes_reloader.rb

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 2db131261c..8170be2f65 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/file_update_checker'
 require 'fileutils'
+require 'rails/routes_reloader'
 require 'rails/plugin'
 require 'rails/engine'
 
@@ -81,28 +82,7 @@ module Rails
     end
 
     def routes_reloader
-      @routes_reloader ||= ActiveSupport::FileUpdateChecker.new([]){ reload_routes! }
-    end
-
-    def reload_routes!
-      routes_to_reload.each do |_routes, draw_block|
-        _routes = self.routes
-        _routes.disable_clear_and_finalize = true
-        _routes.clear!
-        _routes.draw(&draw_block) if draw_block
-      end
-      routes_reloader.paths.each { |path| load(path) }
-      routes_to_reload.each do |_routes, draw_block|
-        ActiveSupport.on_load(:action_controller) { _routes.finalize! }
-      end
-    ensure
-      routes_to_reload.each do |_routes, draw_block|
-        _routes.disable_clear_and_finalize = false
-      end
-    end
-
-    def routes_to_reload
-      @routes_to_reload ||= {}
+      @routes_reloader ||= Rails::RoutesReloader.new
     end
 
     def initialize!
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index aa82a82b19..9ae235b818 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -449,7 +449,7 @@ module Rails
     end
 
     initializer :add_routing_paths do |app|
-      app.routes_to_reload[self.routes] = routes_draw_block
+      app.routes_reloader.blocks[routes] = routes_draw_block
       paths.config.routes.to_a.each do |route|
         app.routes_reloader.paths.unshift(route) if File.exists?(route)
       end
diff --git a/railties/lib/rails/routes_reloader.rb b/railties/lib/rails/routes_reloader.rb
new file mode 100644
index 0000000000..9cfc38630d
--- /dev/null
+++ b/railties/lib/rails/routes_reloader.rb
@@ -0,0 +1,54 @@
+module Rails
+  class RoutesReloader < ::ActiveSupport::FileUpdateChecker
+    def initialize
+      super([]) { reload! }
+    end
+
+    def blocks
+      @blocks ||= {}
+    end
+  private
+    def reload!
+      clear!
+      load_blocks
+      load_paths
+      finalize!
+    ensure
+      revert
+    end
+
+    def clear!
+      routers.each do |routes|
+        routes.disable_clear_and_finalize = true
+        routes.clear!
+      end
+    end
+
+    def load_blocks
+      blocks.each do |routes, block|
+        routes.draw(&block) if block
+      end
+    end
+
+    def load_paths
+        paths.each { |path| load(path) }
+    end
+
+    def finalize!
+      routers.each do |routes|
+        ActiveSupport.on_load(:action_controller) { routes.finalize! }
+      end
+    end
+
+    def revert
+      routers.each do |routes|
+        routes.disable_clear_and_finalize = false
+      end
+    end
+
+    def routers
+      blocks.keys
+    end
+  end
+end
+
-- 
cgit v1.2.3


From f851352318c7468db310e5fbea0d86dc8b731c6d Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 29 Sep 2010 17:41:30 +0200
Subject: Added config.app_generators to allow configuring application's
 generators from railties.

With config.generators becomes a way to configure generators
for current instance only. For example:

module Blog
  class Engine < Rails::Engine
    config.generators do |g|
      g.orm :active_record
    end

    config.app_generators do |g|
      g.test_framework :rspec
    end
  end
end

such definition sets :active_record as orm for engine and :rspec
as test_framework for application. The values set with app_generators
can be overwritten in application using config.generators as you would
normally do:

module MyApp
  class Application < Rails::Application
    config.generators do |g|
      g.test_framework :test_unit
    end
  end
end
---
 railties/lib/rails/application/configuration.rb |  1 +
 railties/lib/rails/railtie/configuration.rb     | 19 ++++++++++++++++---
 railties/lib/rails/test_unit/railtie.rb         |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a0ecbc0fc8..f902c3ded2 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -24,6 +24,7 @@ module Rails
         @time_zone = "UTC"
         @middleware = app_middleware
         @asset_path = '/'
+        @generators = app_generators
       end
 
       def asset_path=(value)
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index f09e3940cc..e0e4324a4a 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -17,6 +17,19 @@ module Rails
         @@app_middleware ||= Rails::Configuration::MiddlewareStackProxy.new
       end
 
+      # This allows you to modify application's generators from Railties.
+      #
+      # Values set on app_generators will become defaults for applicaiton, unless
+      # application overwrites them.
+      def app_generators
+        @@app_generators ||= Rails::Configuration::Generators.new
+        if block_given?
+          yield @@app_generators
+        else
+          @@app_generators
+        end
+      end
+
       # Holds generators configuration:
       #
       #   config.generators do |g|
@@ -30,11 +43,11 @@ module Rails
       #   config.generators.colorize_logging = false
       #
       def generators
-        @@generators ||= Rails::Configuration::Generators.new
+        @generators ||= Rails::Configuration::Generators.new
         if block_given?
-          yield @@generators
+          yield @generators
         else
-          @@generators
+          @generators
         end
       end
 
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
index e3fafc4b9d..2b6170ebfb 100644
--- a/railties/lib/rails/test_unit/railtie.rb
+++ b/railties/lib/rails/test_unit/railtie.rb
@@ -1,6 +1,6 @@
 module Rails
   class TestUnitRailtie < Rails::Railtie
-    config.generators do |c|
+    config.app_generators do |c|
       c.test_framework :test_unit, :fixture => true,
                                    :fixture_replacement => nil
 
-- 
cgit v1.2.3


From 6648babdedb8cb9494dec69d2f7efac3da1d239c Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 29 Sep 2010 17:46:59 +0200
Subject: Allow running generators for Engine with usage of other application.

After that commit, developers can set ENGINE_PATH in ENGINE/scripts/rails
file and load application's ./script/rails (most of the time it will be
dummy application used for testing). When running ./script/rails g it will
use application to boot up, but then it will use Engine's root and
configuration for generators.
---
 railties/lib/rails/commands.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 60a93c9848..acabdcac93 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -11,7 +11,17 @@ command = ARGV.shift
 command = aliases[command] || command
 
 case command
-when 'generate', 'destroy', 'plugin', 'benchmarker', 'profiler'
+when 'generate', 'destroy', 'plugin'
+  require APP_PATH
+  Rails.application.require_environment!
+
+  if defined?(ENGINE_PATH)
+    engine = Rails.application.railties.engines.find { |r| r.root.to_s == ENGINE_PATH }
+    Rails.application = engine
+  end
+  require "rails/commands/#{command}"
+
+when 'benchmarker', 'profiler'
   require APP_PATH
   Rails.application.require_environment!
   require "rails/commands/#{command}"
-- 
cgit v1.2.3


From 3049e645e5037cd923d0bad3c41c105dd9d791f8 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 29 Sep 2010 20:05:34 +0200
Subject: Moved Rails::RoutesReloader to Rails::Application::RoutesReloader

---
 railties/lib/rails/application.rb                 |  4 +-
 railties/lib/rails/application/routes_reloader.rb | 55 +++++++++++++++++++++++
 railties/lib/rails/routes_reloader.rb             | 54 ----------------------
 3 files changed, 57 insertions(+), 56 deletions(-)
 create mode 100644 railties/lib/rails/application/routes_reloader.rb
 delete mode 100644 railties/lib/rails/routes_reloader.rb

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 8170be2f65..aafbbc29ee 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,7 +1,6 @@
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/file_update_checker'
 require 'fileutils'
-require 'rails/routes_reloader'
 require 'rails/plugin'
 require 'rails/engine'
 
@@ -40,6 +39,7 @@ module Rails
     autoload :Configuration,  'rails/application/configuration'
     autoload :Finisher,       'rails/application/finisher'
     autoload :Railties,       'rails/application/railties'
+    autoload :RoutesReloader, 'rails/application/routes_reloader'
 
     class << self
       def inherited(base)
@@ -82,7 +82,7 @@ module Rails
     end
 
     def routes_reloader
-      @routes_reloader ||= Rails::RoutesReloader.new
+      @routes_reloader ||= RoutesReloader.new
     end
 
     def initialize!
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
new file mode 100644
index 0000000000..23b72a0ec6
--- /dev/null
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -0,0 +1,55 @@
+module Rails
+  class Application
+    class RoutesReloader < ::ActiveSupport::FileUpdateChecker
+      def initialize
+        super([]) { reload! }
+      end
+
+      def blocks
+        @blocks ||= {}
+      end
+    private
+      def reload!
+        clear!
+        load_blocks
+        load_paths
+        finalize!
+      ensure
+        revert
+      end
+
+      def clear!
+        routers.each do |routes|
+          routes.disable_clear_and_finalize = true
+          routes.clear!
+        end
+      end
+
+      def load_blocks
+        blocks.each do |routes, block|
+          routes.draw(&block) if block
+        end
+      end
+
+      def load_paths
+          paths.each { |path| load(path) }
+      end
+
+      def finalize!
+        routers.each do |routes|
+          ActiveSupport.on_load(:action_controller) { routes.finalize! }
+        end
+      end
+
+      def revert
+        routers.each do |routes|
+          routes.disable_clear_and_finalize = false
+        end
+      end
+
+      def routers
+        blocks.keys
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/routes_reloader.rb b/railties/lib/rails/routes_reloader.rb
deleted file mode 100644
index 9cfc38630d..0000000000
--- a/railties/lib/rails/routes_reloader.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-module Rails
-  class RoutesReloader < ::ActiveSupport::FileUpdateChecker
-    def initialize
-      super([]) { reload! }
-    end
-
-    def blocks
-      @blocks ||= {}
-    end
-  private
-    def reload!
-      clear!
-      load_blocks
-      load_paths
-      finalize!
-    ensure
-      revert
-    end
-
-    def clear!
-      routers.each do |routes|
-        routes.disable_clear_and_finalize = true
-        routes.clear!
-      end
-    end
-
-    def load_blocks
-      blocks.each do |routes, block|
-        routes.draw(&block) if block
-      end
-    end
-
-    def load_paths
-        paths.each { |path| load(path) }
-    end
-
-    def finalize!
-      routers.each do |routes|
-        ActiveSupport.on_load(:action_controller) { routes.finalize! }
-      end
-    end
-
-    def revert
-      routers.each do |routes|
-        routes.disable_clear_and_finalize = false
-      end
-    end
-
-    def routers
-      blocks.keys
-    end
-  end
-end
-
-- 
cgit v1.2.3


From 9f569c60adb3505cd7ca1723481199bf26619038 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 29 Sep 2010 22:31:58 +0200
Subject: Try to guess application's directory while trying to run the server,
 but only if config.ru is not present in current dir

---
 railties/lib/rails/commands.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index acabdcac93..60b9a55d80 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -33,8 +33,13 @@ when 'console'
   Rails::Console.start(Rails.application)
 
 when 'server'
+  # try to guess application's path if there is no config.ru file in current dir
+  # it allows to run script/rails server from other directories
+  Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path("config.ru"))
+
   require 'rails/commands/server'
   Rails::Server.new.tap { |server|
+    # we need to require application after the server sets environment
     require APP_PATH
     Dir.chdir(Rails.application.root)
     server.start
-- 
cgit v1.2.3


From 6b248f6ea56b318d39b8c28b2a9f69a7d420f1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 30 Sep 2010 10:33:31 +0200
Subject: Add more information to comments.

---
 railties/lib/rails/commands.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 60b9a55d80..e3aa6d7c3e 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -33,13 +33,15 @@ when 'console'
   Rails::Console.start(Rails.application)
 
 when 'server'
-  # try to guess application's path if there is no config.ru file in current dir
-  # it allows to run script/rails server from other directories
+  # Change to the application's path if there is no config.ru file in current dir.
+  # This allows us to run script/rails server from other directories, but still get
+  # the main config.ru and properly set the tmp directory.
   Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path("config.ru"))
 
   require 'rails/commands/server'
   Rails::Server.new.tap { |server|
-    # we need to require application after the server sets environment
+    # We need to require application after the server sets environment,
+    # otherwise the --environment option given to the server won't propagate.
     require APP_PATH
     Dir.chdir(Rails.application.root)
     server.start
-- 
cgit v1.2.3


From 33733d5d1de0eae6e25ee3f28aa69727f782086c Mon Sep 17 00:00:00 2001
From: Neeraj Singh <neerajdotname@gmail.com>
Date: Thu, 30 Sep 2010 22:40:59 +0800
Subject: no need to check for nil

---
 railties/lib/rails/commands/plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index 7bb4a1c054..8b2cd1bdba 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -58,7 +58,7 @@ class RailsEnvironment
     else
       plugin = name_uri_or_plugin
     end
-    unless plugin.nil?
+    if plugin
       plugin.install
     else
       puts "Plugin not found: #{name_uri_or_plugin}"
-- 
cgit v1.2.3


From 542ddd8c891e27278cdac26763b6ff8aadbfdf68 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 1 Oct 2010 23:16:05 +0200
Subject: brings csrf_meta_tags back to the generated layout

After more discussion, it has be agreed that this kind
of changes within reasonable margins are OK for 3.1.
That is, it is fine to change a little bit the generators
even if that means examples in existing books won't be
exact. (Note that the singular csrf_meta_tag exists as an
alias and thus those outdated examples will run, same for
existing applications.)
---
 .../rails/app/templates/app/views/layouts/application.html.erb.tt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
index 1dd112b4a6..1de78eecae 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -4,7 +4,7 @@
   <title><%= app_const_base %></title>
   <%%= stylesheet_link_tag :all %>
   <%%= javascript_include_tag :defaults %>
-  <%%= csrf_meta_tag %>
+  <%%= csrf_meta_tags %>
 </head>
 <body>
 
-- 
cgit v1.2.3


From 7b0c592e38e4b1d370e04d856d245f825dfa9cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 2 Oct 2010 17:45:26 +0200
Subject: reload_routes! is part of the public API and should not be removed.

---
 railties/lib/rails/application.rb                 | 4 ++++
 railties/lib/rails/application/routes_reloader.rb | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index aafbbc29ee..4d04184b20 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -81,6 +81,10 @@ module Rails
       super
     end
 
+    def reload_routes!
+      routes_reloader.reload!
+    end
+
     def routes_reloader
       @routes_reloader ||= RoutesReloader.new
     end
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
index 23b72a0ec6..6da903c1ac 100644
--- a/railties/lib/rails/application/routes_reloader.rb
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -8,7 +8,7 @@ module Rails
       def blocks
         @blocks ||= {}
       end
-    private
+
       def reload!
         clear!
         load_blocks
@@ -18,6 +18,8 @@ module Rails
         revert
       end
 
+    protected
+
       def clear!
         routers.each do |routes|
           routes.disable_clear_and_finalize = true
@@ -32,7 +34,7 @@ module Rails
       end
 
       def load_paths
-          paths.each { |path| load(path) }
+        paths.each { |path| load(path) }
       end
 
       def finalize!
-- 
cgit v1.2.3


From 04cbabb0a0206553d7b474ee7a191d19957048fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 2 Oct 2010 18:38:23 +0200
Subject: Deprecate generators in Railties. You should use app_generators
 instead.

---
 railties/lib/rails/engine/configuration.rb  | 28 ++++++++++++++++++++++---
 railties/lib/rails/railtie.rb               |  2 +-
 railties/lib/rails/railtie/configuration.rb | 32 ++++++-----------------------
 3 files changed, 32 insertions(+), 30 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index d4d87be527..b69c0e1c53 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -4,16 +4,38 @@ module Rails
   class Engine
     class Configuration < ::Rails::Railtie::Configuration
       attr_reader :root
-      attr_writer :eager_load_paths, :autoload_once_paths, :autoload_paths
-      attr_accessor :middleware, :plugins, :asset_path
+      attr_writer :middleware, :eager_load_paths, :autoload_once_paths, :autoload_paths
+      attr_accessor :plugins, :asset_path
 
       def initialize(root=nil)
         super()
         @root = root
-        @middleware = Rails::Configuration::MiddlewareStackProxy.new
         @helpers_paths = []
       end
 
+      # Returns the middleware stack for the engine.
+      def middleware
+        @middleware ||= Rails::Configuration::MiddlewareStackProxy.new
+      end
+
+      # Holds generators configuration:
+      #
+      #   config.generators do |g|
+      #     g.orm             :datamapper, :migration => true
+      #     g.template_engine :haml
+      #     g.test_framework  :rspec
+      #   end
+      #
+      # If you want to disable color in console, do:
+      #
+      #   config.generators.colorize_logging = false
+      #
+      def generators #:nodoc
+        @generators ||= Rails::Configuration::Generators.new
+        yield(@generators) if block_given?
+        @generators
+      end
+
       def paths
         @paths ||= begin
           paths = Rails::Paths::Root.new(@root)
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 09650789ac..2b68a3c453 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -83,7 +83,7 @@ module Rails
   #
   #   class MyRailtie < Rails::Railtie
   #     # Customize the ORM
-  #     config.generators.orm :my_railtie_orm
+  #     config.app_generators.orm :my_railtie_orm
   #
   #     # Add a to_prepare block which is executed once in production
   #     # and before each request in development
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index e0e4324a4a..3d0af185a2 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -5,7 +5,6 @@ module Rails
     class Configuration
       def initialize
         @@options ||= {}
-        @@static_asset_paths = ActiveSupport::OrderedHash.new
       end
 
       # This allows you to modify the application's middlewares from Engines.
@@ -23,32 +22,13 @@ module Rails
       # application overwrites them.
       def app_generators
         @@app_generators ||= Rails::Configuration::Generators.new
-        if block_given?
-          yield @@app_generators
-        else
-          @@app_generators
-        end
+        yield(@@app_generators) if block_given?
+        @@app_generators
       end
 
-      # Holds generators configuration:
-      #
-      #   config.generators do |g|
-      #     g.orm             :datamapper, :migration => true
-      #     g.template_engine :haml
-      #     g.test_framework  :rspec
-      #   end
-      #
-      # If you want to disable color in console, do:
-      #
-      #   config.generators.colorize_logging = false
-      #
-      def generators
-        @generators ||= Rails::Configuration::Generators.new
-        if block_given?
-          yield @generators
-        else
-          @generators
-        end
+      def generators(&block) #:nodoc
+        ActiveSupport::Deprecation.warn "config.generators is deprecated. Please use config.app_generators instead."
+        app_generators(&block)
       end
 
       def before_configuration(&block)
@@ -83,7 +63,7 @@ module Rails
       # with associated public folders, like:
       # { "/" => "/app/public", "/my_engine" => "app/engines/my_engine/public" }
       def static_asset_paths
-        @@static_asset_paths
+        @@static_asset_paths ||= ActiveSupport::OrderedHash.new
       end
 
     private
-- 
cgit v1.2.3


From 49cc01002e82208596439bb94d04805b85b75d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 2 Oct 2010 09:40:54 -0700
Subject: Be more explicit about what is deprecated.

---
 railties/lib/rails/railtie/configuration.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index 3d0af185a2..afeceafb67 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -27,7 +27,7 @@ module Rails
       end
 
       def generators(&block) #:nodoc
-        ActiveSupport::Deprecation.warn "config.generators is deprecated. Please use config.app_generators instead."
+        ActiveSupport::Deprecation.warn "config.generators in Rails::Railtie is deprecated. Please use config.app_generators instead."
         app_generators(&block)
       end
 
-- 
cgit v1.2.3


From 74dd8a3681c6984ea35c879f88c6a87521b58ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 22 Sep 2010 21:40:14 +0200
Subject: Move ETag and ConditionalGet logic from AD::Response to the
 middleware stack.

---
 railties/lib/rails/application.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 4d04184b20..075e3c5692 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -145,8 +145,8 @@ module Rails
         rack_cache = config.action_controller.perform_caching && config.action_dispatch.rack_cache
 
         require "action_dispatch/http/rack_cache" if rack_cache
+        middleware.use ::Rack::Cache, rack_cache  if rack_cache
 
-        middleware.use ::Rack::Cache, rack_cache if rack_cache
         middleware.use ::ActionDispatch::Static, config.static_asset_paths if config.serve_static_assets
         middleware.use ::Rack::Lock if !config.allow_concurrency
         middleware.use ::Rack::Runtime
@@ -165,6 +165,8 @@ module Rails
         middleware.use ::ActionDispatch::ParamsParser
         middleware.use ::Rack::MethodOverride
         middleware.use ::ActionDispatch::Head
+        middleware.use ::Rack::ConditionalGet
+        middleware.use ::Rack::ETag, "no-cache"
         middleware.use ::ActionDispatch::BestStandardsSupport, config.action_dispatch.best_standards_support if config.action_dispatch.best_standards_support
       end
     end
-- 
cgit v1.2.3


From adfd43a4daf08cc9a801a0b6a039dd109ce4e81f Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 30 Sep 2010 19:17:36 +0200
Subject: Add documentation on app_generators

---
 railties/lib/rails/engine.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 9ae235b818..ba89bce928 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -47,6 +47,26 @@ module Rails
   #     end
   #   end
   #
+  # == Generators
+  #
+  # You can set up generators for engine with config.generators method:
+  #
+  #   class MyEngine < Rails::Engine
+  #     config.generators do |g|
+  #       g.orm             :active_record
+  #       g.template_engine :erb
+  #       g.test_framework  :test_unit
+  #     end
+  #   end
+  #
+  # You can also set generators for application by using config.app_generators:
+  #
+  #   class MyEngine < Rails::Engine
+  #     # note that you can also pass block to app_generators in the same way you
+  #     # can pass it to generators method
+  #     config.app_generators.orm :datamapper
+  #   end
+  #
   # == Paths
   #
   # Since Rails 3.0, both your Application and Engines do not have hardcoded paths.
-- 
cgit v1.2.3


From 848e48ec9c20b6de15768c7bc33a5c54b242afac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 4 Oct 2010 18:08:03 +0200
Subject: Link to rack from github for this while.

---
 railties/lib/rails/generators/rails/app/templates/Gemfile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 1dbf27d978..40213b1261 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -3,15 +3,18 @@ source 'http://rubygems.org'
 <%- if options.dev? -%>
 gem 'rails', :path => '<%= Rails::Generators::RAILS_DEV_PATH %>'
 gem 'arel',  :git => 'git://github.com/rails/arel.git'
+gem "rack", :git => "git://github.com/rack/rack.git"
 <%- elsif options.edge? -%>
 gem 'rails', :git => 'git://github.com/rails/rails.git'
 gem 'arel',  :git => 'git://github.com/rails/arel.git'
+gem "rack", :git => "git://github.com/rack/rack.git"
 <%- else -%>
 gem 'rails', '<%= Rails::VERSION::STRING %>'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 # gem 'arel',  :git => 'git://github.com/rails/arel.git'
+# gem "rack", :git => "git://github.com/rack/rack.git"
 <%- end -%>
 
 <% unless options[:skip_active_record] -%>
-- 
cgit v1.2.3


From 4a4ff148ff85a148b5313dcc429e21b2d32057d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 5 Oct 2010 09:48:32 +0200
Subject: Use RbConfig instead of Config for 1.9.3 compatibility.

---
 railties/lib/rails/engine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index ba89bce928..3981e8dfd5 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -535,7 +535,7 @@ module Rails
       root = File.exist?("#{root_path}/#{flag}") ? root_path : default
       raise "Could not find root path for #{self}" unless root
 
-      Config::CONFIG['host_os'] =~ /mswin|mingw/ ?
+      RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ?
         Pathname.new(root).expand_path : Pathname.new(root).realpath
     end
 
-- 
cgit v1.2.3


From 6774e12afa0f29442aa612ddf6e51d5a1b7a4356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 6 Oct 2010 11:07:09 +0200
Subject: Clean up the builder abstraction in AppGenerator.

This commit may be reverted once documentation and a proper way to handle actions are added.
---
 .../rails/generators/rails/app/app_generator.rb    | 247 +++++----------------
 1 file changed, 54 insertions(+), 193 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 2715483914..be09698787 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -6,152 +6,12 @@ require 'open-uri'
 require 'uri'
 
 module Rails
-  module ActionMethods
-    attr_reader :options
-
-    def initialize(generator)
-      @generator = generator
-      @options   = generator.options
-    end
-
-    private
-      %w(template copy_file directory empty_directory inside
-         empty_directory_with_gitkeep create_file chmod shebang).each do |method|
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{method}(*args, &block)
-            @generator.send(:#{method}, *args, &block)
-          end
-        RUBY
-      end
-
-      # TODO: Remove once this is fully in place
-      def method_missing(meth, *args, &block)
-        STDERR.puts "Calling #{meth} with #{args.inspect} with #{block}"
-        @generator.send(meth, *args, &block)
-      end
-  end
-
-  class AppBuilder
-    def rakefile
-      template "Rakefile"
-    end
-
-    def readme
-      copy_file "README"
-    end
-
-    def gemfile
-      template "Gemfile"
-    end
-
-    def configru
-      template "config.ru"
-    end
-
-    def gitignore
-      copy_file "gitignore", ".gitignore"
-    end
-
-    def app
-      directory 'app'
-    end
-
-    def config
-      empty_directory "config"
-
-      inside "config" do
-        template "routes.rb"
-        template "application.rb"
-        template "environment.rb"
-
-        directory "environments"
-        directory "initializers"
-        directory "locales"
-      end
-    end
-
-    def database_yml
-      template "config/databases/#{@options[:database]}.yml", "config/database.yml"
-    end
-
-    def db
-      directory "db"
-    end
-
-    def doc
-      directory "doc"
-    end
-
-    def lib
-      empty_directory "lib"
-      empty_directory_with_gitkeep "lib/tasks"
-    end
-
-    def log
-      empty_directory "log"
-
-      inside "log" do
-        %w( server production development test ).each do |file|
-          create_file "#{file}.log"
-          chmod "#{file}.log", 0666, :verbose => false
-        end
-      end
-    end
-
-    def public_directory
-      directory "public", "public", :recursive => false
-    end
-
-    def images
-      directory "public/images"
-    end
-
-    def stylesheets
-      empty_directory_with_gitkeep "public/stylesheets"
-    end
-
-    def javascripts
-      unless options[:skip_prototype]
-        directory "public/javascripts"
-      else
-        empty_directory_with_gitkeep "public/javascripts"
-        create_file "public/javascripts/application.js"
-      end
-    end
-
-    def script
-      directory "script" do |content|
-        "#{shebang}\n" + content
-      end
-      chmod "script", 0755, :verbose => false
-    end
-
-    def test
-      directory "test"
-    end
-
-    def tmp
-      empty_directory "tmp"
-
-      inside "tmp" do
-        %w(sessions sockets cache pids).each do |dir|
-          empty_directory(dir)
-        end
-      end
-    end
-
-    def vendor_plugins
-      empty_directory_with_gitkeep "vendor/plugins"
-    end
-  end
-
   module Generators
     # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
     # can change in Ruby 1.8.7 when we FileUtils.cd.
     RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
 
-    RESERVED_NAMES = %w[application destroy benchmarker profiler
-                        plugin runner test]
+    RESERVED_NAMES = %w(application destroy benchmarker profiler plugin runner test)
 
     class AppGenerator < Base
       DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
@@ -164,9 +24,6 @@ module Rails
       class_option :database,           :type => :string, :aliases => "-d", :default => "sqlite3",
                                         :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
-      class_option :builder,            :type => :string, :aliases => "-b",
-                                        :desc => "Path to an application builder (can be a filesystem path or URL)"
-
       class_option :template,           :type => :string, :aliases => "-m",
                                         :desc => "Path to an application template (can be a filesystem path or URL)"
 
@@ -200,7 +57,6 @@ module Rails
 
       def initialize(*args)
         raise Error, "Options should be given after the application name. For details run: rails --help" if args[0].blank?
-
         @original_wd = Dir.pwd
 
         super
@@ -220,19 +76,29 @@ module Rails
       end
 
       def create_root_files
-        build(:readme)
-        build(:rakefile)
-        build(:configru)
-        build(:gitignore) unless options[:skip_git]
-        build(:gemfile)   unless options[:skip_gemfile]
+        copy_file "README"
+        template "Rakefile"
+        template "config.ru"
+        copy_file "gitignore", ".gitignore" unless options[:skip_git]
+        template "Gemfile" unless options[:skip_gemfile]
       end
 
       def create_app_files
-        build(:app)
+        directory 'app'
       end
 
       def create_config_files
-        build(:config)
+        empty_directory "config"
+
+        inside "config" do
+          template "routes.rb"
+          template "application.rb"
+          template "environment.rb"
+
+          directory "environments"
+          directory "initializers"
+          directory "locales"
+        end
       end
 
       def create_boot_file
@@ -241,59 +107,77 @@ module Rails
 
       def create_active_record_files
         return if options[:skip_active_record]
-        build(:database_yml)
+        template "config/databases/#{@options[:database]}.yml", "config/database.yml"
       end
 
       def create_db_files
-        build(:db)
+        directory "db"
       end
 
       def create_doc_files
-        build(:doc)
+        directory "doc"
       end
 
       def create_lib_files
-        build(:lib)
+        empty_directory "lib"
+        empty_directory_with_gitkeep "lib/tasks"
       end
 
       def create_log_files
-        build(:log)
+        empty_directory "log"
+
+        inside "log" do
+          %w( server production development test ).each do |file|
+            create_file "#{file}.log"
+            chmod "#{file}.log", 0666, :verbose => false
+          end
+        end
       end
 
       def create_public_files
-        build(:public_directory)
+        directory "public", "public", :recursive => false
       end
 
       def create_public_image_files
-        build(:images)
+        directory "public/images"
       end
 
       def create_public_stylesheets_files
-        build(:stylesheets)
+        empty_directory_with_gitkeep "public/stylesheets"
       end
 
-      def create_prototype_files
-        build(:javascripts)
+      def create_public_javascripts_files
+        unless options[:skip_prototype]
+          directory "public/javascripts"
+        else
+          empty_directory_with_gitkeep "public/javascripts"
+          create_file "public/javascripts/application.js"
+        end
       end
 
       def create_script_files
-        build(:script)
+        directory "script" do |content|
+          "#{shebang}\n" + content
+        end
+        chmod "script", 0755, :verbose => false
       end
 
       def create_test_files
-        build(:test) unless options[:skip_test_unit]
+        directory "test" unless options[:skip_test_unit]
       end
 
       def create_tmp_files
-        build(:tmp)
-      end
+        empty_directory "tmp"
 
-      def create_vendor_files
-        build(:vendor_plugins)
+        inside "tmp" do
+          %w(sessions sockets cache pids).each do |dir|
+            empty_directory(dir)
+          end
+        end
       end
 
-      def finish_template
-        build(:leftovers)
+      def create_vendor_files
+        empty_directory_with_gitkeep "vendor/plugins"
       end
 
       def apply_rails_template
@@ -313,29 +197,6 @@ module Rails
         "rails new #{self.arguments.map(&:usage).join(' ')} [options]"
       end
 
-      def builder
-        @builder ||= begin
-          if path = options[:builder]
-            if URI(path).is_a?(URI::HTTP)
-              contents = open(path, "Accept" => "application/x-thor-template") {|io| io.read }
-            else
-              contents = open(File.expand_path(path, @original_wd)) {|io| io.read }
-            end
-
-            prok = eval("proc { #{contents} }", TOPLEVEL_BINDING, path, 1)
-            instance_eval(&prok)
-          end
-
-          builder_class = defined?(::AppBuilder) ? ::AppBuilder : Rails::AppBuilder
-          builder_class.send(:include, ActionMethods)
-          builder_class.new(self)
-        end
-      end
-
-      def build(meth, *args)
-        builder.send(meth, *args) if builder.respond_to?(meth)
-      end
-
       def set_default_accessors!
         self.rails_template = case options[:template]
           when /^http:\/\//
-- 
cgit v1.2.3


From 848eb0d777d2f2907c399c2fe073fedffad14c63 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Wed, 6 Oct 2010 02:53:00 -0700
Subject: Revert "Clean up the builder abstraction in AppGenerator."

The phrase "clean up" misrepresents the fact that this removes
a feature that ships with Rails 3.0.

This reverts commit 6774e12afa0f29442aa612ddf6e51d5a1b7a4356.
---
 .../rails/generators/rails/app/app_generator.rb    | 247 ++++++++++++++++-----
 1 file changed, 193 insertions(+), 54 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index be09698787..2715483914 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -6,12 +6,152 @@ require 'open-uri'
 require 'uri'
 
 module Rails
+  module ActionMethods
+    attr_reader :options
+
+    def initialize(generator)
+      @generator = generator
+      @options   = generator.options
+    end
+
+    private
+      %w(template copy_file directory empty_directory inside
+         empty_directory_with_gitkeep create_file chmod shebang).each do |method|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{method}(*args, &block)
+            @generator.send(:#{method}, *args, &block)
+          end
+        RUBY
+      end
+
+      # TODO: Remove once this is fully in place
+      def method_missing(meth, *args, &block)
+        STDERR.puts "Calling #{meth} with #{args.inspect} with #{block}"
+        @generator.send(meth, *args, &block)
+      end
+  end
+
+  class AppBuilder
+    def rakefile
+      template "Rakefile"
+    end
+
+    def readme
+      copy_file "README"
+    end
+
+    def gemfile
+      template "Gemfile"
+    end
+
+    def configru
+      template "config.ru"
+    end
+
+    def gitignore
+      copy_file "gitignore", ".gitignore"
+    end
+
+    def app
+      directory 'app'
+    end
+
+    def config
+      empty_directory "config"
+
+      inside "config" do
+        template "routes.rb"
+        template "application.rb"
+        template "environment.rb"
+
+        directory "environments"
+        directory "initializers"
+        directory "locales"
+      end
+    end
+
+    def database_yml
+      template "config/databases/#{@options[:database]}.yml", "config/database.yml"
+    end
+
+    def db
+      directory "db"
+    end
+
+    def doc
+      directory "doc"
+    end
+
+    def lib
+      empty_directory "lib"
+      empty_directory_with_gitkeep "lib/tasks"
+    end
+
+    def log
+      empty_directory "log"
+
+      inside "log" do
+        %w( server production development test ).each do |file|
+          create_file "#{file}.log"
+          chmod "#{file}.log", 0666, :verbose => false
+        end
+      end
+    end
+
+    def public_directory
+      directory "public", "public", :recursive => false
+    end
+
+    def images
+      directory "public/images"
+    end
+
+    def stylesheets
+      empty_directory_with_gitkeep "public/stylesheets"
+    end
+
+    def javascripts
+      unless options[:skip_prototype]
+        directory "public/javascripts"
+      else
+        empty_directory_with_gitkeep "public/javascripts"
+        create_file "public/javascripts/application.js"
+      end
+    end
+
+    def script
+      directory "script" do |content|
+        "#{shebang}\n" + content
+      end
+      chmod "script", 0755, :verbose => false
+    end
+
+    def test
+      directory "test"
+    end
+
+    def tmp
+      empty_directory "tmp"
+
+      inside "tmp" do
+        %w(sessions sockets cache pids).each do |dir|
+          empty_directory(dir)
+        end
+      end
+    end
+
+    def vendor_plugins
+      empty_directory_with_gitkeep "vendor/plugins"
+    end
+  end
+
   module Generators
     # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
     # can change in Ruby 1.8.7 when we FileUtils.cd.
     RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
 
-    RESERVED_NAMES = %w(application destroy benchmarker profiler plugin runner test)
+    RESERVED_NAMES = %w[application destroy benchmarker profiler
+                        plugin runner test]
 
     class AppGenerator < Base
       DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
@@ -24,6 +164,9 @@ module Rails
       class_option :database,           :type => :string, :aliases => "-d", :default => "sqlite3",
                                         :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
+      class_option :builder,            :type => :string, :aliases => "-b",
+                                        :desc => "Path to an application builder (can be a filesystem path or URL)"
+
       class_option :template,           :type => :string, :aliases => "-m",
                                         :desc => "Path to an application template (can be a filesystem path or URL)"
 
@@ -57,6 +200,7 @@ module Rails
 
       def initialize(*args)
         raise Error, "Options should be given after the application name. For details run: rails --help" if args[0].blank?
+
         @original_wd = Dir.pwd
 
         super
@@ -76,29 +220,19 @@ module Rails
       end
 
       def create_root_files
-        copy_file "README"
-        template "Rakefile"
-        template "config.ru"
-        copy_file "gitignore", ".gitignore" unless options[:skip_git]
-        template "Gemfile" unless options[:skip_gemfile]
+        build(:readme)
+        build(:rakefile)
+        build(:configru)
+        build(:gitignore) unless options[:skip_git]
+        build(:gemfile)   unless options[:skip_gemfile]
       end
 
       def create_app_files
-        directory 'app'
+        build(:app)
       end
 
       def create_config_files
-        empty_directory "config"
-
-        inside "config" do
-          template "routes.rb"
-          template "application.rb"
-          template "environment.rb"
-
-          directory "environments"
-          directory "initializers"
-          directory "locales"
-        end
+        build(:config)
       end
 
       def create_boot_file
@@ -107,77 +241,59 @@ module Rails
 
       def create_active_record_files
         return if options[:skip_active_record]
-        template "config/databases/#{@options[:database]}.yml", "config/database.yml"
+        build(:database_yml)
       end
 
       def create_db_files
-        directory "db"
+        build(:db)
       end
 
       def create_doc_files
-        directory "doc"
+        build(:doc)
       end
 
       def create_lib_files
-        empty_directory "lib"
-        empty_directory_with_gitkeep "lib/tasks"
+        build(:lib)
       end
 
       def create_log_files
-        empty_directory "log"
-
-        inside "log" do
-          %w( server production development test ).each do |file|
-            create_file "#{file}.log"
-            chmod "#{file}.log", 0666, :verbose => false
-          end
-        end
+        build(:log)
       end
 
       def create_public_files
-        directory "public", "public", :recursive => false
+        build(:public_directory)
       end
 
       def create_public_image_files
-        directory "public/images"
+        build(:images)
       end
 
       def create_public_stylesheets_files
-        empty_directory_with_gitkeep "public/stylesheets"
+        build(:stylesheets)
       end
 
-      def create_public_javascripts_files
-        unless options[:skip_prototype]
-          directory "public/javascripts"
-        else
-          empty_directory_with_gitkeep "public/javascripts"
-          create_file "public/javascripts/application.js"
-        end
+      def create_prototype_files
+        build(:javascripts)
       end
 
       def create_script_files
-        directory "script" do |content|
-          "#{shebang}\n" + content
-        end
-        chmod "script", 0755, :verbose => false
+        build(:script)
       end
 
       def create_test_files
-        directory "test" unless options[:skip_test_unit]
+        build(:test) unless options[:skip_test_unit]
       end
 
       def create_tmp_files
-        empty_directory "tmp"
-
-        inside "tmp" do
-          %w(sessions sockets cache pids).each do |dir|
-            empty_directory(dir)
-          end
-        end
+        build(:tmp)
       end
 
       def create_vendor_files
-        empty_directory_with_gitkeep "vendor/plugins"
+        build(:vendor_plugins)
+      end
+
+      def finish_template
+        build(:leftovers)
       end
 
       def apply_rails_template
@@ -197,6 +313,29 @@ module Rails
         "rails new #{self.arguments.map(&:usage).join(' ')} [options]"
       end
 
+      def builder
+        @builder ||= begin
+          if path = options[:builder]
+            if URI(path).is_a?(URI::HTTP)
+              contents = open(path, "Accept" => "application/x-thor-template") {|io| io.read }
+            else
+              contents = open(File.expand_path(path, @original_wd)) {|io| io.read }
+            end
+
+            prok = eval("proc { #{contents} }", TOPLEVEL_BINDING, path, 1)
+            instance_eval(&prok)
+          end
+
+          builder_class = defined?(::AppBuilder) ? ::AppBuilder : Rails::AppBuilder
+          builder_class.send(:include, ActionMethods)
+          builder_class.new(self)
+        end
+      end
+
+      def build(meth, *args)
+        builder.send(meth, *args) if builder.respond_to?(meth)
+      end
+
       def set_default_accessors!
         self.rails_template = case options[:template]
           when /^http:\/\//
-- 
cgit v1.2.3


From 0904e8256864239f673bf91fce1cfffb9345ee61 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Wed, 6 Oct 2010 02:58:49 -0700
Subject: Delegate everything to the generator

---
 .../lib/rails/generators/rails/app/app_generator.rb    | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 2715483914..d2ab098885 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -14,21 +14,11 @@ module Rails
       @options   = generator.options
     end
 
-    private
-      %w(template copy_file directory empty_directory inside
-         empty_directory_with_gitkeep create_file chmod shebang).each do |method|
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{method}(*args, &block)
-            @generator.send(:#{method}, *args, &block)
-          end
-        RUBY
-      end
+  private
 
-      # TODO: Remove once this is fully in place
-      def method_missing(meth, *args, &block)
-        STDERR.puts "Calling #{meth} with #{args.inspect} with #{block}"
-        @generator.send(meth, *args, &block)
-      end
+    def method_missing(meth, *args, &block)
+      @generator.send(meth, *args, &block)
+    end
   end
 
   class AppBuilder
-- 
cgit v1.2.3


From d40ca9cce241a8083756c993d6c99a79e62e050e Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Wed, 6 Oct 2010 03:06:12 -0700
Subject: Some initial docs

---
 railties/lib/rails/generators/rails/app/app_generator.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index d2ab098885..7907191c74 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -21,6 +21,13 @@ module Rails
     end
   end
 
+  # The application builder allows you to override elements of the application
+  # generator without being forced to reverse the operations of the default
+  # generator.
+  #
+  # This allows you to override entire operations, like the creation of the
+  # Gemfile, README, or javascript files, without needing to know exactly
+  # what those operations do so you can create another template action.
   class AppBuilder
     def rakefile
       template "Rakefile"
-- 
cgit v1.2.3


From d649bf158be130515566aed987f83d36ac9b0ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 6 Oct 2010 17:18:59 +0200
Subject: Provide a cleaner syntax for paths configuration that does not rely
 on method_missing.

---
 railties/lib/rails/application.rb               |   2 +-
 railties/lib/rails/application/bootstrap.rb     |   2 +-
 railties/lib/rails/application/configuration.rb |  18 +--
 railties/lib/rails/application/finisher.rb      |   2 +-
 railties/lib/rails/engine.rb                    |  59 ++++-----
 railties/lib/rails/engine/configuration.rb      |  43 ++++---
 railties/lib/rails/engine/railties.rb           |   2 +-
 railties/lib/rails/paths.rb                     | 152 ++++++++++++++++--------
 railties/lib/rails/plugin.rb                    |   4 +-
 railties/lib/rails/tasks/railties.rake          |   2 +-
 10 files changed, 172 insertions(+), 114 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 075e3c5692..5559f49fbd 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -72,7 +72,7 @@ module Rails
     end
 
     def require_environment! #:nodoc:
-      environment = paths.config.environment.to_a.first
+      environment = paths["config/environment"].existent.first
       require environment if environment
     end
 
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index e39b3bc705..213aa0768a 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -23,7 +23,7 @@ module Rails
       # Initialize the logger early in the stack in case we need to log some deprecation.
       initializer :initialize_logger do
         Rails.logger ||= config.logger || begin
-          path = config.paths.log.to_a.first
+          path = config.paths["log"].first
           logger = ActiveSupport::BufferedLogger.new(path)
           logger.level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
           logger.auto_flushing = false if Rails.env.production?
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index f902c3ded2..3505388479 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -9,7 +9,7 @@ module Rails
                     :filter_parameters,  :log_level, :logger,
                     :preload_frameworks, :reload_plugins,
                     :secret_token, :serve_static_assets, :session_options,
-                    :time_zone, :whiny_nils
+                    :time_zone, :whiny_nils, :helpers_paths
 
       def initialize(*)
         super
@@ -17,6 +17,7 @@ module Rails
         @allow_concurrency = false
         @consider_all_requests_local = false
         @filter_parameters = []
+        @helpers_paths = []
         @dependency_loading = true
         @serve_static_assets = true
         @session_store = :cookie_store
@@ -60,13 +61,12 @@ module Rails
       def paths
         @paths ||= begin
           paths = super
-          paths.config.database     "config/database.yml"
-          paths.config.environment  "config/environment.rb"
-          paths.lib.templates       "lib/templates"
-          paths.log                 "log/#{Rails.env}.log"
-          paths.tmp                 "tmp"
-          paths.tmp.cache           "tmp/cache"
-
+          paths.add "config/database",    :with => "config/database.yml"
+          paths.add "config/environment", :with => "config/environment.rb"
+          paths.add "lib/templates"
+          paths.add "log",                :with => "log/#{Rails.env}.log"
+          paths.add "tmp"
+          paths.add "tmp/cache"
           paths
         end
       end
@@ -88,7 +88,7 @@ module Rails
       # YAML::load.
       def database_configuration
         require 'erb'
-        YAML::load(ERB.new(IO.read(paths.config.database.to_a.first)).result)
+        YAML::load(ERB.new(IO.read(paths["config/database"].first)).result)
       end
 
       def cache_store
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index b95df467c7..e3342be7ee 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -4,7 +4,7 @@ module Rails
       include Initializable
 
       initializer :add_generator_templates do
-        config.generators.templates.unshift(*paths.lib.templates.to_a)
+        config.generators.templates.unshift(*paths["lib/templates"].existent)
       end
 
       initializer :ensure_autoload_once_paths_as_subset do
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 3981e8dfd5..bd3e612153 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -90,17 +90,17 @@ module Rails
   # The available paths in an Engine are:
   #
   #   class MyEngine < Rails::Engine
-  #     paths.app                 = "app"
-  #     paths.app.controllers     = "app/controllers"
-  #     paths.app.helpers         = "app/helpers"
-  #     paths.app.models          = "app/models"
-  #     paths.app.views           = "app/views"
-  #     paths.lib                 = "lib"
-  #     paths.lib.tasks           = "lib/tasks"
-  #     paths.config              = "config"
-  #     paths.config.initializers = "config/initializers"
-  #     paths.config.locales      = "config/locales"
-  #     paths.config.routes       = "config/routes.rb"
+  #     paths["app"]                 #=> ["app"]
+  #     paths["app/controllers"]     #=> ["app/controllers"]
+  #     paths["app/helpers"]         #=> ["app/helpers"]
+  #     paths["app/models"]          #=> ["app/models"]
+  #     paths["app/views"]           #=> ["app/views"]
+  #     paths["lib"]                 #=> ["lib"]
+  #     paths["lib/tasks"]           #=> ["lib/tasks"]
+  #     paths["config"]              #=> ["config"]
+  #     paths["config/initializers"] #=> ["config/initializers"]
+  #     paths["config/locales"]      #=> ["config/locales"]
+  #     paths["config/routes"]       #=> ["config/routes.rb"]
   #   end
   #
   # Your Application class adds a couple more paths to this set. And as in your Application,
@@ -276,11 +276,11 @@ module Rails
   #     end
   #   end
   #
-  # There is also 'app' helper that gives you access to application's routes inside Engine:
+  # There is also 'main_app' helper that gives you access to application's routes inside Engine:
   #
   #   module MyEngine
   #     class BarController
-  #       app.foo_path #=> /foo
+  #       main_app.foo_path #=> /foo
   #     end
   #   end
   #
@@ -381,7 +381,7 @@ module Rails
 
     def load_tasks
       super
-      config.paths.lib.tasks.to_a.sort.each { |ext| load(ext) }
+      paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end
 
     def eager_load!
@@ -441,7 +441,7 @@ module Rails
     #
     # Blog::Engine.load_seed
     def load_seed
-      seed_file = config.paths.db.seeds.to_a.first
+      seed_file = paths["db/seeds"].existent.first
       load(seed_file) if File.exist?(seed_file)
     end
 
@@ -469,20 +469,22 @@ module Rails
     end
 
     initializer :add_routing_paths do |app|
-      app.routes_reloader.blocks[routes] = routes_draw_block
-      paths.config.routes.to_a.each do |route|
-        app.routes_reloader.paths.unshift(route) if File.exists?(route)
+      paths = self.paths["config/routes"].existent
+
+      if routes? || paths.any?
+        app.routes_reloader.blocks[routes] = routes_draw_block
+        app.routes_reloader.paths.unshift(*paths)
       end
     end
 
     # I18n load paths are a special case since the ones added
     # later have higher priority.
     initializer :add_locales do
-      config.i18n.railties_load_path.concat(paths.config.locales.to_a)
+      config.i18n.railties_load_path.concat(paths["config/locales"].existent)
     end
 
     initializer :add_view_paths do
-      views = paths.app.views.to_a
+      views = paths["app/views"].existent
       unless views.empty?
         ActiveSupport.on_load(:action_controller){ prepend_view_path(views) }
         ActiveSupport.on_load(:action_mailer){ prepend_view_path(views) }
@@ -490,28 +492,27 @@ module Rails
     end
 
     initializer :load_environment_config, :before => :load_environment_hook do
-      environment = config.paths.config.environments.to_a.first
+      environment = paths["config/environments"].existent.first
       require environment if environment
     end
 
     initializer :append_asset_paths do
       config.asset_path ||= "/#{engine_name}%s"
 
-      public_path = config.paths.public.to_a.first
+      public_path = paths["public"].first
       if config.compiled_asset_path && File.exist?(public_path)
         config.static_asset_paths[config.compiled_asset_path] = public_path
       end
     end
 
-    initializer :prepend_helpers_path do
-      unless namespaced?
-        config.helpers_paths = [] unless config.respond_to?(:helpers_paths)
-        config.helpers_paths = config.paths.app.helpers.to_a + config.helpers_paths
+    initializer :prepend_helpers_path do |app|
+      if !namespaced? || (app == self)
+        app.config.helpers_paths.unshift(*paths["app/helpers"].existent)
       end
     end
 
     initializer :load_config_initializers do
-      paths.config.initializers.to_a.sort.each do |initializer|
+      config.paths["config/initializers"].existent.sort.each do |initializer|
         load(initializer)
       end
     end
@@ -524,6 +525,10 @@ module Rails
   protected
     attr_accessor :routes_draw_block
 
+    def routes?
+      defined?(@routes)
+    end
+
     def find_root_with_flag(flag, default=nil)
       root_path = self.class.called_from
 
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index b69c0e1c53..7a07dcad7d 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -10,7 +10,6 @@ module Rails
       def initialize(root=nil)
         super()
         @root = root
-        @helpers_paths = []
       end
 
       # Returns the middleware stack for the engine.
@@ -39,27 +38,27 @@ module Rails
       def paths
         @paths ||= begin
           paths = Rails::Paths::Root.new(@root)
-          paths.app                 "app",                 :eager_load => true, :glob => "*"
-          paths.app.controllers     "app/controllers",     :eager_load => true
-          paths.app.helpers         "app/helpers",         :eager_load => true
-          paths.app.models          "app/models",          :eager_load => true
-          paths.app.mailers         "app/mailers",         :eager_load => true
-          paths.app.views           "app/views"
-          paths.lib                 "lib",                 :load_path => true
-          paths.lib.tasks           "lib/tasks",           :glob => "**/*.rake"
-          paths.config              "config"
-          paths.config.initializers "config/initializers", :glob => "**/*.rb"
-          paths.config.locales      "config/locales",      :glob => "*.{rb,yml}"
-          paths.config.routes       "config/routes.rb"
-          paths.config.environments "config/environments", :glob => "#{Rails.env}.rb"
-          paths.public              "public"
-          paths.public.javascripts  "public/javascripts"
-          paths.public.stylesheets  "public/stylesheets"
-          paths.vendor              "vendor", :load_path => true
-          paths.vendor.plugins      "vendor/plugins"
-          paths.db                  "db"
-          paths.db.migrate          "db/migrate"
-          paths.db.seeds            "db/seeds.rb"
+          paths.add "app",                 :eager_load => true, :glob => "*"
+          paths.add "app/controllers",     :eager_load => true
+          paths.add "app/helpers",         :eager_load => true
+          paths.add "app/models",          :eager_load => true
+          paths.add "app/mailers",         :eager_load => true
+          paths.add "app/views"
+          paths.add "lib",                 :load_path => true
+          paths.add "lib/tasks",           :glob => "**/*.rake"
+          paths.add "config"
+          paths.add "config/environments", :glob => "#{Rails.env}.rb"
+          paths.add "config/initializers", :glob => "**/*.rb"
+          paths.add "config/locales",      :glob => "*.{rb,yml}"
+          paths.add "config/routes",       :with => "config/routes.rb"
+          paths.add "db"
+          paths.add "db/migrate"
+          paths.add "db/seeds",            :with => "db/seeds.rb"
+          paths.add "public"
+          paths.add "public/javascripts"
+          paths.add "public/stylesheets"
+          paths.add "vendor",              :load_path => true
+          paths.add "vendor/plugins"
           paths
         end
       end
diff --git a/railties/lib/rails/engine/railties.rb b/railties/lib/rails/engine/railties.rb
index 389a7602c6..e91bdbf1e5 100644
--- a/railties/lib/rails/engine/railties.rb
+++ b/railties/lib/rails/engine/railties.rb
@@ -15,7 +15,7 @@ module Rails
       def plugins
         @plugins ||= begin
           plugin_names = (@config.plugins || [:all]).map { |p| p.to_sym }
-          Plugin.all(plugin_names, @config.paths.vendor.plugins)
+          Plugin.all(plugin_names, @config.paths["vendor/plugins"].existent)
         end
       end
     end
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index d303212f52..1729e8707e 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -2,15 +2,17 @@ require 'set'
 
 module Rails
   module Paths
-    module PathParent
-      attr_reader :children
-
+    module PathParent #:nodoc:
       def method_missing(id, *args)
-        name = id.to_s
+        match = id.to_s.match(/^(.*)=$/)
+        full  = [@current, $1 || id].compact.join("/")
+
+        ActiveSupport::Deprecation.warn 'config.paths.app.controller API is deprecated in ' <<
+          'favor of config.paths["app/controller"] API.'
 
-        if name =~ /^(.*)=$/ || args.any?
-          @children[$1 || name] = Path.new(@root, *args)
-        elsif path = @children[name]
+        if match || args.any?
+          @root[full] = Path.new(@root, full, *args)
+        elsif path = @root[full]
           path
         else
           super
@@ -18,22 +20,72 @@ module Rails
       end
     end
 
-    class Root
+    # This object is an extended hash that behaves as root of the Rails::Paths system.
+    # It allows you to collect information about how you want to structure your application
+    # paths by a Hash like API. It requires you to give a physical path on initialization.
+    #
+    #   root = Root.new
+    #   root.add "app/controllers", :eager_load => true
+    #
+    # The command above creates a new root object and add "app/controllers" as a path.
+    # This means we can get a Path object back like below:
+    #
+    #   path = root["app/controllers"]
+    #   path.eager_load?               #=> true
+    #   path.is_a?(Rails::Paths::Path) #=> true
+    #
+    # The Path object is simply an array and allows you to easily add extra paths:
+    #
+    #   path.is_a?(Array) #=> true
+    #   path.inspect      #=> ["app/controllers"]
+    #
+    #   path << "lib/controllers"
+    #   path.inspect      #=> ["app/controllers", "lib/controllers"]
+    #
+    # Notice that when you add a path using #add, the path object created already
+    # contains te path with the same path value given to #add. In some situations,
+    # you may not want this behavior, so you can give :with as option.
+    #
+    #   root.add "config/routes", :with => "config/routes.rb"
+    #   root["config/routes"].inspect #=> ["config/routes.rb"]
+    #
+    # #add also accepts the following options as argument: eager_load, autoload,
+    # autoload_once and glob.
+    #
+    # Finally, the Path object also provides a few helpers:
+    #
+    #   root = Root.new
+    #   root.path = "/rails"
+    #   root.add "app/controllers"
+    #
+    #   root["app/controllers"].expanded #=> ["/rails/app/controllers"]
+    #   root["app/controllers"].existent #=> ["/rails/app/controllers"]
+    #
+    # Check the Path documentation for more information.
+    class Root < ::Hash
       include PathParent
-
       attr_accessor :path
 
       def initialize(path)
         raise if path.is_a?(Array)
-        @children = {}
+        @current = nil
         @path = path
         @root = self
-        @all_paths = []
+        super()
+      end
+
+      def []=(path, value)
+        value = Path.new(self, path, value) unless value.is_a?(Path)
+        super(path, value)
+      end
+
+      def add(path, options={})
+        with = options[:with] || path
+        self[path] = Path.new(self, path, with, options)
       end
 
       def all_paths
-        @all_paths.uniq!
-        @all_paths
+        values.tap { |v| v.uniq! }
       end
 
       def autoload_once
@@ -52,68 +104,54 @@ module Rails
         filter_by(:load_path?)
       end
 
-      def push(*)
-        raise "Application root can only have one physical path"
-      end
-
-      alias unshift push
-      alias << push
-      alias concat push
-
     protected
 
       def filter_by(constraint)
         all = []
         all_paths.each do |path|
           if path.send(constraint)
-            paths  = path.paths
-            paths -= path.children.values.map { |p| p.send(constraint) ? [] : p.paths }.flatten
+            paths  = path.existent
+            paths -= path.children.map { |p| p.send(constraint) ? [] : p.existent }.flatten
             all.concat(paths)
           end
         end
         all.uniq!
-        all.reject! { |p| !File.exists?(p) }
         all
       end
     end
 
-    class Path
-      include PathParent, Enumerable
+    class Path < Array
+      include PathParent
 
       attr_reader :path
       attr_accessor :glob
 
-      def initialize(root, *paths)
-        options   = paths.last.is_a?(::Hash) ? paths.pop : {}
-        @children = {}
+      def initialize(root, current, *paths)
+        options = paths.last.is_a?(::Hash) ? paths.pop : {}
+        super(paths.flatten)
+
+        @current  = current
         @root     = root
-        @paths    = paths.flatten
         @glob     = options[:glob]
 
         autoload_once! if options[:autoload_once]
         eager_load!    if options[:eager_load]
         autoload!      if options[:autoload]
         load_path!     if options[:load_path]
-
-        @root.all_paths << self
-      end
-
-      def each
-        to_a.each { |p| yield p }
       end
 
-      def push(path)
-        @paths.push path
+      def children
+        keys = @root.keys.select { |k| k.include?(@current) }
+        keys.delete(@current)
+        @root.values_at(*keys.sort)
       end
 
-      alias << push
-
-      def unshift(path)
-        @paths.unshift path
+      def first
+        expanded.first
       end
 
-      def concat(paths)
-        @paths.concat paths
+      def last
+        expanded.last
       end
 
       %w(autoload_once eager_load autoload load_path).each do |m|
@@ -132,20 +170,36 @@ module Rails
         RUBY
       end
 
-      def paths
+      # Expands all paths against the root and return all unique values.
+      def expanded
         raise "You need to set a path root" unless @root.path
+        result = []
 
-        result = @paths.map do |p|
+        each do |p|
           path = File.expand_path(p, @root.path)
-          @glob ? Dir[File.join(path, @glob)] : path
+
+          if @glob
+            result.concat Dir[File.join(path, @glob)]
+          else
+            result << path
+          end
         end
 
-        result.flatten!
         result.uniq!
         result
       end
 
-      alias to_a paths
+      # Returns all expanded paths but only if they exist in the filesystem.
+      def existent
+        expanded.select { |f| File.exists?(f) }
+      end
+
+      def paths
+        ActiveSupport::Deprecation.warn "paths is deprecated. Please call expand instead."
+        expanded
+      end
+
+      alias to_a expanded
     end
   end
 end
\ No newline at end of file
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 5614624673..76fa76598c 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -62,13 +62,13 @@ module Rails
     end
 
     initializer :handle_lib_autoload, :before => :set_load_path do |app|
-      paths = if app.config.reload_plugins
+      autoload = if app.config.reload_plugins
         config.autoload_paths
       else
         config.autoload_once_paths
       end
 
-      paths.concat config.paths.lib.to_a
+      autoload.concat paths["lib"].existent
     end
 
     initializer :load_init_rb, :before => :load_config_initializers do |app|
diff --git a/railties/lib/rails/tasks/railties.rake b/railties/lib/rails/tasks/railties.rake
index 7cf31f84a0..0c1ee0f17a 100644
--- a/railties/lib/rails/tasks/railties.rake
+++ b/railties/lib/rails/tasks/railties.rake
@@ -2,7 +2,7 @@ namespace :railties do
   desc "Create symlinks to railties public directories in application's public directory."
   task :create_symlinks => :environment do
     paths = Rails.application.config.static_asset_paths.dup
-    app_public_path = Rails.application.config.paths.public.to_a.first
+    app_public_path = Rails.application.paths["public"].first
 
     paths.each do |mount_path, path|
       symlink_path = File.join(app_public_path, mount_path)
-- 
cgit v1.2.3


From a0552d653b00e2e5b77e086b155e89fa22e4d6ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 6 Oct 2010 12:50:31 -0300
Subject: Fixes typo

---
 railties/lib/rails/paths.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 1729e8707e..8570fc7b3f 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -43,7 +43,7 @@ module Rails
     #   path.inspect      #=> ["app/controllers", "lib/controllers"]
     #
     # Notice that when you add a path using #add, the path object created already
-    # contains te path with the same path value given to #add. In some situations,
+    # contains the path with the same path value given to #add. In some situations,
     # you may not want this behavior, so you can give :with as option.
     #
     #   root.add "config/routes", :with => "config/routes.rb"
@@ -202,4 +202,4 @@ module Rails
       alias to_a expanded
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 3ca6988b782f7ae9da736b090fbf1edd8bc02fcb Mon Sep 17 00:00:00 2001
From: Thomas McDonald <themcman1@googlemail.com>
Date: Wed, 6 Oct 2010 22:11:03 +0100
Subject: Fixed typo in engine documentation

---
 railties/lib/rails/engine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 0620b8608e..5e2bdb7340 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -17,7 +17,7 @@ module Rails
   # In Rails versions before to 3.0, your gems automatically behaved as Engine, however
   # this coupled Rails to Rubygems. Since Rails 3.0, if you want a gem to automatically
   # behave as Engine, you have to specify an Engine for it somewhere inside your plugin
-  # lib folder (similar with how we spceify a Railtie):
+  # lib folder (similar to how we specify a Railtie):
   #
   #   # lib/my_engine.rb
   #   module MyEngine
-- 
cgit v1.2.3


From 1e63a05d28fd7ebee2f962fc190d3e2af429dcb9 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Thu, 28 Jan 2010 00:12:02 +1000
Subject: Add "a" to make it better English

[#3796 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 railties/lib/rails/plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 76fa76598c..ceddd25eaa 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -83,7 +83,7 @@ module Rails
 
     initializer :sanity_check_railties_collision do
       if Engine.subclasses.map { |k| k.root.to_s }.include?(root.to_s)
-        raise "\"#{name}\" is a Railtie/Engine and cannot be installed as plugin"
+        raise "\"#{name}\" is a Railtie/Engine and cannot be installed as a plugin"
       end
     end
   end
-- 
cgit v1.2.3


From c3c6f58ffb4a27f843378d4cce45c52831fb2e37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vesa=20V=C3=A4nsk=C3=A4?= <vesan2000@gmail.com>
Date: Fri, 8 Oct 2010 15:01:33 +0800
Subject: Fixed rake task description typo

---
 railties/lib/rails/tasks/documentation.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 7aefbb49b0..edd716d7d0 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -47,7 +47,7 @@ namespace :doc do
     rdoc.rdoc_files.include('app/**/*.rb')
     rdoc.rdoc_files.include('lib/**/*.rb')
   }
-  Rake::Task['doc:app'].comment = "Generate docs for the app -- also availble doc:rails, doc:guides, doc:plugins (options: TEMPLATE=/rdoc-template.rb, TITLE=\"Custom Title\")"
+  Rake::Task['doc:app'].comment = "Generate docs for the app -- also available doc:rails, doc:guides, doc:plugins (options: TEMPLATE=/rdoc-template.rb, TITLE=\"Custom Title\")"
 
   # desc 'Generate documentation for the Rails framework.'
   RDocTaskWithoutDescriptions.new("rails") { |rdoc|
-- 
cgit v1.2.3


From 08f4713dba1ae013d5b3c9815cb7e33ea5533be5 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 6 Oct 2010 15:54:28 +0200
Subject: Refactored routes reloading to use RouteSet#append instead keeping
 block in Engine
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/lib/rails/application/routes_reloader.rb | 24 ++++++-----------------
 railties/lib/rails/engine.rb                      |  8 +++-----
 2 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
index 6da903c1ac..1d1f5e1b06 100644
--- a/railties/lib/rails/application/routes_reloader.rb
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -1,17 +1,15 @@
 module Rails
   class Application
     class RoutesReloader < ::ActiveSupport::FileUpdateChecker
+      attr_reader :route_sets
+
       def initialize
         super([]) { reload! }
-      end
-
-      def blocks
-        @blocks ||= {}
+        @route_sets = []
       end
 
       def reload!
         clear!
-        load_blocks
         load_paths
         finalize!
       ensure
@@ -21,37 +19,27 @@ module Rails
     protected
 
       def clear!
-        routers.each do |routes|
+        route_sets.each do |routes|
           routes.disable_clear_and_finalize = true
           routes.clear!
         end
       end
 
-      def load_blocks
-        blocks.each do |routes, block|
-          routes.draw(&block) if block
-        end
-      end
-
       def load_paths
         paths.each { |path| load(path) }
       end
 
       def finalize!
-        routers.each do |routes|
+        route_sets.each do |routes|
           ActiveSupport.on_load(:action_controller) { routes.finalize! }
         end
       end
 
       def revert
-        routers.each do |routes|
+        route_sets.each do |routes|
           routes.disable_clear_and_finalize = false
         end
       end
-
-      def routers
-        blocks.keys
-      end
     end
   end
 end
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 1aa24b6808..f8caaef213 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -419,9 +419,9 @@ module Rails
       }
     end
 
-    def routes(&block)
+    def routes
       @routes ||= ActionDispatch::Routing::RouteSet.new
-      self.routes_draw_block = block if block_given?
+      @routes.append(&Proc.new) if block_given?
       @routes
     end
 
@@ -472,8 +472,8 @@ module Rails
       paths = self.paths["config/routes"].existent
 
       if routes? || paths.any?
-        app.routes_reloader.blocks[routes] = routes_draw_block
         app.routes_reloader.paths.unshift(*paths)
+        app.routes_reloader.route_sets << routes
       end
     end
 
@@ -523,8 +523,6 @@ module Rails
     end
 
   protected
-    attr_accessor :routes_draw_block
-
     def routes?
       defined?(@routes)
     end
-- 
cgit v1.2.3


From 5826c1730720e8b11f7cc82831a1c76427e9ada2 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Fri, 8 Oct 2010 16:17:36 +0530
Subject: Remove the final initializers since initializers += will return it
 anyway. [#3892 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 railties/lib/rails/application.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 5559f49fbd..2c5d1661ff 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -131,7 +131,6 @@ module Rails
       initializers = Bootstrap.initializers_for(self)
       initializers += super
       initializers += Finisher.initializers_for(self)
-      initializers
     end
 
     def config
-- 
cgit v1.2.3


From e9793c60b6fc2a2d048d2d7cadb7f8d0db83110b Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 8 Oct 2010 12:58:24 -0200
Subject: Makes this code a bit more clear

---
 railties/lib/rails/application.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 2c5d1661ff..d13356ab4d 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -128,9 +128,9 @@ module Rails
     end
 
     def initializers
-      initializers = Bootstrap.initializers_for(self)
-      initializers += super
-      initializers += Finisher.initializers_for(self)
+      Bootstrap.initializers_for(self) +
+      super +
+      Finisher.initializers_for(self)
     end
 
     def config
-- 
cgit v1.2.3


From b439c145164237cd8102f39f64e889a4d1df9334 Mon Sep 17 00:00:00 2001
From: Juan Maiz <juanmaiz@gmail.com>
Date: Fri, 8 Oct 2010 10:58:09 -0300
Subject: Fixing two minor errors in Rails::Generators::Actions initializer
 method comments

[#5771 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 railties/lib/rails/generators/actions.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 8f0d5ffff4..378c07cb0e 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -187,8 +187,8 @@ module Rails
       #   initializer("globals.rb") do
       #     data = ""
       #
-      #     ['MY_WORK', 'ADMINS', 'BEST_COMPANY_EVAR'].each do
-      #       data << "#{const} = :entp"
+      #     ['MY_WORK', 'ADMINS', 'BEST_COMPANY_EVAR'].each do |const|
+      #       data << "#{const} = :entp\n"
       #     end
       #
       #     data
-- 
cgit v1.2.3


From 5d5eb2b18d364cb27d2062668bd3b1921b1040a8 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sat, 9 Oct 2010 20:59:20 +0200
Subject: Rename namespace method to isolate_namespace.

This change caused by confusion caused by calling engine
"namespaced". Stuff inside engine can be namespaced for every
engine. This method is not actually namespacing anything, it's
isolating engine within the given namespace.
---
 railties/lib/rails/engine.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index f8caaef213..909840da04 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -214,11 +214,11 @@ module Rails
   # as they would be created inside application. One of the cosequences of that is including
   # application's helpers and url_helpers inside controller. Sometimes, especially when your
   # engine provides its own routes, you don't want that. To isolate engine's stuff from application
-  # you can use namespace method:
+  # you can use isolate_namespace method:
   #
   #   module MyEngine
   #     class Engine < Rails::Engine
-  #       namespace MyEngine
+  #       isolate_namespace MyEngine
   #     end
   #   end
   #
@@ -252,7 +252,7 @@ module Rails
   #   end
   #
   #
-  # Additionaly namespaced engine will set its name according to namespace, so in that case:
+  # Additionaly isolated engine will set its name according to namespace, so in that case:
   # MyEngine::Engine.engine_name #=> "my_engine" and it will set MyEngine.table_name_prefix
   # to "my_engine_".
   #
@@ -315,7 +315,7 @@ module Rails
     autoload :Configuration, "rails/engine/configuration"
 
     class << self
-      attr_accessor :called_from, :namespaced
+      attr_accessor :called_from, :isolated
       alias :engine_name :railtie_name
 
       def inherited(base)
@@ -350,12 +350,12 @@ module Rails
         @endpoint
       end
 
-      def namespace(mod)
+      def isolate_namespace(mod)
         engine_name(generate_railtie_name(mod))
 
         name = engine_name
         self.routes.default_scope = {:module => name}
-        self.namespaced = true
+        self.isolated = true
 
         unless mod.respond_to?(:_railtie)
           _railtie = self
@@ -371,13 +371,13 @@ module Rails
         end
       end
 
-      def namespaced?
-        !!namespaced
+      def isolated?
+        !!isolated
       end
     end
 
     delegate :middleware, :root, :paths, :to => :config
-    delegate :engine_name, :namespaced?, :to => "self.class"
+    delegate :engine_name, :isolated?, :to => "self.class"
 
     def load_tasks
       super
@@ -506,7 +506,7 @@ module Rails
     end
 
     initializer :prepend_helpers_path do |app|
-      if !namespaced? || (app == self)
+      if !isolated? || (app == self)
         app.config.helpers_paths.unshift(*paths["app/helpers"].existent)
       end
     end
-- 
cgit v1.2.3


From b417cfbf01a17be7216d09e447f37bf1c19e4cb2 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sat, 9 Oct 2010 20:11:36 +0200
Subject: Load rake tasks defined in superclasses in context of railties

---
 railties/lib/rails/railtie.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 2b68a3c453..c76bc83377 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -191,6 +191,13 @@ module Rails
 
     def load_tasks
       self.class.rake_tasks.each(&:call)
+
+      # load also tasks from all superclasses
+      klass = self.class.superclass
+      while klass.respond_to?(:rake_tasks)
+        klass.rake_tasks.each { |t| self.instance_exec(&t) }
+        klass = klass.superclass
+      end
     end
 
     def load_generators
-- 
cgit v1.2.3


From a9bf91ea5640ab9ed9d6d7ba9da780ea1dfbd6e3 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sat, 9 Oct 2010 20:15:45 +0200
Subject: Add 'foo:install:migrations' task to copy migrations from foo engine

---
 railties/lib/rails/engine.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 909840da04..4acebb4769 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -522,6 +522,20 @@ module Rails
       # consistently executed after all the initializers above across all engines.
     end
 
+    rake_tasks do
+      next if self.is_a?(Rails::Application)
+
+      namespace railtie_name do
+        namespace :install do
+          desc "Copy migrations from #{railtie_name} to application"
+          task :migrations do
+            ENV["FROM"] = railtie_name
+            Rake::Task["railties:install:migrations"].invoke
+          end
+        end
+      end
+    end
+
   protected
     def routes?
       defined?(@routes)
-- 
cgit v1.2.3


From ab2f2b22a6d0656f719c294d40e35d21c752ba8c Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Fri, 8 Oct 2010 18:16:40 +0530
Subject: prevent rake test to run the test suite three times when ENV['TEST']
 is set [#3572 state:resolved]

Signed-off-by: Xavier Noria <fxn@hashref.com>
---
 railties/lib/rails/test_unit/testing.rake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 713833f884..28dc40379b 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -73,7 +73,8 @@ end
 
 desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile, test:plugins)'
 task :test do
-  errors = %w(test:units test:functionals test:integration).collect do |task|
+  tests_to_run = ENV['TEST'] ? ["test:single"] : %w(test:units test:functionals test:integration)
+  errors = tests_to_run.collect do |task|
     begin
       Rake::Task[task].invoke
       nil
@@ -123,6 +124,10 @@ namespace :test do
   end
   Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
+  Rake::TestTask.new(:single => "test:prepare") do |t|
+    t.libs << "test"
+  end
+
   TestTaskWithoutDescription.new(:units => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/unit/**/*_test.rb'
-- 
cgit v1.2.3


From 7d081162222e5334fe42a7fbc07354aa4f5e5d50 Mon Sep 17 00:00:00 2001
From: Utkarsh Kukreti <utkarshkukreti@gmail.com>
Date: Wed, 8 Sep 2010 00:00:10 +0530
Subject: Fix typo 'configation' [#5575 state:resolved]

---
 .../rails/generators/rails/app/templates/config/databases/oracle.yml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
index fddf8b8144..b661a60389 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
@@ -10,7 +10,7 @@
 #
 # By default prefetch_rows (OCI_ATTR_PREFETCH_ROWS) is set to 100. And
 # until true bind variables are supported, cursor_sharing is set by default
-# to 'similar'. Both can be changed in the configation below; the defaults
+# to 'similar'. Both can be changed in the configuration below; the defaults
 # are equivalent to specifying:
 #
 #  prefetch_rows: 100
-- 
cgit v1.2.3


From a8b1780410a86be58ac0f341ae6b079800783fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 11 Oct 2010 10:29:31 +0200
Subject: Updated DOCS for engines and added a couple TODOs. Also, commented
 internal railties rake tasks description.

---
 railties/lib/rails/engine.rb           | 82 ++++++++++++++++++++--------------
 railties/lib/rails/tasks/railties.rake |  2 +-
 2 files changed, 49 insertions(+), 35 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 4acebb4769..e9ce9610b8 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -77,14 +77,14 @@ module Rails
   # you need to do is:
   #
   #   class MyEngine < Rails::Engine
-  #     paths.app.controllers = "lib/controllers"
+  #     paths["app/controllers"] = "lib/controllers"
   #   end
   #
   # You can also have your controllers being loaded from both "app/controllers" and
   # "lib/controllers":
   #
   #   class MyEngine < Rails::Engine
-  #     paths.app.controllers << "lib/controllers"
+  #     paths["app/controllers"] << "lib/controllers"
   #   end
   #
   # The available paths in an Engine are:
@@ -185,19 +185,21 @@ module Rails
   # == Serving static files
   #
   # By default, rails use ActionDispatch::Static to serve static files in development mode. This is ok
-  # while you develop your application, but when you want to deploy it, assets from engine will not be served.
+  # while you develop your application, but when you want to deploy it, assets from engine will not be
+  # served by default. You should choose one of the two following strategies:
   #
-  # You can fix it in one of two ways:
   # * enable serving static files by setting config.serve_static_assets to true
   # * symlink engines' public directories in application's public directory by running
-  #   `rake railties:create_symlinks`
+  #   `rake ENGINE_NAME:install:assets`, where ENGINE_NAME is usually my_engine for the
+  #   examples above
   #
   # == Engine name
   #
   # There are some places where engine's name is used.
+  #
   # * routes: when you mount engine with mount(MyEngine::Engine => '/my_engine'), it's used as default :as option
-  # * migrations: when you copy engine's migrations, they will be decorated with suffix based on engine_name, for example:
-  #   2010010203121314_create_users.my_engine.rb
+  #
+  # * rake tasks: engines have a few rake tasks. They are usually under my_engine namespace.
   #
   # Engine name is set by default based on class name. For MyEngine::Engine it will be my_engine_engine.
   # You can change it manually it manually using engine_name method:
@@ -210,11 +212,13 @@ module Rails
   #
   # == Namespaced Engine
   #
-  # Normally, when you create controllers, helpers and models inside engine, they are treated
-  # as they would be created inside application. One of the cosequences of that is including
-  # application's helpers and url_helpers inside controller. Sometimes, especially when your
-  # engine provides its own routes, you don't want that. To isolate engine's stuff from application
-  # you can use isolate_namespace method:
+  # Normally when you create controllers, helpers and models inside engine, they are treated
+  # as they were created inside the application. This means all applications helpers and named routes
+  # will be available to your engine controllers.
+  #
+  # However, sometimes you want to isolate your engine from the application, specially if your engine
+  # have its own router. To do that, you simply need to call +isolate_namespace+. This method requires
+  # you to pass a module where all your controllers, helpers and models should be nested to:
   #
   #   module MyEngine
   #     class Engine < Rails::Engine
@@ -235,15 +239,21 @@ module Rails
   # url_helpers from MyEngine::Engine.routes.
   #
   # The next thing that changes in isolated engine is routes behaviour. Normally, when you namespace
-  # your controllers, you need to use scope or namespace method in routes. With isolated engine,
-  # the namespace is applied by default, so you can ignore it in routes. Further more, you don't need
-  # to use longer url helpers like "my_engine_articles_path". As the prefix is not set you can just use
-  # articles_path as you would normally do.
+  # your controllers, you also need to do namespace all your routes. With isolated engine,
+  # the namespace is applied by default, so you can ignore it in routes:
+  #
+  #   MyEngine::Engine.routes.draw do
+  #     resources :articles
+  #   end
+  # 
+  # The routes above will automatically point to MyEngine::ApplicationContoller. Further more, you don't
+  # need to use longer url helpers like "my_engine_articles_path". Instead, you shuold simply use
+  # articles_path as you would do with your application.
   #
   # To make that behaviour consistent with other parts of framework, isolated engine has influence also on
   # ActiveModel::Naming. When you use namespaced model, like MyEngine::Article, it will normally
-  # use the prefix "my_engine". In isolated engine, the prefix will be ommited in most of the places,
-  # like url helpers or form fields.
+  # use the prefix "my_engine". In isolated engine, the prefix will be ommited in url helpers and
+  # form fields for convenience.
   #
   #   polymorphic_url(MyEngine::Article.new) #=> "articles_path"
   #
@@ -251,16 +261,15 @@ module Rails
   #     text_field :title #=> <input type="text" name="article[title]" id="article_title" />
   #   end
   #
-  #
-  # Additionaly isolated engine will set its name according to namespace, so in that case:
-  # MyEngine::Engine.engine_name #=> "my_engine" and it will set MyEngine.table_name_prefix
-  # to "my_engine_".
+  # Additionaly isolated engine will set its name according to namespace, so
+  # MyEngine::Engine.engine_name #=> "my_engine". It will also set MyEngine.table_name_prefix
+  # to "my_engine_", changing MyEngine::Article model to use my_engine_article table.
   #
   # == Using Engine's routes outside Engine
   #
-  # Since you can mount engine inside application's routes now, you do not have direct access to engine's
-  # url_helpers inside application. When you mount Engine in application's routes special helper is
-  # created to allow doing that. Consider such scenario:
+  # Since now you can mount engine inside application's routes, you do not have direct access to engine's
+  # url_helpers inside application. When you mount Engine in application's routes, a special helper is
+  # created to allow you to do that. Consider such scenario:
   #
   #   # APP/config/routes.rb
   #   MyApplication::Application.routes.draw do
@@ -268,7 +277,7 @@ module Rails
   #     match "/foo" => "foo#index"
   #   end
   #
-  # Now, you can use my_engine helper:
+  # Now, you can use my_engine helper inside your application:
   #
   #   class FooController < ApplicationController
   #     def index
@@ -280,20 +289,23 @@ module Rails
   #
   #   module MyEngine
   #     class BarController
-  #       main_app.foo_path #=> /foo
+  #       def index
+  #         main_app.foo_path #=> /foo
+  #       end
   #     end
   #   end
   #
-  # Note that :as option takes engine_name as default, so most of the time you can ommit it.
-  #
-  # If you want to generate url to engine's route using polymorphic_url, you can also use that helpers.
+  # Note that the :as option given to mount takes the engine_name as default, so most of the time
+  # you can simply ommit it.
   #
-  # Let's say that you want to create a form pointing to one of the engine's routes. All you need to do
-  # is passing helper as the first element in array with attributes for url:
+  # Finally, if you want to generate url to engine's route using polymorphic_url, you also need
+  # to pass the engine helper. Let's say that you want to create a form pointing to one of the
+  # engine's routes. All you need to do is pass the helper as the first element in array with
+  # attributes for url:
   #
   # form_for([my_engine, @user])
   #
-  # This code will use my_engine.user_path(@user) to generate proper route.
+  # This code will use my_engine.user_path(@user) to generate the proper route.
   #
   # == Migrations & seed data
   #
@@ -303,7 +315,7 @@ module Rails
   # To use engine's migrations in application you can use rake task, which copies them to
   # application's dir:
   #
-  #   rake railties:copy_migrations
+  #   rake ENGINE_NAME:install:migrations
   #
   # If your engine has migrations, you may also want to prepare data for the database in
   # seeds.rb file. You can load that data using load_seed method, e.g.
@@ -527,6 +539,8 @@ module Rails
 
       namespace railtie_name do
         namespace :install do
+          # TODO Add assets copying to this list
+          # TODO Skip this if there is no paths["db/migrate"] for the engine
           desc "Copy migrations from #{railtie_name} to application"
           task :migrations do
             ENV["FROM"] = railtie_name
diff --git a/railties/lib/rails/tasks/railties.rake b/railties/lib/rails/tasks/railties.rake
index 0c1ee0f17a..e08bd9687d 100644
--- a/railties/lib/rails/tasks/railties.rake
+++ b/railties/lib/rails/tasks/railties.rake
@@ -1,5 +1,5 @@
 namespace :railties do
-  desc "Create symlinks to railties public directories in application's public directory."
+  # desc "Create symlinks to railties public directories in application's public directory."
   task :create_symlinks => :environment do
     paths = Rails.application.config.static_asset_paths.dup
     app_public_path = Rails.application.paths["public"].first
-- 
cgit v1.2.3