railties 3.1.12 → 3.2.0.rc1

data/lib/rails/generators/rails/task/USAGE

@@ -0,0 +1,9 @@
+Description:
+    Stubs out a new Rake task. Pass the namespace name, and a list of tasks as arguments.
+
+    This generates a task file in lib/tasks.
+
+Example:
+    `rails generate task feeds fetch erase add`
+
+        Task:      lib/tasks/feeds.rake

data/lib/rails/generators/rails/task/task_generator.rb

@@ -0,0 +1,12 @@
+module Rails
+  module Generators
+    class TaskGenerator < NamedBase
+      argument :actions, :type => :array, :default => [], :banner => "action action"
+
+      def create_task_files
+        template 'task.rb', File.join('lib/tasks', "#{file_name}.rake")
+      end
+
+    end
+  end
+end

data/lib/rails/generators/rails/task/templates/task.rb

@@ -0,0 +1,8 @@
+namespace :<%= file_name %> do
+<% actions.each do |action| -%>
+  desc "TODO"
+  task :<%= action %> => :environment do
+  end
+
+<% end -%>
+end

data/lib/rails/generators/resource_helpers.rb

@@ -64,8 +64,8 @@ module Rails
             end
 
             begin
-              "#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize
-            rescue NameError => e
+              "#{options[:orm].to_s.camelize}::Generators::ActiveModel".constantize
+            rescue NameError
               Rails::Generators::ActiveModel
             end
           end
@@ -73,7 +73,7 @@ module Rails
 
         # Initialize ORM::Generators::ActiveModel to access instance methods.
         def orm_instance(name=singular_table_name)
-          @orm_instance ||= @orm_class.new(name)
+          @orm_instance ||= orm_class.new(name)
         end
     end
   end

data/lib/rails/generators/test_unit/integration/templates/integration_test.rb

@@ -1,8 +1,6 @@
 require 'test_helper'
 
 class <%= class_name %>Test < ActionDispatch::IntegrationTest
-  fixtures :all
-
   # test "the truth" do
   #   assert true
   # end

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

@@ -26,23 +26,23 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :show, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
     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}.to_param" %>
+      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path

data/lib/rails/paths.rb

@@ -2,39 +2,21 @@ require 'set'
 
 module Rails
   module Paths
-    module PathParent #:nodoc:
-      def method_missing(id, *args)
-        match = id.to_s.match(/^(.*)=$/)
-        full  = [@current, $1 || id].compact.join("/")
-
-        ActiveSupport::Deprecation.warn 'Accessing paths using dot style as in `config.paths.app.controller` is deprecated. Please use ' <<
-          '`config.paths["app/controller"]` style instead.'
-
-        if match || args.any?
-          @root[full] = Path.new(@root, full, *args)
-        elsif path = @root[full]
-          path
-        else
-          super
-        end
-      end
-    end
-
-    # This object is an extended hash that behaves as root of the Rails::Paths system.
+    # This object is an extended hash that behaves as root of the <tt>Rails::Paths</tt> 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 = Root.new "/rails"
     #   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:
+    # This means we can get a +Rails::Paths::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:
+    # The +Path+ object is simply an array and allows you to easily add extra paths:
     #
     #   path.is_a?(Array) # => true
     #   path.inspect      # => ["app/controllers"]
@@ -42,32 +24,30 @@ module Rails
     #   path << "lib/controllers"
     #   path.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,
+    # 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["config/routes"].inspect # => ["config/routes.rb"]
     #
-    # The #add method accepts the following options as arguments:
+    # The +add+ method accepts the following options as arguments:
     # eager_load, autoload, autoload_once and glob.
     #
-    # Finally, the Path object also provides a few helpers:
+    # Finally, the +Path+ object also provides a few helpers:
     #
-    #   root = Root.new
-    #   root.path = "/rails"
+    #   root = Root.new "/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.
+    # Check the <tt>Rails::Paths::Path</tt> documentation for more information.
     class Root < ::Hash
-      include PathParent
       attr_accessor :path
 
       def initialize(path)
-        raise if path.is_a?(Array)
+        raise "Argument should be a String of the physical root path" if path.is_a?(Array)
         @current = nil
         @path = path
         @root = self
@@ -121,8 +101,6 @@ module Rails
     end
 
     class Path < Array
-      include PathParent
-
       attr_reader :path
       attr_accessor :glob
 
@@ -198,11 +176,6 @@ module Rails
         expanded.select { |d| File.directory?(d) }
       end
 
-      def paths
-        ActiveSupport::Deprecation.warn "paths is deprecated. Please call expand instead."
-        expanded
-      end
-
       alias to_a expanded
     end
   end

data/lib/rails/rack/debugger.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/kernel/requires'
-
 module Rails
   module Rack
     class Debugger
@@ -8,11 +6,12 @@ module Rails
 
         ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
 
-        require_library_or_gem 'ruby-debug'
+        require 'ruby-debug'
+
         ::Debugger.start
         ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
         puts "=> Debugger enabled"
-      rescue Exception
+      rescue LoadError
         puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
         exit
       end

data/lib/rails/rack/logger.rb

@@ -1,32 +1,46 @@
 require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/object/blank'
 
 module Rails
   module Rack
     # Log the request started and flush all loggers after it.
     class Logger < ActiveSupport::LogSubscriber
-      def initialize(app)
-        @app = app
+      def initialize(app, tags=nil)
+        @app, @tags = app, tags.presence
       end
 
       def call(env)
-        before_dispatch(env)
-        @app.call(env)
-      ensure
-        after_dispatch(env)
+        if @tags
+          Rails.logger.tagged(compute_tags(env)) { call_app(env) }
+        else
+          call_app(env)
+        end
       end
 
     protected
 
-      def before_dispatch(env)
+      def call_app(env)
         request = ActionDispatch::Request.new(env)
         path = request.filtered_path
-
-        info "\n\nStarted #{request.request_method} \"#{path}\" " \
-             "for #{request.ip} at #{Time.now.to_default_s}"
+        Rails.logger.info "\n\nStarted #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
+        @app.call(env)
+      ensure
+        ActiveSupport::LogSubscriber.flush_all!
       end
 
-      def after_dispatch(env)
-        ActiveSupport::LogSubscriber.flush_all!
+      def compute_tags(env)
+        request = ActionDispatch::Request.new(env)
+
+        @tags.collect do |tag|
+          case tag
+          when Proc
+            tag.call(request)
+          when Symbol
+            request.send(tag)
+          else
+            tag
+          end
+        end
       end
     end
   end

data/lib/rails/railtie.rb

@@ -1,6 +1,7 @@
 require 'rails/initializable'
 require 'rails/configuration'
 require 'active_support/inflector'
+require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/module/delegation'
 
 module Rails
@@ -180,7 +181,7 @@ module Rails
 
     def load_tasks(app=self)
       extend Rake::DSL if defined? Rake::DSL
-      self.class.rake_tasks.each { |block| block.call(app) }
+      self.class.rake_tasks.each { |block| self.instance_exec(app, &block) }
 
       # load also tasks from all superclasses
       klass = self.class.superclass
@@ -193,5 +194,9 @@ module Rails
     def load_generators(app=self)
       self.class.generators.each { |block| block.call(app) }
     end
+
+    def railtie_namespace
+      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:railtie_namespace) }
+    end
   end
 end

data/lib/rails/railtie/configuration.rb

@@ -7,6 +7,18 @@ module Rails
         @@options ||= {}
       end
 
+      # Add files that should be watched for change.
+      def watchable_files
+        @@watchable_files ||= []
+      end
+
+      # Add directories that should be watched for change.
+      # The key of the hashes should be directories and the values should
+      # be an array of extensions to match in each directory.
+      def watchable_dirs
+        @@watchable_dirs ||= {}
+      end
+
       # This allows you to modify the application's middlewares from Engines.
       #
       # All operations you run on the app_middleware will be replayed on the
@@ -26,11 +38,6 @@ module Rails
         @@app_generators
       end
 
-      def generators(&block) #:nodoc
-        ActiveSupport::Deprecation.warn "config.generators in Rails::Railtie is deprecated. Please use config.app_generators instead."
-        app_generators(&block)
-      end
-
       # First configurable block to run. Called before any initializers are run.
       def before_configuration(&block)
         ActiveSupport.on_load(:before_configuration, :yield => true, &block)

data/lib/rails/source_annotation_extractor.rb

@@ -28,9 +28,9 @@ class SourceAnnotationExtractor
     end
   end
 
-  # Prints all annotations with tag +tag+ under the root directories +app+, +lib+,
-  # and +test+ (recursively). Only filenames with extension +.builder+, +.rb+,
-  # +.rxml+, +.rhtml+, or +.erb+ are taken into account. The +options+
+  # Prints all annotations with tag +tag+ under the root directories +app+, +config+, +lib+,
+  # +script+, and +test+ (recursively). Only filenames with extension 
+  # +.builder+, +.rb+, and +.erb+ are taken into account. The +options+
   # hash is passed to each annotation's +to_s+.
   #
   # This class method is the single entry point for the rake tasks.
@@ -46,16 +46,14 @@ class SourceAnnotationExtractor
   end
 
   # Returns a hash that maps filenames under +dirs+ (recursively) to arrays
-  # with their annotations. Only files with annotations are included, and only
-  # those with extension +.builder+, +.rb+, +.rxml+, +.rhtml+, and +.erb+
-  # are taken into account.
-  def find(dirs=%w(app lib test))
+  # with their annotations.
+  def find(dirs=%w(app config lib script test))
     dirs.inject({}) { |h, dir| h.update(find_in(dir)) }
   end
 
   # Returns a hash that maps filenames under +dir+ (recursively) to arrays
   # with their annotations. Only files with annotations are included, and only
-  # those with extension +.builder+, +.rb+, +.rxml+, +.rhtml+, and +.erb+
+  # those with extension +.builder+, +.rb+, +.erb+, +.haml+ and +.slim+
   # are taken into account.
   def find_in(dir)
     results = {}
@@ -65,10 +63,14 @@ class SourceAnnotationExtractor
 
       if File.directory?(item)
         results.update(find_in(item))
-      elsif item =~ /\.(builder|(r(?:b|xml|js)))$/
+      elsif item =~ /\.(builder|rb)$/
         results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/))
-      elsif item =~ /\.(rhtml|erb)$/
+      elsif item =~ /\.erb$/
         results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/))
+      elsif item =~ /\.haml$/
+        results.update(extract_annotations_from(item, /-\s*#\s*(#{tag}):?\s*(.*)$/))
+      elsif item =~ /\.slim$/
+        results.update(extract_annotations_from(item, /\/\s*\s*(#{tag}):?\s*(.*)$/))
       end
     end
 

data/lib/rails/tasks/documentation.rake

@@ -8,6 +8,8 @@ end
 
 # Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise
 class RDocTaskWithoutDescriptions < RDoc::Task
+  include ::Rake::DSL
+
   def define
     task rdoc_task_name
 
@@ -61,7 +63,7 @@ namespace :doc do
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.title    = "Rails Framework Documentation"
     rdoc.options << '--line-numbers'
-    rdoc.rdoc_files.include('README.rdoc')
+    rdoc.rdoc_files.include('README')
 
     gem_path('actionmailer') do |actionmailer|
       %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_mailer/base.rb).each do |file|

data/lib/rails/tasks/engine.rake

@@ -2,6 +2,7 @@ task "load_app" do
   namespace :app do
     load APP_RAKEFILE
   end
+  task :environment => "app:environment"
 
   if !defined?(ENGINE_PATH) || !ENGINE_PATH
     ENGINE_PATH = find_engine_path(APP_RAKEFILE)

data/lib/rails/tasks/misc.rake

@@ -7,7 +7,7 @@ end
 
 desc 'Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions).'
 task :secret do
-  require 'active_support/secure_random'
+  require 'securerandom'
   puts SecureRandom.hex(64)
 end
 

data/lib/rails/tasks/routes.rake

@@ -3,27 +3,7 @@ task :routes => :environment do
   Rails.application.reload_routes!
   all_routes = Rails.application.routes.routes
 
-  if ENV['CONTROLLER']
-    all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] }
-  end
-
-  routes = all_routes.collect do |route|
-
-    reqs = route.requirements.dup
-    reqs[:to] = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
-    reqs = reqs.empty? ? "" : reqs.inspect
-
-    {:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
-  end
-
-   # Skip the route if it's internal info route
-  routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
-
-  name_width = routes.map{ |r| r[:name].length }.max
-  verb_width = routes.map{ |r| r[:verb].length }.max
-  path_width = routes.map{ |r| r[:path].length }.max
-
-  routes.each do |r|
-    puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
-  end
+  require 'rails/application/route_inspector'
+  inspector = Rails::Application::RouteInspector.new
+  puts inspector.format(all_routes, ENV['CONTROLLER']).join "\n"
 end