railties 3.2.22.5 → 4.0.0.beta1

data/lib/rails/generators/test_unit.rb

@@ -1,8 +1,8 @@
 require 'rails/generators/named_base'
 
-module TestUnit
-  module Generators
-    class Base < Rails::Generators::NamedBase #:nodoc:
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class Base < Rails::Generators::NamedBase # :nodoc:
     end
   end
 end

data/lib/rails/generators/test_unit/controller/controller_generator.rb

@@ -1,14 +1,14 @@
 require 'rails/generators/test_unit'
 
-module TestUnit
-  module Generators
-    class ControllerGenerator < Base
-      argument :actions, :type => :array, :default => [], :banner => "action action"
-      check_class_collision :suffix => "ControllerTest"
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class ControllerGenerator < Base # :nodoc:
+      argument :actions, type: :array, default: [], banner: "action action"
+      check_class_collision suffix: "ControllerTest"
 
       def create_test_files
         template 'functional_test.rb',
-                 File.join('test/functional', class_path, "#{file_name}_controller_test.rb")
+                 File.join('test/controllers', class_path, "#{file_name}_controller_test.rb")
       end
     end
   end

data/lib/rails/generators/test_unit/helper/helper_generator.rb

@@ -1,12 +1,12 @@
 require 'rails/generators/test_unit'
 
-module TestUnit
-  module Generators
-    class HelperGenerator < Base
-      check_class_collision :suffix => "HelperTest"
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class HelperGenerator < Base # :nodoc:
+      check_class_collision suffix: "HelperTest"
 
       def create_helper_files
-        template 'helper_test.rb', File.join('test/unit/helpers', class_path, "#{file_name}_helper_test.rb")
+        template 'helper_test.rb', File.join('test/helpers', class_path, "#{file_name}_helper_test.rb")
       end
     end
   end

data/lib/rails/generators/test_unit/integration/integration_generator.rb

@@ -1,9 +1,9 @@
 require 'rails/generators/test_unit'
 
-module TestUnit
-  module Generators
-    class IntegrationGenerator < Base
-      check_class_collision :suffix => "Test"
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class IntegrationGenerator < Base # :nodoc:
+      check_class_collision suffix: "Test"
 
       def create_test_files
         template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")

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

@@ -1,13 +1,13 @@
 require 'rails/generators/test_unit'
 
-module TestUnit
-  module Generators
-    class MailerGenerator < Base
-      argument :actions, :type => :array, :default => [], :banner => "method method"
-      check_class_collision :suffix => "Test"
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class MailerGenerator < Base # :nodoc:
+      argument :actions, type: :array, default: [], banner: "method method"
+      check_class_collision suffix: "Test"
 
       def create_test_files
-        template "functional_test.rb", File.join('test/functional', class_path, "#{file_name}_test.rb")
+        template "functional_test.rb", File.join('test/mailers', class_path, "#{file_name}_test.rb")
       end
     end
   end

data/lib/rails/generators/test_unit/model/model_generator.rb

@@ -1,18 +1,18 @@
 require 'rails/generators/test_unit'
 
-module TestUnit
-  module Generators
-    class ModelGenerator < Base
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class ModelGenerator < Base # :nodoc:
 
       RESERVED_YAML_KEYWORDS = %w(y yes n no true false on off null)
 
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-      class_option :fixture, :type => :boolean
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+      class_option :fixture, type: :boolean
 
-      check_class_collision :suffix => "Test"
+      check_class_collision suffix: "Test"
 
       def create_test_file
-        template 'unit_test.rb', File.join('test/unit', class_path, "#{file_name}_test.rb")
+        template 'unit_test.rb', File.join('test/models', class_path, "#{file_name}_test.rb")
       end
 
       hook_for :fixture_replacement

data/lib/rails/generators/test_unit/model/templates/fixtures.yml

@@ -3,12 +3,18 @@
 <% unless attributes.empty? -%>
 one:
 <% attributes.each do |attribute| -%>
-  <%= yaml_key_value(attribute.name, attribute.default) %>
+  <%= yaml_key_value(attribute.column_name, attribute.default) %>
+  <%- if attribute.polymorphic? -%>
+  <%= yaml_key_value("#{attribute.name}_type", attribute.human_name) %>
+  <%- end -%>
 <% end -%>
 
 two:
 <% attributes.each do |attribute| -%>
-  <%= yaml_key_value(attribute.name, attribute.default) %>
+  <%= yaml_key_value(attribute.column_name, attribute.default) %>
+  <%- if attribute.polymorphic? -%>
+  <%= yaml_key_value("#{attribute.name}_type", attribute.human_name) %>
+  <%- end -%>
 <% end -%>
 <% else -%>
 # This model initially had no columns defined.  If you add columns to the

data/lib/rails/generators/test_unit/plugin/plugin_generator.rb

@@ -1,9 +1,9 @@
 require 'rails/generators/test_unit'
 
-module TestUnit
-  module Generators
-    class PluginGenerator < Base
-      check_class_collision :suffix => "Test"
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class PluginGenerator < Base # :nodoc:
+      check_class_collision suffix: "Test"
 
       def create_test_files
         directory '.', 'test'

data/lib/rails/generators/test_unit/plugin/templates/test_helper.rb

@@ -1,3 +1,2 @@
-require 'rubygems'
-require 'test/unit'
+require 'active_support/testing/autorun'
 require 'active_support'

data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb

@@ -1,38 +1,29 @@
 require 'rails/generators/test_unit'
 require 'rails/generators/resource_helpers'
 
-module TestUnit
-  module Generators
-    class ScaffoldGenerator < Base
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class ScaffoldGenerator < Base # :nodoc:
       include Rails::Generators::ResourceHelpers
 
-      check_class_collision :suffix => "ControllerTest"
+      check_class_collision suffix: "ControllerTest"
 
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_test_files
-        template 'functional_test.rb',
-                 File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb")
+        template "functional_test.rb",
+                 File.join("test/controllers", controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
 
       private
 
-        def resource_attributes
-          key_value singular_table_name, "{ #{attributes_hash} }"
-        end
-
         def attributes_hash
-          return if accessible_attributes.empty?
+          return if attributes_names.empty?
 
-          accessible_attributes.map do |a|
-            name = a.name
-            key_value name, "@#{singular_table_name}.#{name}"
+          attributes_names.map do |name|
+            "#{name}: @#{singular_table_name}.#{name}"
           end.sort.join(', ')
         end
-
-        def accessible_attributes
-          attributes.reject(&:reference?)
-        end
     end
   end
 end

data/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb

@@ -19,30 +19,30 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
 
   test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= resource_attributes %>
+      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     end
 
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, <%= key_value :id, "@#{singular_table_name}" %>
+    get :show, id: <%= "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
+    get :edit, id: <%= "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= resource_attributes %>
+    patch :update, id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
+      delete :destroy, id: <%= "@#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path

data/lib/rails/info.rb

@@ -23,7 +23,7 @@ module Rails
       end
 
       def frameworks
-        %w( active_record action_pack active_resource action_mailer active_support )
+        %w( active_record action_pack action_mailer active_support )
       end
 
       def framework_version(framework)
@@ -46,7 +46,7 @@ module Rails
       alias inspect to_s
 
       def to_html
-        (table = '<table>').tap do
+        '<table>'.tap do |table|
           properties.each do |(name, value)|
             table << %(<tr><td class="name">#{CGI.escapeHTML(name.to_s)}</td>)
             formatted_value = if value.kind_of?(Array)
@@ -83,7 +83,7 @@ module Rails
     end
 
     # Versions of each Rails framework (Active Record, Action Pack,
-    # Active Resource, Action Mailer, and Active Support).
+    # Action Mailer, and Active Support).
     frameworks.each do |framework|
       property "#{framework.titlecase} version" do
         framework_version(framework)

data/lib/rails/info_controller.rb

@@ -1,15 +1,33 @@
-class Rails::InfoController < ActionController::Base
+require 'action_dispatch/routing/inspector'
+
+class Rails::InfoController < ActionController::Base # :nodoc:
+  self.view_paths = File.expand_path('../templates', __FILE__)
+  prepend_view_path ActionDispatch::DebugExceptions::RESCUES_TEMPLATE_PATH
+  layout -> { request.xhr? ? nil : 'application' }
+
+  before_filter :require_local!
+
+  def index
+    redirect_to action: :routes
+  end
+
   def properties
-    if consider_all_requests_local? || request.local?
-      render :inline => Rails::Info.to_html
-    else
-      render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => :forbidden
-    end
+    @info = Rails::Info.to_html
+  end
+
+  def routes
+    @routes_inspector = ActionDispatch::Routing::RoutesInspector.new(_routes.routes)
   end
 
   protected
 
-  def consider_all_requests_local?
-    Rails.application.config.consider_all_requests_local
+  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?
   end
 end

data/lib/rails/initializable.rb

@@ -2,7 +2,7 @@ require 'tsort'
 
 module Rails
   module Initializable
-    def self.included(base)
+    def self.included(base) #:nodoc:
       base.extend ClassMethods
     end
 
@@ -51,7 +51,7 @@ module Rails
 
     def run_initializers(group=:default, *args)
       return if instance_variable_defined?(:@ran)
-      initializers.tsort.each do |initializer|
+      initializers.tsort_each do |initializer|
         initializer.run(*args) if initializer.belongs_to?(group)
       end
       @ran = true

data/lib/rails/paths.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 module Rails
   module Paths
     # This object is an extended hash that behaves as root of the <tt>Rails::Paths</tt> system.
@@ -7,28 +5,28 @@ module Rails
     # paths by a Hash like API. It requires you to give a physical path on initialization.
     #
     #   root = Root.new "/rails"
-    #   root.add "app/controllers", :eager_load => true
+    #   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 +Rails::Paths::Path+ object back like below:
+    # This means we can get a <tt>Rails::Paths::Path</tt> 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:
+    # The +Path+ object is simply an enumerable and allows you to easily add extra paths:
     #
-    #   path.is_a?(Array) # => true
-    #   path.inspect      # => ["app/controllers"]
+    #   path.is_a?(Enumerable) # => true
+    #   path.to_ary.inspect    # => ["app/controllers"]
     #
     #   path << "lib/controllers"
-    #   path.inspect      # => ["app/controllers", "lib/controllers"]
+    #   path.to_ary.inspect    # => ["app/controllers", "lib/controllers"]
     #
     # Notice that when you add a path using +add+, the path object created already
     # 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"
+    #   root.add "config/routes", with: "config/routes.rb"
     #   root["config/routes"].inspect # => ["config/routes.rb"]
     #
     # The +add+ method accepts the following options as arguments:
@@ -43,25 +41,39 @@ module Rails
     #   root["app/controllers"].existent # => ["/rails/app/controllers"]
     #
     # Check the <tt>Rails::Paths::Path</tt> documentation for more information.
-    class Root < ::Hash
+    class Root
       attr_accessor :path
 
       def initialize(path)
-        raise "Argument should be a String of the physical root path" if path.is_a?(Array)
         @current = nil
         @path = path
-        @root = self
-        super()
+        @root = {}
       end
 
       def []=(path, value)
-        value = Path.new(self, path, value) unless value.is_a?(Path)
-        super(path, value)
+        glob = self[path] ? self[path].glob : nil
+        add(path, with: value, glob: glob)
+      end
+
+      def add(path, options = {})
+        with = Array(options.fetch(:with, path))
+        @root[path] = Path.new(self, path, with, options)
+      end
+
+      def [](path)
+        @root[path]
+      end
+
+      def values
+        @root.values
       end
 
-      def add(path, options={})
-        with = options[:with] || path
-        self[path] = Path.new(self, path, with, options)
+      def keys
+        @root.keys
+      end
+
+      def values_at(*list)
+        @root.values_at(*list)
       end
 
       def all_paths
@@ -100,14 +112,13 @@ module Rails
       end
     end
 
-    class Path < Array
-      attr_reader :path
-      attr_accessor :glob
+    class Path
+      include Enumerable
 
-      def initialize(root, current, *paths)
-        options = paths.last.is_a?(::Hash) ? paths.pop : {}
-        super(paths.flatten)
+      attr_accessor :glob
 
+      def initialize(root, current, paths, options = {})
+        @paths    = paths
         @current  = current
         @root     = root
         @glob     = options[:glob]
@@ -148,6 +159,27 @@ module Rails
         RUBY
       end
 
+      def each(&block)
+        @paths.each(&block)
+      end
+
+      def <<(path)
+        @paths << path
+      end
+      alias :push :<<
+
+      def concat(paths)
+        @paths.concat paths
+      end
+
+      def unshift(path)
+        @paths.unshift path
+      end
+
+      def to_ary
+        @paths
+      end
+
       # Expands all paths against the root and return all unique values.
       def expanded
         raise "You need to set a path root" unless @root.path
@@ -156,25 +188,9 @@ module Rails
         each do |p|
           path = File.expand_path(p, @root.path)
 
-          if @glob
-            if File.directory? path
-              result.concat expand_dir(path, @glob)
-            else
-              # FIXME: I think we can remove this branch, but I'm not sure.
-              # Say the filesystem has this file:
-              #
-              #   /tmp/foobar
-              #
-              # and someone adds this path:
-              #
-              #   /tmp/foo
-              #
-              # with a glob of "*", then this function will return
-              #
-              #   /tmp/foobar
-              #
-              # We need to figure out if that is desired behavior.
-              result.concat expand_file(path, @glob)
+          if @glob && File.directory?(path)
+            Dir.chdir(path) do
+              result.concat(Dir.glob(@glob).map { |file| File.join path, file }.sort)
             end
           else
             result << path
@@ -195,17 +211,6 @@ module Rails
       end
 
       alias to_a expanded
-
-      private
-      def expand_file(path, glob)
-        Dir[File.join(path, glob)].sort
-      end
-
-      def expand_dir(path, glob)
-        Dir.chdir(path) do
-          Dir.glob(@glob).map { |file| File.join path, file }.sort
-        end
-      end
     end
   end
 end