railties 4.0.13 → 4.1.0.beta1

data/lib/rails/generators/rails/{plugin_new → plugin}/templates/bin/rails.tt

@@ -3,9 +3,5 @@
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/<%= name -%>/engine', __FILE__)
 
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
 require 'rails/all'
 require 'rails/engine/commands'

data/lib/rails/generators/rails/{plugin_new → 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 -%>

data/lib/rails/generators/rails/{plugin_new → plugin}/templates/rails/stylesheets.css

@@ -5,9 +5,11 @@
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
  *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
  *
- *= require_self
  *= require_tree .
+ *= require_self
  */

data/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb

@@ -13,7 +13,7 @@ module Rails
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_controller_files
-        template "controller.rb", File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
+        template "controller.rb", File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
       end
 
       hook_for :template_engine, :test_framework, as: :scaffold

data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb

@@ -59,9 +59,9 @@ class <%= controller_class_name %>Controller < ApplicationController
     # Only allow a trusted parameter "white list" through.
     def <%= "#{singular_table_name}_params" %>
       <%- if attributes_names.empty? -%>
-      params[<%= ":#{singular_table_name}" %>]
+      params[:<%= singular_table_name %>]
       <%- else -%>
-      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+      params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
       <%- end -%>
     end
 end

data/lib/rails/generators/resource_helpers.rb

@@ -9,11 +9,19 @@ module Rails
 
       def self.included(base) #:nodoc:
         base.class_option :force_plural, type: :boolean, desc: "Forces the use of a plural ModelName"
+        base.class_option :model_name, type: :string, desc: "ModelName to be used"
       end
 
       # Set controller variables on initialization.
       def initialize(*args) #:nodoc:
         super
+        if options[:model_name]
+          controller_name = name
+          self.name = options[:model_name]
+          assign_names!(self.name)
+        else
+          controller_name = name
+        end
 
         if name == name.pluralize && name.singularize != name.pluralize && !options[:force_plural]
           unless ResourceHelpers.skip_warn
@@ -24,19 +32,26 @@ module Rails
           assign_names!(name)
         end
 
-        @controller_name = name.pluralize
+        assign_controller_names!(controller_name.pluralize)
       end
 
       protected
 
-        attr_reader :controller_name
+        attr_reader :controller_name, :controller_file_name
 
         def controller_class_path
-          class_path
+          if options[:model_name]
+            @controller_class_path
+          else
+            class_path
+          end
         end
 
-        def controller_file_name
-          @controller_file_name ||= file_name.pluralize
+        def assign_controller_names!(name)
+          @controller_name = name
+          @controller_class_path = name.include?('/') ? name.split('/') : name.split('::')
+          @controller_class_path.map! { |m| m.underscore }
+          @controller_file_name = @controller_class_path.pop
         end
 
         def controller_file_path

data/lib/rails/generators/test_unit/generator/generator_generator.rb

@@ -0,0 +1,26 @@
+require 'rails/generators/test_unit'
+
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class GeneratorGenerator < Base # :nodoc:
+      check_class_collision suffix: "GeneratorTest"
+
+      class_option :namespace, type: :boolean, default: true,
+                               desc: "Namespace generator under lib/generators/name"
+
+      def create_generator_files
+        template 'generator_test.rb', File.join('test/lib/generators', class_path, "#{file_name}_generator_test.rb")
+      end
+
+    protected
+
+      def generator_path
+        if options[:namespace]
+          File.join("generators", regular_class_path, file_name, "#{file_name}_generator")
+        else
+          File.join("generators", regular_class_path, "#{file_name}_generator")
+        end
+      end
+    end
+  end
+end

data/lib/rails/generators/test_unit/generator/templates/generator_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+require '<%= generator_path %>'
+
+<% module_namespacing do -%>
+class <%= class_name %>GeneratorTest < Rails::Generators::TestCase
+  tests <%= class_name %>Generator
+  destination Rails.root.join('tmp/generators')
+  setup :prepare_destination
+
+  # test "generator runs without errors" do
+  #   assert_nothing_raised do
+  #     run_generator ["arguments"]
+  #   end
+  # end
+end
+<% end -%>

data/lib/rails/generators/test_unit/mailer/mailer_generator.rb

@@ -4,11 +4,18 @@ module TestUnit # :nodoc:
   module Generators # :nodoc:
     class MailerGenerator < Base # :nodoc:
       argument :actions, type: :array, default: [], banner: "method method"
-      check_class_collision suffix: "Test"
+
+      def check_class_collision
+        class_collisions "#{class_name}Test", "#{class_name}Preview"
+      end
 
       def create_test_files
         template "functional_test.rb", File.join('test/mailers', class_path, "#{file_name}_test.rb")
       end
+
+      def create_preview_files
+        template "preview.rb", File.join('test/mailers/previews', class_path, "#{file_name}_preview.rb")
+      end
     end
   end
 end

data/lib/rails/generators/test_unit/mailer/templates/preview.rb

@@ -0,0 +1,11 @@
+<% module_namespacing do -%>
+class <%= class_name %>Preview < ActionMailer::Preview
+<% actions.each do |action| -%>
+
+  def <%= action %>
+    <%= class_name %>.<%= action %>
+  end
+<% end -%>
+
+end
+<% end -%>

data/lib/rails/generators/testing/assertions.rb

@@ -21,7 +21,7 @@ module Rails
         #     end
         #   end
         def assert_file(relative, *contents)
-          absolute = File.expand_path(relative, destination_root)
+          absolute = File.expand_path(relative, destination_root).shellescape
           assert File.exist?(absolute), "Expected file #{relative.inspect} to exist, but does not"
 
           read = File.read(absolute) if block_given? || !contents.empty?

data/lib/rails/generators/testing/behaviour.rb

@@ -61,11 +61,9 @@ module Rails
         # You can provide a configuration hash as second argument. This method returns the output
         # printed by the generator.
         def run_generator(args=self.default_arguments, config={})
-          without_thor_debug do
-            capture(:stdout) do
-              args += ['--skip-bundle'] unless args.include? '--dev'
-              self.generator_class.start(args, config.reverse_merge(destination_root: destination_root))
-            end
+          capture(:stdout) do
+            args += ['--skip-bundle'] unless args.include? '--dev'
+            self.generator_class.start(args, config.reverse_merge(destination_root: destination_root))
           end
         end
 
@@ -102,14 +100,6 @@ module Rails
             dirname, file_name = File.dirname(absolute), File.basename(absolute).sub(/\.rb$/, '')
             Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
           end
-
-          # TODO: remove this once Bundler 1.5.2 is released
-          def without_thor_debug # :nodoc:
-            thor_debug, ENV['THOR_DEBUG'] = ENV['THOR_DEBUG'], nil
-            yield
-          ensure
-            ENV['THOR_DEBUG'] = thor_debug
-          end
       end
     end
   end

data/lib/rails/info.rb

@@ -23,7 +23,7 @@ module Rails
       end
 
       def frameworks
-        %w( active_record action_pack action_mailer active_support )
+        %w( active_record action_pack action_view action_mailer active_support )
       end
 
       def framework_version(framework)
@@ -61,8 +61,10 @@ module Rails
       end
     end
 
-    # The Ruby version and platform, e.g. "1.8.2 (powerpc-darwin8.2.0)".
-    property 'Ruby version', "#{RUBY_VERSION} (#{RUBY_PLATFORM})"
+    # The Ruby version and platform, e.g. "2.0.0-p247 (x86_64-darwin12.4.0)".
+    property 'Ruby version' do
+      "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
+    end
 
     # The RubyGems version, if it's installed.
     property 'RubyGems version' do

data/lib/rails/info_controller.rb

@@ -1,9 +1,9 @@
+require 'rails/application_controller'
 require 'action_dispatch/routing/inspector'
 
-class Rails::InfoController < ActionController::Base # :nodoc:
-  self.view_paths = File.expand_path('../templates', __FILE__)
+class Rails::InfoController < Rails::ApplicationController # :nodoc:
   prepend_view_path ActionDispatch::DebugExceptions::RESCUES_TEMPLATE_PATH
-  layout -> { request.xhr? ? nil : 'application' }
+  layout -> { request.xhr? ? false : 'application' }
 
   before_filter :require_local!
 
@@ -13,21 +13,11 @@ class Rails::InfoController < ActionController::Base # :nodoc:
 
   def properties
     @info = Rails::Info.to_html
+    @page_title = 'Properties'
   end
 
   def routes
     @routes_inspector = ActionDispatch::Routing::RoutesInspector.new(_routes.routes)
-  end
-
-  protected
-
-  def require_local!
-    unless local_request?
-      render text: '<p>For security purposes, this information is only available to local requests.</p>', status: :forbidden
-    end
-  end
-
-  def local_request?
-    Rails.application.config.consider_all_requests_local || request.local?
+    @page_title = 'Routes'
   end
 end

data/lib/rails/mailers_controller.rb

@@ -0,0 +1,73 @@
+require 'rails/application_controller'
+
+class Rails::MailersController < Rails::ApplicationController # :nodoc:
+  prepend_view_path ActionDispatch::DebugExceptions::RESCUES_TEMPLATE_PATH
+
+  before_filter :require_local!
+  before_filter :find_preview, only: :preview
+
+  def index
+    @previews = ActionMailer::Preview.all
+    @page_title = "Mailer Previews"
+  end
+
+  def preview
+    if params[:path] == @preview.preview_name
+      @page_title = "Mailer Previews for #{@preview.preview_name}"
+      render action: 'mailer'
+    else
+      email = File.basename(params[:path])
+
+      if @preview.email_exists?(email)
+        @email = @preview.call(email)
+
+        if params[:part]
+          part_type = Mime::Type.lookup(params[:part])
+
+          if part = find_part(part_type)
+            response.content_type = part_type
+            render text: part.respond_to?(:decoded) ? part.decoded : part
+          else
+            raise AbstractController::ActionNotFound, "Email part '#{part_type}' not found in #{@preview.name}##{email}"
+          end
+        else
+          @part = find_preferred_part(request.format, Mime::HTML, Mime::TEXT)
+          render action: 'email', layout: false, formats: %w[html]
+        end
+      else
+        raise AbstractController::ActionNotFound, "Email '#{email}' not found in #{@preview.name}"
+      end
+    end
+  end
+
+  protected
+    def find_preview
+      candidates = []
+      params[:path].to_s.scan(%r{/|$}){ candidates << $` }
+      preview = candidates.detect{ |candidate| ActionMailer::Preview.exists?(candidate) }
+
+      if preview
+        @preview = ActionMailer::Preview.find(preview)
+      else
+        raise AbstractController::ActionNotFound, "Mailer preview '#{params[:path]}' not found"
+      end
+    end
+
+    def find_preferred_part(*formats)
+      if @email.multipart?
+        formats.each do |format|
+          return find_part(format) if @email.parts.any?{ |p| p.mime_type == format }
+        end
+      else
+        @email
+      end
+    end
+
+    def find_part(format)
+      if @email.multipart?
+        @email.parts.find{ |p| p.mime_type == format }
+      elsif @email.mime_type == format
+        @email
+      end
+    end
+end

data/lib/rails/paths.rb

@@ -81,34 +81,28 @@ module Rails
       end
 
       def autoload_once
-        filter_by(:autoload_once?)
+        filter_by { |p| p.autoload_once? }
       end
 
       def eager_load
-        filter_by(:eager_load?)
+        filter_by { |p| p.eager_load? }
       end
 
       def autoload_paths
-        filter_by(:autoload?)
+        filter_by { |p| p.autoload? }
       end
 
       def load_paths
-        filter_by(:load_path?)
+        filter_by { |p| p.load_path? }
       end
 
-    protected
+    private
 
-      def filter_by(constraint)
-        all = []
-        all_paths.each do |path|
-          if path.send(constraint)
-            paths  = path.existent
-            paths -= path.children.map { |p| p.send(constraint) ? [] : p.existent }.flatten
-            all.concat(paths)
-          end
-        end
-        all.uniq!
-        all
+      def filter_by(&block)
+        all_paths.find_all(&block).flat_map { |path|
+          paths = path.existent
+          paths - path.children.map { |p| yield(p) ? [] : p.existent }.flatten
+        }.uniq
       end
     end
 
@@ -130,8 +124,9 @@ module Rails
       end
 
       def children
-        keys = @root.keys.select { |k| k.include?(@current) }
-        keys.delete(@current)
+        keys = @root.keys.find_all { |k|
+          k.start_with?(@current) && k != @current
+        }
         @root.values_at(*keys.sort)
       end