railties 4.1.16 → 4.2.0.beta1

data/lib/rails/commands/dbconsole.rb

@@ -20,7 +20,7 @@ module Rails
       ENV['RAILS_ENV'] = options[:environment] || environment
 
       case config["adapter"]
-      when /^mysql/
+      when /^(jdbc)?mysql/
         args = {
           'host'      => '--host',
           'port'      => '--port',
@@ -30,7 +30,7 @@ module Rails
           'sslca'     => '--ssl-ca',
           'sslcert'   => '--ssl-cert',
           'sslcapath' => '--ssl-capath',
-          'sslcipher' => '--ssl-cipher',
+          'sslcipher' => '--ssh-cipher',
           'sslkey'    => '--ssl-key'
         }.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
 

data/lib/rails/commands/plugin.rb

@@ -11,7 +11,7 @@ else
               end
     if File.exist?(railsrc)
       extra_args_string = File.read(railsrc)
-      extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
+      extra_args = extra_args_string.split(/\n+/).flat_map {|l| l.split}
       puts "Using #{extra_args.join(" ")} from #{railsrc}"
       ARGV.insert(1, *extra_args)
     end

data/lib/rails/commands/server.rb

@@ -9,7 +9,17 @@ module Rails
       def parse!(args)
         args, options = args.dup, {}
 
-        opt_parser = OptionParser.new do |opts|
+        option_parser(options).parse! args
+
+        options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development"
+        options[:server]     = args.shift
+        options
+      end
+
+      private
+
+      def option_parser(options)
+        OptionParser.new do |opts|
           opts.banner = "Usage: rails server [mongrel, thin, etc] [options]"
           opts.on("-p", "--port=port", Integer,
                   "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
@@ -18,7 +28,14 @@ module Rails
           opts.on("-c", "--config=file", String,
                   "Use custom rackup configuration file") { |v| options[:config] = v }
           opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true }
-          opts.on("-u", "--debugger", "Enable the debugger") { options[:debugger] = true }
+          opts.on("-u", "--debugger", "Enable the debugger") do
+            if RUBY_VERSION < '2.0.0'
+              options[:debugger] = true
+            else
+              puts "=> Notice: debugger option is ignored since ruby 2.0 and " \
+                   "it will be removed in future versions"
+            end
+          end
           opts.on("-e", "--environment=name", String,
                   "Specifies the environment to run this server under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v }
@@ -30,12 +47,6 @@ module Rails
 
           opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
         end
-
-        opt_parser.parse! args
-
-        options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development"
-        options[:server]     = args.shift
-        options
       end
     end
 
@@ -75,7 +86,9 @@ module Rails
 
     def middleware
       middlewares = []
-      middlewares << [Rails::Rack::Debugger] if options[:debugger]
+      if RUBY_VERSION < '2.0.0'
+        middlewares << [Rails::Rack::Debugger] if options[:debugger]
+      end
       middlewares << [::Rack::ContentLength]
 
       # FIXME: add Rack::Lock in the case people are using webrick.

data/lib/rails/engine.rb

@@ -351,7 +351,7 @@ module Rails
 
           base.called_from = begin
             call_stack = if Kernel.respond_to?(:caller_locations)
-              caller_locations.map { |l| l.absolute_path || l.path }
+              caller_locations.map(&:path)
             else
               # Remove the line number from backtraces making sure we don't leave anything behind
               caller.map { |p| p.sub(/:\d+.*/, '') }
@@ -371,7 +371,7 @@ module Rails
       end
 
       def isolate_namespace(mod)
-        engine_name(generate_railtie_name(mod))
+        engine_name(generate_railtie_name(mod.name))
 
         self.routes.default_scope = { module: ActiveSupport::Inflector.underscore(mod.name) }
         self.isolated = true
@@ -395,7 +395,7 @@ module Rails
             end
 
             unless mod.respond_to?(:railtie_routes_url_helpers)
-              define_method(:railtie_routes_url_helpers) { railtie.routes.url_helpers }
+              define_method(:railtie_routes_url_helpers) {|include_path_helpers = true| railtie.routes.url_helpers(include_path_helpers) }
             end
           end
         end
@@ -509,7 +509,7 @@ module Rails
     def call(env)
       env.merge!(env_config)
       if env['SCRIPT_NAME']
-        env.merge! "ROUTES_#{routes.object_id}_SCRIPT_NAME" => env['SCRIPT_NAME'].dup
+        env["ROUTES_#{routes.object_id}_SCRIPT_NAME"] = env['SCRIPT_NAME'].dup
       end
       app.call(env)
     end
@@ -567,10 +567,10 @@ module Rails
     end
 
     initializer :add_routing_paths do |app|
-      routing_paths = self.paths["config/routes.rb"].existent
+      paths = self.paths["config/routes.rb"].existent
 
-      if routes? || routing_paths.any?
-        app.routes_reloader.paths.unshift(*routing_paths)
+      if routes? || paths.any?
+        app.routes_reloader.paths.unshift(*paths)
         app.routes_reloader.route_sets << routes
       end
     end

data/lib/rails/gem_version.rb

@@ -6,9 +6,9 @@ module Rails
 
   module VERSION
     MAJOR = 4
-    MINOR = 1
-    TINY  = 16
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators.rb

@@ -156,10 +156,20 @@ module Rails
         args << "--help" if args.empty? && klass.arguments.any? { |a| a.required? }
         klass.start(args, config)
       else
-        puts "Could not find generator #{namespace}."
+        options     = sorted_groups.map(&:last).flatten
+        suggestions = options.sort_by {|suggested| levenshtein_distance(namespace.to_s, suggested) }.first(3)
+        msg =  "Could not find generator '#{namespace}'. "
+        msg << "Maybe you meant #{ suggestions.map {|s| "'#{s}'"}.join(" or ") }\n"
+        msg << "Run `rails generate --help` for more options."
+        puts msg
       end
     end
 
+    # Returns an array of generator namespaces that are hidden.
+    # Generator namespaces may be hidden for a variety of reasons.
+    # Some are aliased such as "rails:migration" and can be
+    # invoked with the shorter "migration", others are private to other generators
+    # such as "css:scaffold".
     def self.hidden_namespaces
       @hidden_namespaces ||= begin
         orm      = options[:rails][:orm]
@@ -199,17 +209,6 @@ module Rails
 
     # Show help message with available generators.
     def self.help(command = 'generate')
-      lookup!
-
-      namespaces = subclasses.map{ |k| k.namespace }
-      namespaces.sort!
-
-      groups = Hash.new { |h,k| h[k] = [] }
-      namespaces.each do |namespace|
-        base = namespace.split(':').first
-        groups[base] << namespace
-      end
-
       puts "Usage: rails #{command} GENERATOR [args] [options]"
       puts
       puts "General options:"
@@ -222,20 +221,74 @@ module Rails
       puts "Please choose a generator below."
       puts
 
-      # Print Rails defaults first.
+      print_generators
+    end
+
+    def self.public_namespaces
+      lookup!
+      subclasses.map { |k| k.namespace }
+    end
+
+    def self.print_generators
+      sorted_groups.each { |b, n| print_list(b, n) }
+    end
+
+    def self.sorted_groups
+      namespaces = public_namespaces
+      namespaces.sort!
+      groups = Hash.new { |h,k| h[k] = [] }
+      namespaces.each do |namespace|
+        base = namespace.split(':').first
+        groups[base] << namespace
+      end
       rails = groups.delete("rails")
       rails.map! { |n| n.sub(/^rails:/, '') }
       rails.delete("app")
       rails.delete("plugin")
-      print_list("rails", rails)
 
       hidden_namespaces.each { |n| groups.delete(n.to_s) }
 
-      groups.sort.each { |b, n| print_list(b, n) }
+      [["rails", rails]] + groups.sort.to_a
     end
 
     protected
 
+      # This code is based directly on the Text gem implementation
+      # Returns a value representing the "cost" of transforming str1 into str2
+      def self.levenshtein_distance str1, str2
+        s = str1
+        t = str2
+        n = s.length
+        m = t.length
+        max = n/2
+
+        return m if (0 == n)
+        return n if (0 == m)
+        return n if (n - m).abs > max
+
+        d = (0..m).to_a
+        x = nil
+
+        str1.each_char.each_with_index do |char1,i|
+          e = i+1
+
+          str2.each_char.each_with_index do |char2,j|
+            cost = (char1 == char2) ? 0 : 1
+            x = [
+                 d[j+1] + 1, # insertion
+                 e + 1,      # deletion
+                 d[j] + cost # substitution
+                ].min
+            d[j] = e
+            e = x
+          end
+
+          d[m] = x
+        end
+
+        return x
+      end
+
       # Prints a list of generators.
       def self.print_list(base, namespaces) #:nodoc:
         namespaces = namespaces.reject do |n|

data/lib/rails/generators/actions.rb

@@ -7,6 +7,7 @@ module Rails
       def initialize(*) # :nodoc:
         super
         @in_group = nil
+        @after_bundle_callbacks = []
       end
 
       # Adds an entry into +Gemfile+ for the supplied gem.
@@ -20,9 +21,9 @@ module Rails
 
         # Set the message to be shown in logs. Uses the git repo if one is given,
         # otherwise use name (version).
-        parts, message = [ name.inspect ], name
+        parts, message = [ quote(name) ], name
         if version ||= options.delete(:version)
-          parts   << version.inspect
+          parts   << quote(version)
           message << " (#{version})"
         end
         message = options[:git] if options[:git]
@@ -30,7 +31,7 @@ module Rails
         log :gemfile, message
 
         options.each do |option, value|
-          parts << "#{option}: #{value.inspect}"
+          parts << "#{option}: #{quote(value)}"
         end
 
         in_root do
@@ -68,7 +69,7 @@ module Rails
         log :source, source
 
         in_root do
-          prepend_file "Gemfile", "source #{source.inspect}\n", verbose: false
+          prepend_file "Gemfile", "source #{quote(source)}\n", verbose: false
         end
       end
 
@@ -188,7 +189,7 @@ module Rails
       #   generate(:authenticated, "user session")
       def generate(what, *args)
         log :generate, what
-        argument = args.map {|arg| arg.to_s }.flatten.join(" ")
+        argument = args.flat_map {|arg| arg.to_s }.join(" ")
 
         in_root { run_ruby_script("bin/rails generate #{what} #{argument}", verbose: false) }
       end
@@ -218,10 +219,10 @@ module Rails
       #   route "root 'welcome#index'"
       def route(routing_code)
         log :route, routing_code
-        sentinel = /\.routes\.draw do\s*\n/m
+        sentinel = /\.routes\.draw do\s*$/
 
         in_root do
-          inject_into_file 'config/routes.rb', "  #{routing_code}\n", { after: sentinel, verbose: false, force: true }
+          inject_into_file 'config/routes.rb', "\n  #{routing_code}", { after: sentinel, verbose: false }
         end
       end
 
@@ -232,6 +233,16 @@ module Rails
         log File.read(find_in_source_paths(path))
       end
 
+      # Registers a callback to be executed after bundle and spring binstubs
+      # have run.
+      #
+      #   after_bundle do
+      #     git add: '.'
+      #   end
+      def after_bundle(&block)
+        @after_bundle_callbacks << block
+      end
+
       protected
 
         # Define log for backwards compatibility. If just one argument is sent,
@@ -255,6 +266,15 @@ module Rails
           end
         end
 
+        # Surround string with single quotes if there is no quotes.
+        # Otherwise fall back to double quotes
+        def quote(str)
+          if str.include?("'")
+            str.inspect
+          else
+            "'#{str}'"
+          end
+        end
     end
   end
 end

data/lib/rails/generators/actions/create_migration.rb

@@ -55,7 +55,8 @@ module Rails
           else
             say_status :conflict, :red
             raise Error, "Another migration is already named #{migration_file_name}: " +
-                         "#{existing_migration}. Use --force to replace this migration file."
+              "#{existing_migration}. Use --force to replace this migration " +
+              "or --skip to ignore conflicted file."
           end
         end
 

data/lib/rails/generators/app_base.rb

@@ -41,6 +41,9 @@ module Rails
         class_option :skip_active_record, type: :boolean, aliases: '-O', default: false,
                                           desc: 'Skip Active Record files'
 
+        class_option :skip_gems,          type: :array, default: [],
+                                          desc: 'Skip the provided gems files'
+
         class_option :skip_action_view,   type: :boolean, aliases: '-V', default: false,
                                           desc: 'Skip Action View files'
 
@@ -79,8 +82,7 @@ module Rails
       end
 
       def initialize(*args)
-        @original_wd   = Dir.pwd
-        @gem_filter    = lambda { |gem| true }
+        @gem_filter    = lambda { |gem| !options[:skip_gems].include?(gem.name) }
         @extra_entries = []
         super
         convert_database_option_for_jruby
@@ -105,15 +107,14 @@ module Rails
       end
 
       def gemfile_entries
-        [ rails_gemfile_entry,
-          database_gemfile_entry,
-          assets_gemfile_entry,
-          javascript_gemfile_entry,
-          jbuilder_gemfile_entry,
-          sdoc_gemfile_entry,
-          spring_gemfile_entry,
-          mime_type_gemfile_entry,
-          @extra_entries].flatten.find_all(&@gem_filter)
+        [rails_gemfile_entry,
+         database_gemfile_entry,
+         assets_gemfile_entry,
+         javascript_gemfile_entry,
+         jbuilder_gemfile_entry,
+         sdoc_gemfile_entry,
+         psych_gemfile_entry,
+         @extra_entries].flatten.find_all(&@gem_filter)
       end
 
       def add_gem_entry_filter
@@ -161,8 +162,7 @@ module Rails
 
       def database_gemfile_entry
         return [] if options[:skip_active_record]
-        gem_name, gem_version = gem_for_database
-        GemfileEntry.version gem_name, gem_version,
+        GemfileEntry.version gem_for_database, nil,
                             "Use #{options[:database]} as the database for Active Record"
       end
 
@@ -174,17 +174,17 @@ module Rails
         options[value] ? '# ' : ''
       end
 
+      def sqlite3?
+        !options[:skip_active_record] && options[:database] == 'sqlite3'
+      end
+
       class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out)
         def initialize(name, version, comment, options = {}, commented_out = false)
           super
         end
 
-        def self.github(name, github, branch = nil, comment = nil)
-          if branch
-            new(name, nil, comment, github: github, branch: branch)
-          else
-            new(name, nil, comment, github: github)
-          end
+        def self.github(name, github, comment = nil)
+          new(name, nil, comment, github: github)
         end
 
         def self.version(name, version, comment = nil)
@@ -194,28 +194,13 @@ module Rails
         def self.path(name, path, comment = nil)
           new(name, nil, comment, path: path)
         end
-
-        def padding(max_width)
-          ' ' * (max_width - name.length + 2)
-        end
-
-        def version
-          version = super
-
-          if version.is_a?(Array)
-            version.join("', '")
-          else
-            version
-          end
-        end
       end
 
       def rails_gemfile_entry
         if options.dev?
-          [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
-           GemfileEntry.github('arel', 'rails/arel', '5-0-stable')]
+          [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)]
         elsif options.edge?
-          [GemfileEntry.github('rails', 'rails/rails', '4-1-stable')]
+          [GemfileEntry.github('rails', 'rails/rails')]
         else
           [GemfileEntry.version('rails',
                             Rails::VERSION::STRING,
@@ -226,16 +211,16 @@ 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", nil]
-        when "postgresql"     then ["pg", ["~> 0.11"]]
-        when "frontbase"      then ["ruby-frontbase", nil]
-        when "mysql"          then ["mysql2", ["~> 0.3.13"]]
-        when "sqlserver"      then ["activerecord-sqlserver-adapter", nil]
-        when "jdbcmysql"      then ["activerecord-jdbcmysql-adapter", nil]
-        when "jdbcsqlite3"    then ["activerecord-jdbcsqlite3-adapter", nil]
-        when "jdbcpostgresql" then ["activerecord-jdbcpostgresql-adapter", nil]
-        when "jdbc"           then ["activerecord-jdbc-adapter", nil]
-        else [options[:database], nil]
+        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"
+        when "jdbc"           then "activerecord-jdbc-adapter"
+        else options[:database]
         end
       end
 
@@ -253,14 +238,23 @@ module Rails
       def assets_gemfile_entry
         return [] if options[:skip_sprockets]
 
-        [
-          GemfileEntry.version('sass-rails',
-                               '~> 4.0.3',
-                               'Use SCSS for stylesheets'),
-          GemfileEntry.version('uglifier',
-                               '>= 1.3.0',
-                               'Use Uglifier as compressor for JavaScript assets')
-        ]
+        gems = []
+        if options.dev? || options.edge?
+          gems << GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails',
+                                    'Use edge version of sprockets-rails')
+          gems << GemfileEntry.github('sass-rails', 'rails/sass-rails',
+                                    'Use SCSS for stylesheets')
+        else
+          gems << GemfileEntry.version('sass-rails',
+                                     '~> 5.0.0.beta1',
+                                     'Use SCSS for stylesheets')
+        end
+
+        gems << GemfileEntry.version('uglifier',
+                                   '>= 1.3.0',
+                                   'Use Uglifier as compressor for JavaScript assets')
+
+        gems
       end
 
       def jbuilder_gemfile_entry
@@ -276,7 +270,7 @@ module Rails
       def coffee_gemfile_entry
         comment = 'Use CoffeeScript for .js.coffee assets and views'
         if options.dev? || options.edge?
-          GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', nil, comment
+          GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', comment
         else
           GemfileEntry.version 'coffee-rails', '~> 4.0.0', comment
         end
@@ -297,7 +291,7 @@ module Rails
       end
 
       def javascript_runtime_gemfile_entry
-        comment = 'See https://github.com/rails/execjs#readme for more supported runtimes'
+        comment = 'See https://github.com/sstephenson/execjs#readme for more supported runtimes'
         if defined?(JRUBY_VERSION)
           GemfileEntry.version 'therubyrhino', nil, comment
         else
@@ -305,16 +299,12 @@ module Rails
         end
       end
 
-      def spring_gemfile_entry
-        return [] unless spring_install?
-        comment = 'Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring'
-        GemfileEntry.new('spring', nil, comment, group: :development)
-      end
-
-      def mime_type_gemfile_entry
-        return [] unless RUBY_VERSION < '2'
+      def psych_gemfile_entry
+        return [] unless defined?(Rubinius)
 
-        GemfileEntry.new('mime-types', '< 3', nil, require: false)
+        comment = 'Use Psych as the YAML engine, instead of Syck, so serialized ' \
+                  'data can be read safely from different rubies (see http://git.io/uuLVag)'
+        GemfileEntry.new('psych', '~> 2.0', comment, platforms: :rbx)
       end
 
       def bundle_command(command)