railties 3.1.12 → 3.2.0.rc1

data/lib/rails/console/helpers.rb

@@ -1,7 +1,11 @@
-def helper
-  @helper ||= ApplicationController.helpers
-end
+module Rails
+  module ConsoleMethods
+    def helper
+      @helper ||= ApplicationController.helpers
+    end
 
-def controller
-  @controller ||= ApplicationController.new
+    def controller
+      @controller ||= ApplicationController.new
+    end
+  end
 end

data/lib/rails/engine.rb

@@ -228,7 +228,7 @@ module Rails
   #     resources :articles
   #   end
   #
-  # The routes above will automatically point to <tt>MyEngine::ApplicationContoller</tt>. Furthermore, you don't
+  # The routes above will automatically point to <tt>MyEngine::ApplicationController</tt>. Furthermore, you don't
   # need to use longer url helpers like <tt>my_engine_articles_path</tt>. Instead, you should simply use
   # <tt>articles_path</tt> as you would do with your application.
   #
@@ -296,16 +296,16 @@ module Rails
   # If you want to share just a few specific helpers you can add them to application's
   # helpers in ApplicationController:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::SharedEngineHelper
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::SharedEngineHelper
+  #   end
   #
   # If you want to include all of the engine's helpers, you can use #helpers method on an engine's
   # instance:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::Engine.helpers
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::Engine.helpers
+  #   end
   #
   # It will include all of the helpers from engine's directory. Take into account that this does
   # not include helpers defined in controllers with helper_method or other similar solutions,
@@ -330,10 +330,29 @@ module Rails
   #
   #   MyEngine::Engine.load_seed
   #
+  # == Loading priority
+  #
+  # In order to change engine's priority you can use config.railties_order in main application.
+  # It will affect the priority of loading views, helpers, assets and all the other files
+  # related to engine or application.
+  #
+  # Example:
+  #
+  #   # load Blog::Engine with highest priority, followed by application and other railties
+  #   config.railties_order = [Blog::Engine, :main_app, :all]
+  #
   class Engine < Railtie
     autoload :Configuration, "rails/engine/configuration"
     autoload :Railties,      "rails/engine/railties"
 
+    def load_generators(app=self)
+      initialize_generators
+      railties.all { |r| r.load_generators(app) }
+      Rails::Generators.configure!(app.config.generators)
+      super
+      self
+    end
+
     class << self
       attr_accessor :called_from, :isolated
       alias :isolated? :isolated
@@ -363,20 +382,28 @@ module Rails
         self.routes.default_scope = { :module => ActiveSupport::Inflector.underscore(mod.name) }
         self.isolated = true
 
-        unless mod.respond_to?(:_railtie)
-          name = engine_name
-          _railtie = self
+        unless mod.respond_to?(:railtie_namespace)
+          name, railtie = engine_name, self
+
           mod.singleton_class.instance_eval do
-            define_method(:_railtie) do
-              _railtie
-            end
+            define_method(:railtie_namespace) { railtie }
 
             unless mod.respond_to?(:table_name_prefix)
-              define_method(:table_name_prefix) do
-                "#{name}_"
-              end
+              define_method(:table_name_prefix) { "#{name}_" }
+            end
+
+            unless mod.respond_to?(:use_relative_model_naming?)
+              class_eval "def use_relative_model_naming?; true; end", __FILE__, __LINE__
             end
-         end
+
+            unless mod.respond_to?(:railtie_helpers_paths)
+              define_method(:railtie_helpers_paths) { railtie.helpers_paths }
+            end
+
+            unless mod.respond_to?(:railtie_routes_url_helpers)
+              define_method(:railtie_routes_url_helpers) { railtie.routes_url_helpers }
+            end
+          end
         end
       end
 
@@ -397,20 +424,15 @@ module Rails
       super
       paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end
-    
-    def load_generators(app=self)
-      railties.all { |r| r.load_generators(app) }
-      super
-    end
 
     def load_console(app=self)
       railties.all { |r| r.load_console(app) }
       super
     end
-    
+
     def eager_load!
       railties.all(&:eager_load!)
-      
+
       config.eager_load_paths.each do |load_path|
         matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
         Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
@@ -426,13 +448,6 @@ module Rails
     def helpers
       @helpers ||= begin
         helpers = Module.new
-
-        helpers_paths = if config.respond_to?(:helpers_paths)
-          config.helpers_paths
-        else
-          paths["app/helpers"].existent
-        end
-
         all = ActionController::Base.all_helpers_from_path(helpers_paths)
         ActionController::Base.modules_for_helpers(all).each do |mod|
           helpers.send(:include, mod)
@@ -441,6 +456,14 @@ module Rails
       end
     end
 
+    def helpers_paths
+      paths["app/helpers"].existent
+    end
+
+    def routes_url_helpers
+      routes.url_helpers
+    end
+
     def app
       @app ||= begin
         config.middleware = config.middleware.merge_into(default_middleware_stack)
@@ -468,10 +491,19 @@ module Rails
       @routes
     end
 
+    def ordered_railties
+      railties.all + [self]
+    end
+
     def initializers
       initializers = []
-      railties.all { |r| initializers += r.initializers }
-      initializers += super
+      ordered_railties.each do |r|
+        if r == self
+          initializers += super
+        else
+          initializers += r.initializers
+        end
+      end
       initializers
     end
 
@@ -485,7 +517,7 @@ module Rails
     # Blog::Engine.load_seed
     def load_seed
       seed_file = paths["db/seeds"].existent.first
-      load(seed_file) if seed_file && File.exist?(seed_file)
+      load(seed_file) if seed_file
     end
 
     # Add configured load paths to ruby load paths and remove duplicates.
@@ -579,6 +611,10 @@ module Rails
 
   protected
 
+    def initialize_generators
+      require "rails/generators"
+    end
+
     def routes?
       defined?(@routes)
     end

data/lib/rails/engine/commands.rb

@@ -0,0 +1,39 @@
+require 'active_support/core_ext/object/inclusion'
+
+ARGV << '--help' if ARGV.empty?
+
+aliases = {
+  "g" => "generate",
+  "d" => "destroy"
+}
+
+command = ARGV.shift
+command = aliases[command] || command
+
+require ENGINE_PATH
+engine = ::Rails::Engine.find(ENGINE_ROOT)
+
+case command
+when 'generate', 'destroy'
+  require 'rails/generators'
+  Rails::Generators.namespace = engine.railtie_namespace
+  engine.load_generators
+  require "rails/commands/#{command}"
+
+when '--version', '-v'
+  ARGV.unshift '--version'
+  require 'rails/commands/application'
+
+else
+  puts "Error: Command not recognized" unless command.in?(['-h', '--help'])
+  puts <<-EOT
+Usage: rails COMMAND [ARGS]
+
+The common rails commands available for engines are:
+ generate    Generate new code (short-cut alias: "g")
+ destroy     Undo code generated with "generate" (short-cut alias: "d")
+
+All commands can be run with -h for more information.
+  EOT
+  exit(1)
+end

data/lib/rails/engine/configuration.rb

@@ -30,7 +30,7 @@ module Rails
       #
       #   config.generators.colorize_logging = false
       #
-      def generators #:nodoc
+      def generators #:nodoc:
         @generators ||= Rails::Configuration::Generators.new
         yield(@generators) if block_given?
         @generators

data/lib/rails/generators.rb

@@ -20,6 +20,8 @@ module Rails
     autoload :ResourceHelpers, 'rails/generators/resource_helpers'
     autoload :TestCase,        'rails/generators/test_case'
 
+    mattr_accessor :namespace
+
     DEFAULT_ALIASES = {
       :rails => {
         :actions => '-a',
@@ -68,7 +70,7 @@ module Rails
       }
     }
 
-    def self.configure!(config = Rails.application.config.generators) #:nodoc:
+    def self.configure!(config) #:nodoc:
       no_color! unless config.colorize_logging
       aliases.deep_merge! config.aliases
       options.deep_merge! config.options
@@ -286,7 +288,6 @@ module Rails
       # Receives namespaces in an array and tries to find matching generators
       # in the load path.
       def self.lookup(namespaces) #:nodoc:
-        load_generators_from_railties!
         paths = namespaces_to_paths(namespaces)
 
         paths.each do |raw_path|
@@ -298,9 +299,6 @@ module Rails
               return
             rescue LoadError => e
               raise unless e.message =~ /#{Regexp.escape(path)}$/
-            rescue NameError => e
-              raise unless e.message =~ /Rails::Generator([\s(::)]|$)/
-              warn "[WARNING] Could not load generator #{path.inspect} because it's a Rails 2.x generator, which is not supported anymore. Error: #{e.message}.\n#{e.backtrace.join("\n")}"
             rescue Exception => e
               warn "[WARNING] Could not load generator #{path.inspect}. Error: #{e.message}.\n#{e.backtrace.join("\n")}"
             end
@@ -310,8 +308,6 @@ module Rails
 
       # This will try to load any generator in the load path to show in help.
       def self.lookup! #:nodoc:
-        load_generators_from_railties!
-
         $LOAD_PATH.each do |base|
           Dir[File.join(base, "{rails/generators,generators}", "**", "*_generator.rb")].each do |path|
             begin
@@ -324,13 +320,6 @@ module Rails
         end
       end
 
-      # Allow generators to be loaded from custom paths.
-      def self.load_generators_from_railties! #:nodoc:
-        return if defined?(@generators_from_railties) || Rails.application.nil?
-        @generators_from_railties = true
-        Rails.application.load_generators
-      end
-
       # Convert namespaces to paths by replacing ":" for "/" and adding
       # an extra lookup. For example, "rails:model" should be searched
       # in both: "rails/model/model_generator" and "rails/model_generator".

data/lib/rails/generators/actions.rb

@@ -68,7 +68,33 @@ module Rails
         end
 
         in_root do
-          append_file "Gemfile", "gem #{parts.join(", ")}\n", :verbose => false
+          str = "gem #{parts.join(", ")}"
+          str = "  " + str if @in_group
+          str = "\n" + str
+          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
+
+          @in_group = true
+          instance_eval(&block)
+          @in_group = false
+
+          append_file "Gemfile", "\nend\n", :force => true
         end
       end
 
@@ -92,14 +118,15 @@ module Rails
       #
       def environment(data=nil, options={}, &block)
         sentinel = /class [a-z_:]+ < Rails::Application/i
+        env_file_sentinel = /::Application\.configure do/
         data = block.call if !data && block_given?
 
         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|
-              append_file "config/environments/#{env}.rb", "\n#{data}", :verbose => false
+            Array.wrap(options[:env]).each do |env|
+              inject_into_file "config/environments/#{env}.rb", "\n  #{data}", :after => env_file_sentinel, :verbose => false
             end
           end
         end
@@ -114,11 +141,11 @@ module Rails
       #   git :add => "this.file that.rb"
       #   git :add => "onefile.rb", :rm => "badfile.cxx"
       #
-      def git(command={})
-        if command.is_a?(Symbol)
-          run "git #{command}"
+      def git(commands={})
+        if commands.is_a?(Symbol)
+          run "git #{commands}"
         else
-          command.each do |cmd, options|
+          commands.each do |cmd, options|
             run "git #{cmd} #{options}"
           end
         end
@@ -226,7 +253,7 @@ module Rails
       #
       def rake(command, options={})
         log :rake, command
-        env  = options[:env] || 'development'
+        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) }
       end

data/lib/rails/generators/app_base.rb

@@ -1,5 +1,5 @@
 require 'digest/md5'
-require 'active_support/secure_random'
+require 'securerandom'
 require 'active_support/core_ext/string/strip'
 require 'rails/version' unless defined?(Rails::VERSION)
 require 'rbconfig'
@@ -138,17 +138,21 @@ module Rails
         if options.dev?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
+            gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'arel',      :git => 'git://github.com/rails/arel.git'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :git => 'git://github.com/rails/rails.git'
+            gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'arel',      :git => 'git://github.com/rails/arel.git'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
             gem 'rails', '#{Rails::VERSION::STRING}'
 
             # Bundle edge Rails instead:
-            # gem 'rails',     :git => 'git://github.com/rails/rails.git'
+            # gem 'rails', :git => 'git://github.com/rails/rails.git'
           GEMFILE
         end
       end
@@ -156,11 +160,11 @@ module Rails
       def gem_for_database
         # %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql )
         case options[:database]
-        when "oracle"     then "ruby-oci8"
-        when "postgresql" then "pg"
-        when "frontbase"  then "ruby-frontbase"
-        when "mysql"      then "mysql2"
-        when "sqlserver"  then "activerecord-sqlserver-adapter"
+        when "oracle"         then "ruby-oci8"
+        when "postgresql"     then "pg"
+        when "frontbase"      then "ruby-frontbase"
+        when "mysql"          then "mysql2"
+        when "sqlserver"      then "activerecord-sqlserver-adapter"
         when "jdbcmysql"      then "activerecord-jdbcmysql-adapter"
         when "jdbcsqlite3"    then "activerecord-jdbcsqlite3-adapter"
         when "jdbcpostgresql" then "activerecord-jdbcpostgresql-adapter"
@@ -188,32 +192,32 @@ module Rails
         end
       end
 
-      def turn_gemfile_entry
-        unless RUBY_VERSION < "1.9.2" || options[:skip_test_unit]
-          version = RUBY_VERSION >= "1.9.3" ? "'~> 0.8.3'" : "'0.8.2'"
-          <<-GEMFILE.strip_heredoc
-            group :test do
-              # Pretty printed test output
-              gem 'turn', #{version}, :require => false
+      def assets_gemfile_entry
+        return if options[:skip_sprockets]
+
+        gemfile = if options.dev? || options.edge?
+          <<-GEMFILE
+            # Gems used only for assets and not required
+            # in production environments by default.
+            group :assets do
+              gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git'
+              gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
+              #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
+              gem 'uglifier', '>= 1.0.3'
+            end
+          GEMFILE
+        else
+          <<-GEMFILE
+            # Gems used only for assets and not required
+            # in production environments by default.
+            group :assets do
+              gem 'sass-rails',   '~> 3.2.0'
+              gem 'coffee-rails', '~> 3.2.0'
+              #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
+              gem 'uglifier', '>= 1.0.3'
             end
           GEMFILE
         end
-      end
-
-      def assets_gemfile_entry
-        return if options[:skip_sprockets]
-        gemfile = <<-GEMFILE.strip_heredoc
-          # Gems used only for assets and not required
-          # in production environments by default.
-          group :assets do
-            gem 'sass-rails', #{options.dev? || options.edge? ? "  :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : "  '~> 3.1.5'"}
-            gem 'coffee-rails', #{options.dev? || options.edge? ? ":git => 'git://github.com/rails/coffee-rails.git', :branch => '3-1-stable'" : "'~> 3.1.1'"}
-
-            # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-            #{javascript_runtime_gemfile_entry}
-            gem 'uglifier', '>= 1.0.3'
-          end
-        GEMFILE
 
         gemfile.strip_heredoc.gsub(/^[ \t]*$/, '')
       end
@@ -222,14 +226,6 @@ module Rails
         "gem '#{options[:javascript]}-rails'" unless options[:skip_javascript]
       end
 
-      def javascript_runtime_gemfile_entry
-        if defined?(JRUBY_VERSION)
-          "gem 'therubyrhino'\n"
-        else
-          "# gem 'therubyracer'\n"
-        end
-      end
-
       def bundle_command(command)
         say_status :run, "bundle #{command}"