railties 3.2.22.5 → 4.0.0.beta1

data/lib/rails/engine/commands.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/inclusion'
-
 ARGV << '--help' if ARGV.empty?
 
 aliases = {
@@ -25,7 +23,7 @@ when '--version', '-v'
   require 'rails/commands/application'
 
 else
-  puts "Error: Command not recognized" unless command.in?(['-h', '--help'])
+  puts "Error: Command not recognized" unless %w(-h --help).include?(command)
   puts <<-EOT
 Usage: rails COMMAND [ARGS]
 

data/lib/rails/engine/configuration.rb

@@ -5,7 +5,6 @@ module Rails
     class Configuration < ::Rails::Railtie::Configuration
       attr_reader :root
       attr_writer :middleware, :eager_load_paths, :autoload_once_paths, :autoload_paths
-      attr_accessor :plugins
 
       def initialize(root=nil)
         super()
@@ -21,7 +20,7 @@ module Rails
       # Holds generators configuration:
       #
       #   config.generators do |g|
-      #     g.orm             :datamapper, :migration => true
+      #     g.orm             :data_mapper, migration: true
       #     g.template_engine :haml
       #     g.test_framework  :rspec
       #   end
@@ -39,27 +38,35 @@ module Rails
       def paths
         @paths ||= begin
           paths = Rails::Paths::Root.new(@root)
-          paths.add "app",                 :eager_load => true, :glob => "*"
-          paths.add "app/assets",          :glob => "*"
-          paths.add "app/controllers",     :eager_load => true
-          paths.add "app/helpers",         :eager_load => true
-          paths.add "app/models",          :eager_load => true
-          paths.add "app/mailers",         :eager_load => true
+
+          paths.add "app",                 eager_load: true, glob: "*"
+          paths.add "app/assets",          glob: "*"
+          paths.add "app/controllers",     eager_load: true
+          paths.add "app/helpers",         eager_load: true
+          paths.add "app/models",          eager_load: true
+          paths.add "app/mailers",         eager_load: true
           paths.add "app/views"
-          paths.add "lib",                 :load_path => true
-          paths.add "lib/assets",          :glob => "*"
-          paths.add "lib/tasks",           :glob => "**/*.rake"
+
+          paths.add "app/controllers/concerns", eager_load: true
+          paths.add "app/models/concerns",      eager_load: true
+
+          paths.add "lib",                 load_path: true
+          paths.add "lib/assets",          glob: "*"
+          paths.add "lib/tasks",           glob: "**/*.rake"
+
           paths.add "config"
-          paths.add "config/environments", :glob => "#{Rails.env}.rb"
-          paths.add "config/initializers", :glob => "**/*.rb"
-          paths.add "config/locales",      :glob => "*.{rb,yml}"
-          paths.add "config/routes",       :with => "config/routes.rb"
+          paths.add "config/environments", glob: "#{Rails.env}.rb"
+          paths.add "config/initializers", glob: "**/*.rb"
+          paths.add "config/locales",      glob: "*.{rb,yml}"
+          paths.add "config/routes.rb"
+
           paths.add "db"
           paths.add "db/migrate"
-          paths.add "db/seeds",            :with => "db/seeds.rb"
-          paths.add "vendor",              :load_path => true
-          paths.add "vendor/assets",       :glob => "*"
-          paths.add "vendor/plugins"
+          paths.add "db/seeds.rb"
+
+          paths.add "vendor",              load_path: true
+          paths.add "vendor/assets",       glob: "*"
+
           paths
         end
       end

data/lib/rails/engine/railties.rb

@@ -1,33 +1,29 @@
 module Rails
   class Engine < Railtie
     class Railties
-      # TODO Write tests for this behavior extracted from Application
-      def initialize(config)
-        @config = config
-      end
+      include Enumerable
+      attr_reader :_all
 
-      def all(&block)
-        @all ||= plugins
-        @all.each(&block) if block
-        @all
+      def initialize
+        @_all ||= ::Rails::Railtie.subclasses.map(&:instance) +
+          ::Rails::Engine.subclasses.map(&:instance)
       end
 
-      def plugins
-        @plugins ||= begin
-          plugin_names = (@config.plugins || [:all]).map { |p| p.to_sym }
-          Plugin.all(plugin_names, @config.paths["vendor/plugins"].existent)
-        end
+      def self.engines
+        @engines ||= ::Rails::Engine.subclasses.map(&:instance)
       end
 
-      def self.railties
-        @railties ||= ::Rails::Railtie.subclasses.map(&:instance)
+      def each(*args, &block)
+        _all.each(*args, &block)
       end
 
-      def self.engines
-        @engines ||= ::Rails::Engine.subclasses.map(&:instance)
+      def -(others)
+        _all - others
       end
 
-      delegate :railties, :engines, :to => "self.class"
+      delegate :engines, to: "self.class"
     end
   end
 end
+
+ActiveSupport::Deprecation.deprecate_methods(Rails::Engine::Railties, :engines)

data/lib/rails/generators.rb

@@ -23,51 +23,40 @@ module Rails
     mattr_accessor :namespace
 
     DEFAULT_ALIASES = {
-      :rails => {
-        :actions => '-a',
-        :orm => '-o',
-        :javascripts => '-j',
-        :javascript_engine => '-je',
-        :resource_controller => '-c',
-        :scaffold_controller => '-c',
-        :stylesheets => '-y',
-        :stylesheet_engine => '-se',
-        :template_engine => '-e',
-        :test_framework => '-t'
+      rails: {
+        actions: '-a',
+        orm: '-o',
+        javascripts: '-j',
+        javascript_engine: '-je',
+        resource_controller: '-c',
+        scaffold_controller: '-c',
+        stylesheets: '-y',
+        stylesheet_engine: '-se',
+        template_engine: '-e',
+        test_framework: '-t'
       },
 
-      :test_unit => {
-        :fixture_replacement => '-r',
-      },
-
-      :plugin => {
-        :generator => '-g',
-        :tasks => '-r'
+      test_unit: {
+        fixture_replacement: '-r',
       }
     }
 
     DEFAULT_OPTIONS = {
-      :rails => {
-        :assets => true,
-        :force_plural => false,
-        :helper => true,
-        :integration_tool => nil,
-        :javascripts => true,
-        :javascript_engine => :js,
-        :orm => false,
-        :performance_tool => nil,
-        :resource_controller => :controller,
-        :resource_route => true,
-        :scaffold_controller => :scaffold_controller,
-        :stylesheets => true,
-        :stylesheet_engine => :css,
-        :test_framework => false,
-        :template_engine => :erb
-      },
-
-      :plugin => {
-        :generator => false,
-        :tasks => false
+      rails: {
+        assets: true,
+        force_plural: false,
+        helper: true,
+        integration_tool: nil,
+        javascripts: true,
+        javascript_engine: :js,
+        orm: false,
+        resource_controller: :controller,
+        resource_route: true,
+        scaffold_controller: :scaffold_controller,
+        stylesheets: true,
+        stylesheet_engine: :css,
+        test_framework: false,
+        template_engine: :erb
       }
     }
 
@@ -81,7 +70,7 @@ module Rails
       hide_namespaces(*config.hidden_namespaces)
     end
 
-    def self.templates_path
+    def self.templates_path #:nodoc:
       @templates_path ||= []
     end
 
@@ -105,7 +94,6 @@ module Rails
     # some of them are not available by adding a fallback:
     #
     #   Rails::Generators.fallbacks[:shoulda] = :test_unit
-    #
     def self.fallbacks
       @fallbacks ||= {}
     end
@@ -125,8 +113,6 @@ module Rails
     # Generators names must end with "_generator.rb". This is required because Rails
     # looks in load paths and loads the generator just before it's going to be used.
     #
-    # ==== Examples
-    #
     #   find_by_namespace :webrat, :rails, :integration
     #
     # Will search for the following generators:
@@ -135,7 +121,6 @@ module Rails
     #
     # Notice that "rails:generators:webrat" could be loaded as well, what
     # Rails looks for is the first and last parts of the namespace.
-    #
     def self.find_by_namespace(name, base=nil, context=nil) #:nodoc:
       lookups = []
       lookups << "#{base}:#{name}"    if base
@@ -186,18 +171,13 @@ module Rails
           "resource_route",
           "#{orm}:migration",
           "#{orm}:model",
-          "#{orm}:observer",
-          "#{orm}:session_migration",
           "#{test}:controller",
           "#{test}:helper",
           "#{test}:integration",
           "#{test}:mailer",
           "#{test}:model",
-          "#{test}:observer",
           "#{test}:scaffold",
           "#{test}:view",
-          "#{test}:performance",
-          "#{test}:plugin",
           "#{template}:controller",
           "#{template}:scaffold",
           "#{template}:mailer",
@@ -248,7 +228,7 @@ module Rails
       rails.delete("plugin_new")
       print_list("rails", rails)
 
-      hidden_namespaces.each {|n| groups.delete(n.to_s) }
+      hidden_namespaces.each { |n| groups.delete(n.to_s) }
 
       groups.sort.each { |b, n| print_list(b, n) }
     end

data/lib/rails/generators/actions.rb

@@ -1,54 +1,19 @@
 require 'open-uri'
 require 'rbconfig'
-require 'active_support/core_ext/array/wrap'
 
 module Rails
   module Generators
     module Actions
-
-      # Install a plugin. You must provide either a Subversion url or Git url.
-      #
-      # For a Git-hosted plugin, you can specify a branch and
-      # whether it should be added as a submodule instead of cloned.
-      #
-      # For a Subversion-hosted plugin you can specify a revision.
-      #
-      # ==== Examples
-      #
-      #   plugin 'restful-authentication', :git => 'git://github.com/technoweenie/restful-authentication.git'
-      #   plugin 'restful-authentication', :git => 'git://github.com/technoweenie/restful-authentication.git', :branch => 'stable'
-      #   plugin 'restful-authentication', :git => 'git://github.com/technoweenie/restful-authentication.git', :submodule => true
-      #   plugin 'restful-authentication', :svn => 'svn://svnhub.com/technoweenie/restful-authentication/trunk'
-      #   plugin 'restful-authentication', :svn => 'svn://svnhub.com/technoweenie/restful-authentication/trunk', :revision => 1234
-      #
-      def plugin(name, options)
-        log :plugin, name
-
-        if options[:git] && options[:submodule]
-          options[:git] = "-b #{options[:branch]} #{options[:git]}" if options[:branch]
-          in_root do
-            run "git submodule add #{options[:git]} vendor/plugins/#{name}", :verbose => false
-          end
-        elsif options[:git] || options[:svn]
-          options[:git] = "-b #{options[:branch]} #{options[:git]}"   if options[:branch]
-          options[:svn] = "-r #{options[:revision]} #{options[:svn]}" if options[:revision]
-          in_root do
-            run_ruby_script "script/rails plugin install #{options[:svn] || options[:git]}", :verbose => false
-          end
-        else
-          log "! no git or svn provided for #{name}. Skipping..."
-        end
+      def initialize(*) # :nodoc:
+        super
+        @in_group = nil
       end
 
-      # Adds an entry into Gemfile for the supplied gem. If env
-      # is specified, add the gem to the given environment.
-      #
-      # ==== Example
-      #
-      #   gem "rspec", :group => :test
-      #   gem "technoweenie-restful-authentication", :lib => "restful-authentication", :source => "http://gems.github.com/"
-      #   gem "rails", "3.0", :git => "git://github.com/rails/rails"
+      # Adds an entry into Gemfile for the supplied gem.
       #
+      #   gem "rspec", group: :test
+      #   gem "technoweenie-restful-authentication", lib: "restful-authentication", source: "http://gems.github.com/"
+      #   gem "rails", "3.0", git: "git://github.com/rails/rails"
       def gem(*args)
         options = args.extract_options!
         name, version = args
@@ -65,50 +30,45 @@ module Rails
         log :gemfile, message
 
         options.each do |option, value|
-          parts << ":#{option} => #{value.inspect}"
+          parts << "#{option}: #{value.inspect}"
         end
 
         in_root do
           str = "gem #{parts.join(", ")}"
           str = "  " + str if @in_group
           str = "\n" + str
-          append_file "Gemfile", str, :verbose => false
+          append_file "Gemfile", str, verbose: false
         end
       end
 
       # Wraps gem entries inside a group.
       #
-      # ==== Example
-      #
       #   gem_group :development, :test do
       #     gem "rspec-rails"
       #   end
-      #
       def gem_group(*names, &block)
         name = names.map(&:inspect).join(", ")
         log :gemfile, "group #{name}"
 
         in_root do
-          append_file "Gemfile", "\ngroup #{name} do", :force => true
+          append_file "Gemfile", "\ngroup #{name} do", force: true
 
           @in_group = true
           instance_eval(&block)
           @in_group = false
 
-          append_file "Gemfile", "\nend\n", :force => true
+          append_file "Gemfile", "\nend\n", force: true
         end
       end
 
       # Add the given source to Gemfile
       #
-      # ==== Example
-      #
       #   add_source "http://gems.github.com/"
       def add_source(source, options={})
         log :source, source
 
         in_root do
-          prepend_file "Gemfile", "source #{source.inspect}\n", :verbose => false
+          prepend_file "Gemfile", "source #{source.inspect}\n", verbose: false
         end
       end
 
@@ -117,6 +77,13 @@ module Rails
       # If options :env is specified, the line is appended to the corresponding
       # file in config/environments.
       #
+      #   environment do
+      #     "config.autoload_paths += %W(#{config.root}/extras)"
+      #   end
+      #
+      #   environment(nil, env: "development") do
+      #     "config.autoload_paths += %W(#{config.root}/extras)"
+      #   end
       def environment(data=nil, options={}, &block)
         sentinel = /class [a-z_:]+ < Rails::Application/i
         env_file_sentinel = /::Application\.configure do/
@@ -124,10 +91,10 @@ module Rails
 
         in_root do
           if options[:env].nil?
-            inject_into_file 'config/application.rb', "\n    #{data}", :after => sentinel, :verbose => false
+            inject_into_file 'config/application.rb', "\n    #{data}", after: sentinel, verbose: false
           else
-            Array.wrap(options[:env]).each do |env|
-              inject_into_file "config/environments/#{env}.rb", "\n  #{data}", :after => env_file_sentinel, :verbose => false
+            Array(options[:env]).each do |env|
+              inject_into_file "config/environments/#{env}.rb", "\n  #{data}", after: env_file_sentinel, verbose: false
             end
           end
         end
@@ -136,12 +103,9 @@ module Rails
 
       # Run a command in git.
       #
-      # ==== Examples
-      #
       #   git :init
-      #   git :add => "this.file that.rb"
-      #   git :add => "onefile.rb", :rm => "badfile.cxx"
-      #
+      #   git add: "this.file that.rb"
+      #   git add: "onefile.rb", rm: "badfile.cxx"
       def git(commands={})
         if commands.is_a?(Symbol)
           run "git #{commands}"
@@ -155,63 +119,52 @@ module Rails
       # Create a new file in the vendor/ directory. Code can be specified
       # in a block or a data string can be given.
       #
-      # ==== Examples
-      #
       #   vendor("sekrit.rb") do
       #     sekrit_salt = "#{Time.now}--#{3.years.ago}--#{rand}--"
       #     "salt = '#{sekrit_salt}'"
       #   end
       #
       #   vendor("foreign.rb", "# Foreign code is fun")
-      #
       def vendor(filename, data=nil, &block)
         log :vendor, filename
-        create_file("vendor/#{filename}", data, :verbose => false, &block)
+        create_file("vendor/#{filename}", data, verbose: false, &block)
       end
 
       # Create a new file in the lib/ directory. Code can be specified
       # in a block or a data string can be given.
       #
-      # ==== Examples
-      #
       #   lib("crypto.rb") do
       #     "crypted_special_value = '#{rand}--#{Time.now}--#{rand(1337)}--'"
       #   end
       #
       #   lib("foreign.rb", "# Foreign code is fun")
-      #
       def lib(filename, data=nil, &block)
         log :lib, filename
-        create_file("lib/#{filename}", data, :verbose => false, &block)
+        create_file("lib/#{filename}", data, verbose: false, &block)
       end
 
       # Create a new Rakefile with the provided code (either in a block or a string).
       #
-      # ==== Examples
-      #
       #   rakefile("bootstrap.rake") do
       #     project = ask("What is the UNIX name of your project?")
       #
       #     <<-TASK
       #       namespace :#{project} do
       #         task :bootstrap do
-      #           puts "i like boots!"
+      #           puts "I like boots!"
       #         end
       #       end
       #     TASK
       #   end
       #
-      #   rakefile("seed.rake", "puts 'im plantin ur seedz'")
-      #
+      #   rakefile('seed.rake', 'puts "Planting seeds"')
       def rakefile(filename, data=nil, &block)
         log :rakefile, filename
-        create_file("lib/tasks/#{filename}", data, :verbose => false, &block)
+        create_file("lib/tasks/#{filename}", data, verbose: false, &block)
       end
 
       # Create a new initializer with the provided code (either in a block or a string).
       #
-      # ==== Examples
-      #
       #   initializer("globals.rb") do
       #     data = ""
       #
@@ -223,74 +176,58 @@ module Rails
       #   end
       #
       #   initializer("api.rb", "API_KEY = '123456'")
-      #
       def initializer(filename, data=nil, &block)
         log :initializer, filename
-        create_file("config/initializers/#{filename}", data, :verbose => false, &block)
+        create_file("config/initializers/#{filename}", data, verbose: false, &block)
       end
 
       # Generate something using a generator from Rails or a plugin.
       # The second parameter is the argument string that is passed to
       # the generator or an Array that is joined.
       #
-      # ==== Example
-      #
       #   generate(:authenticated, "user session")
-      #
       def generate(what, *args)
         log :generate, what
         argument = args.map {|arg| arg.to_s }.flatten.join(" ")
 
-        in_root { run_ruby_script("script/rails generate #{what} #{argument}", :verbose => false) }
+        in_root { run_ruby_script("bin/rails generate #{what} #{argument}", verbose: false) }
       end
 
       # Runs the supplied rake task
       #
-      # ==== Example
-      #
       #   rake("db:migrate")
-      #   rake("db:migrate", :env => "production")
-      #   rake("gems:install", :sudo => true)
-      #
+      #   rake("db:migrate", env: "production")
+      #   rake("gems:install", sudo: true)
       def rake(command, options={})
         log :rake, command
         env  = options[:env] || ENV["RAILS_ENV"] || 'development'
         sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
-        in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) }
+        in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", verbose: false) }
       end
 
       # Just run the capify command in root
       #
-      # ==== Example
-      #
       #   capify!
-      #
       def capify!
         log :capify, ""
-        in_root { run("#{extify(:capify)} .", :verbose => false) }
+        in_root { run("#{extify(:capify)} .", verbose: false) }
       end
 
       # Make an entry in Rails routing file config/routes.rb
       #
-      # === Example
-      #
-      #   route "root :to => 'welcome'"
-      #
+      #   route "root :to => 'welcome#index'"
       def route(routing_code)
         log :route, routing_code
-        sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
+        sentinel = /\.routes\.draw do\s*$/
 
         in_root do
-          inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
+          inject_into_file 'config/routes.rb', "\n  #{routing_code}", { after: sentinel, verbose: false }
         end
       end
 
       # Reads the given file at the source root and prints it in the console.
       #
-      # === Example
-      #
       #   readme "README"
-      #
       def readme(path)
         log File.read(find_in_source_paths(path))
       end
@@ -300,7 +237,6 @@ module Rails
         # Define log for backwards compatibility. If just one argument is sent,
         # invoke say, otherwise invoke say_status. Differently from say and
         # similarly to say_status, this method respects the quiet? option given.
-        #
         def log(*args)
           if args.size == 1
             say args.first.to_s unless options.quiet?
@@ -311,7 +247,6 @@ module Rails
         end
 
         # Add an extension to the given name based on the platform.
-        #
         def extify(name)
           if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
             "#{name}.bat"