Blog -> Blog::Application. Leave the toplevel module up for grabs.

railties/lib/rails/generators/rails/app/app_generator.rb

@@ -182,7 +182,7 @@ module Rails::Generators
       end
 
       def app_const
-        @app_const ||= app_name.classify
+        @app_const ||= "#{app_name.classify}::Application"
       end
 
       def app_secret

railties/lib/rails/generators/rails/app/templates/config/application.rb

@@ -1,41 +1,43 @@
 require File.expand_path('../boot', __FILE__)
 
-class <%= app_const %> < Rails::Application
-  # Settings in config/environments/* take precedence over those specified here.
-  # Application configuration should go into files in config/initializers
-  # -- all .rb files in that directory are automatically loaded.
+module <%= app_name.classify %>
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
 
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{root}/extras )
+    # Add additional load paths for your own custom dirs
+    # config.load_paths += %W( #{root}/extras )
 
-  # Only load the plugins named here, in the order given (default is alphabetical).
-  # :all can be used as a placeholder for all plugins not explicitly named
-  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
 
-  # Skip frameworks you're not going to use. To use Rails without a database,
-  # you must remove the Active Record framework.
+    # Skip frameworks you're not going to use. To use Rails without a database,
+    # you must remove the Active Record framework.
 <% if  options[:skip_activerecord] -%>
-  config.frameworks -= [ :active_record ]
+    config.frameworks -= [ :active_record ]
 <% else -%>
-  # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
+    # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
 
-  # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+    # Activate observers that should always be running
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
 <% end  -%>
 
-  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-  # Run "rake -D time" for a list of tasks for finding time zone names.
-  config.time_zone = 'UTC'
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names.
+    config.time_zone = 'UTC'
 
-  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
+    # config.i18n.default_locale = :de
 
-  # Configure generators values. Many other options are available, be sure to
-  # check the documentation.
-  # config.generators do |g|
-  #   g.orm             :active_record
-  #   g.template_engine :erb
-  #   g.test_framework  :test_unit, :fixture => true
-  # end
+    # Configure generators values. Many other options are available, be sure to
+    # check the documentation.
+    # config.generators do |g|
+    #   g.orm             :active_record
+    #   g.template_engine :erb
+    #   g.test_framework  :test_unit, :fixture => true
+    # end
+  end
 end

railties/test/application/configuration_test.rb

@@ -60,7 +60,7 @@ module ApplicationTests
       RUBY
 
       require "#{app_path}/config/application"
-      assert AppTemplate.configuration.action_controller.allow_concurrency
+      assert AppTemplate::Application.configuration.action_controller.allow_concurrency
     end
 
     test "the application can be marked as threadsafe when there are no frameworks" do

railties/test/isolation/abstract_unit.rb

@@ -135,7 +135,7 @@ module TestHelpers
 
     def add_to_config(str)
       environment = File.read("#{app_path}/config/application.rb")
-      if environment =~ /(\n\s*end\s*)\Z/
+      if environment =~ /(\n\s*end\s*end\s*)\Z/
         File.open("#{app_path}/config/application.rb", 'w') do |f|
           f.puts $` + "\n#{str}\n" + $1
         end

railties/test/plugins/configuration_test.rb

@@ -21,7 +21,7 @@ module PluginsTest
     test "plugin configurations are available in the application" do
       class Foo < Rails::Plugin ; config.foo.greetings = "hello" ; end
       require "#{app_path}/config/application"
-      assert_equal "hello", AppTemplate.config.foo.greetings
+      assert_equal "hello", AppTemplate::Application.config.foo.greetings
     end
 
     test "plugin config merges are deep" do
@@ -33,4 +33,4 @@ module PluginsTest
       assert_equal "bar",   MyApp.config.foo.bar
     end
   end
-end
+end