Merge branch 'master' of github.com:lifo/docrails

18 files changed, 113 insertions, 23 deletions

diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb
index 6c9c53fc69..2e83c0fe14 100644
--- a/railties/lib/rails/all.rb
+++ b/railties/lib/rails/all.rb
@@ -3,6 +3,7 @@ require "rails"
 %w(
   active_record
   action_controller
+  action_view
   action_mailer
   rails/test_unit
   sprockets
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 8000fc3b1e..f25f629aa5 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -102,7 +102,7 @@ module Rails
   #     paths["config"]              # => ["config"]
   #     paths["config/initializers"] # => ["config/initializers"]
   #     paths["config/locales"]      # => ["config/locales"]
-  #     paths["config/routes"]       # => ["config/routes.rb"]
+  #     paths["config/routes.rb"]    # => ["config/routes.rb"]
   #   end
   #
   # The <tt>Application</tt> class adds a couple more paths to this set. And as in your
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 675ada7ed0..fb495c918c 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -37,6 +37,9 @@ module Rails
         class_option :skip_active_record, type: :boolean, aliases: '-O', default: false,
                                           desc: 'Skip Active Record files'
 
+        class_option :skip_action_view,   type: :boolean, aliases: '-V', default: false,
+                                          desc: 'Skip Action View files'
+
         class_option :skip_sprockets,     type: :boolean, aliases: '-S', default: false,
                                           desc: 'Skip Sprockets files'
 
@@ -123,7 +126,7 @@ module Rails
       end
 
       def include_all_railties?
-        !options[:skip_active_record] && !options[:skip_test_unit] && !options[:skip_sprockets]
+        !options[:skip_active_record] && !options[:skip_action_view] && !options[:skip_test_unit] && !options[:skip_sprockets]
       end
 
       def comment_if(value)
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 7e938fab47..8aec8bc8f9 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -168,15 +168,15 @@ module Rails
         as_hook = options.delete(:as) || generator_name
 
         names.each do |name|
-          defaults = if options[:type] == :boolean
-            { }
-          elsif [true, false].include?(default_value_for_option(name, options))
-            { banner: "" }
-          else
-            { desc: "#{name.to_s.humanize} to be invoked", banner: "NAME" }
-          end
-
           unless class_options.key?(name)
+            defaults = if options[:type] == :boolean
+              { }
+            elsif [true, false].include?(default_value_for_option(name, options))
+              { banner: "" }
+            else
+              { desc: "#{name.to_s.humanize} to be invoked", banner: "NAME" }
+            end
+
             class_option(name, defaults.merge!(options))
           end
 
@@ -255,12 +255,7 @@ module Rails
             # Split the class from its module nesting
             nesting = class_name.split('::')
             last_name = nesting.pop
-
-            # Extract the last Module in the nesting
-            last = nesting.inject(Object) do |last_module, nest|
-              break unless last_module.const_defined?(nest, false)
-              last_module.const_get(nest)
-            end
+            last = extract_last_module(nesting)
 
             if last && last.const_defined?(last_name.camelize, false)
               raise Error, "The name '#{class_name}' is either already used in your application " <<
@@ -270,6 +265,14 @@ module Rails
           end
         end
 
+        # Takes in an array of nested modules and extracts the last module
+        def extract_last_module(nesting)
+          nesting.inject(Object) do |last_module, nest|
+            break unless last_module.const_defined?(nest, false)
+            last_module.const_get(nest)
+          end
+        end
+
         # Use Rails default banner.
         def self.banner
           "rails generate #{namespace.sub(/^rails:/,'')} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]".gsub(/\s+/, ' ')
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
index 4a40ba654d..69c10efa47 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -21,13 +21,13 @@
     <%%= f.label :password_confirmation %><br>
     <%%= f.password_field :password_confirmation %>
 <% else -%>
-  <% if attribute.reference? -%>
+  <%- if attribute.reference? -%>
     <%%= f.label :<%= attribute.column_name %> %><br>
     <%%= f.<%= attribute.field_type %> :<%= attribute.column_name %> %>
-  <% else -%>
+  <%- else -%>
     <%%= f.label :<%= attribute.name %> %><br>
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
-  <% end -%>
+  <%- end -%>
 <% end -%>
   </div>
 <% end -%>
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 9fb8ea6955..041bfcb733 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -68,7 +68,7 @@ module Rails
       directory "bin" do |content|
         "#{shebang}\n" + content
       end
-      chmod "bin", 0755, verbose: false
+      chmod "bin", 0755 & ~File.umask, verbose: false
     end
 
     def config
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 4d474d5267..ac41a0cadb 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -8,6 +8,7 @@ require "active_model/railtie"
 <%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
+<%= comment_if :skip_action_view %>require "action_view/railtie"
 <%= comment_if :skip_sprockets %>require "sprockets/railtie"
 <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
 <% end -%>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb
index 310c975262..5508829f6b 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb
+++ b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb
@@ -7,6 +7,7 @@ require 'rails/all'
 <%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
+<%= comment_if :skip_action_view %>require "action_view/railtie"
 <%= comment_if :skip_sprockets %>require "sprockets/railtie"
 <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
 <% end -%>
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index 45968052a8..56b8736800 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -28,4 +28,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rake', '>= 0.8.7'
   s.add_dependency 'thor', '>= 0.18.1', '< 2.0'
+
+  s.add_development_dependency 'actionview', version
 end
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 491faf4af9..643cc6b0ee 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -8,6 +8,7 @@ require 'fileutils'
 
 require 'active_support'
 require 'action_controller'
+require 'action_view'
 require 'rails/all'
 
 module TestApp
diff --git a/railties/test/application/basic_rendering_test.rb b/railties/test/application/basic_rendering_test.rb
new file mode 100644
index 0000000000..00ba433a05
--- /dev/null
+++ b/railties/test/application/basic_rendering_test.rb
@@ -0,0 +1,62 @@
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class BasicRenderingTest < ActiveSupport::TestCase
+    include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
+
+    def setup
+      build_app
+    end
+
+    def teardown
+      teardown_app
+    end
+
+    test "Rendering without ActionView" do
+      gsub_app_file 'config/application.rb', "require 'rails/all'", <<-RUBY
+        require "active_model/railtie"
+        require "action_controller/railtie"
+      RUBY
+
+      # Turn off ActionView and jquery-rails (it depends on AV)
+      $:.reject! {|path| path =~ /(actionview|jquery\-rails)/ }
+      boot_rails
+
+      app_file 'app/controllers/pages_controller.rb', <<-RUBY
+        class PagesController < ApplicationController
+          def render_hello_world
+            render text: "Hello World!"
+          end
+
+          def render_nothing
+            render nothing: true
+          end
+
+          def no_render; end
+
+          def raise_error
+            render foo: "bar"
+          end
+        end
+      RUBY
+
+      get '/pages/render_hello_world'
+      assert_equal 200, last_response.status
+      assert_equal "Hello World!", last_response.body
+      assert_equal "text/plain; charset=utf-8", last_response.content_type
+
+      get '/pages/render_nothing'
+      assert_equal 200, last_response.status
+      assert_equal " ", last_response.body
+      assert_equal "text/plain; charset=utf-8", last_response.content_type
+
+      get '/pages/no_render'
+      assert_equal 500, last_response.status
+
+      get '/pages/raise_error'
+      assert_equal 500, last_response.status
+    end
+  end
+end
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index 2767779719..efbc853d7b 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -12,6 +12,7 @@ module ApplicationTests
       boot_rails
       require "rails"
       require "action_controller/railtie"
+      require "action_view/railtie"
 
       class MyApp < Rails::Application
         config.secret_key_base = "3b7cd727ee24e8444053437c36cc66c4"
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 42b6275932..2f0dfc7d3e 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -222,6 +222,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_generator_if_skip_action_view_is_given
+    run_generator [destination_root, "--skip-action-view"]
+    assert_file "config/application.rb", /#\s+require\s+["']action_view\/railtie["']/
+  end
+
   def test_generator_if_skip_sprockets_is_given
     run_generator [destination_root, "--skip-sprockets"]
     assert_file "config/application.rb" do |content|
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 7fdd54fc30..32a3d072c9 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -16,6 +16,7 @@ Rails.application.load_generators
 
 require 'active_record'
 require 'action_dispatch'
+require 'action_view'
 
 module GeneratorsTestHelper
   def self.included(base)
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index a4d8b3d1b0..e17925ff65 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -44,7 +44,7 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
     end
   end
 
-  def test_helpr_is_also_namespaced
+  def test_helper_is_also_namespaced
     run_generator
     assert_file "app/helpers/test_app/account_helper.rb", /module TestApp/, /  module AccountHelper/
     assert_file "test/helpers/test_app/account_helper_test.rb", /module TestApp/, /  class AccountHelperTest/
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 4b837da483..524bbde2b7 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -305,8 +305,8 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     end
 
     assert_file "app/views/accounts/_form.html.erb" do |content|
-      assert_match(/<%= f\.text_field :name %>/, content)
-      assert_match(/<%= f\.text_field :currency_id %>/, content)
+      assert_match(/^\W{4}<%= f\.text_field :name %>/, content)
+      assert_match(/^\W{4}<%= f\.text_field :currency_id %>/, content)
     end
   end
 
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index a3295a6e69..913e2b5e29 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -135,6 +135,7 @@ module TestHelpers
     def make_basic_app
       require "rails"
       require "action_controller/railtie"
+      require "action_view/railtie"
 
       app = Class.new(Rails::Application)
       app.config.eager_load = false
@@ -242,6 +243,12 @@ module TestHelpers
       end
     end
 
+    def gsub_app_file(path, regexp, *args, &block)
+      path = "#{app_path}/#{path}"
+      content = File.read(path).gsub(regexp, *args, &block)
+      File.open(path, 'wb') { |f| f.write(content) }
+    end
+
     def remove_file(path)
       FileUtils.rm_rf "#{app_path}/#{path}"
     end
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index a9b237d0a5..e45a5228a1 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,5 +1,7 @@
 require 'abstract_unit'
 
+ActionController::Base.superclass.send(:include, ActionView::Layouts)
+
 module ActionController
   class Base
     include ActionController::Testing