railties 4.0.3 → 4.0.4.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5689b5bea25ae05f0c03d307d2bcbf1100c24e
-  data.tar.gz: a7a34a697e412f009059402902938d23a7a1461d
+  metadata.gz: 7ecf31fbccd4ced48e27c08f96230389580a2e0e
+  data.tar.gz: a4e8cf6b10f3147049b34b4731608860fa4cd46b
 SHA512:
-  metadata.gz: 14344507cdc099caddb83f5a37ff555071cc9d7c7dcda6f6192f5e8b354ec5a1ea1ecd5a3eb31698a5431a864589ef21c72d2f11b2de8b24c39b7cbf78612f94
-  data.tar.gz: 8998b34540deef294c1715dfd72abbe4ff0c8ae1d6a33543705163b80827995a00150585a31e85fe4a6bacbcf83121231152a8cb0a2269c41fd174460d5945e5
+  metadata.gz: 82641a8f707a8da6d6f208d190efb19b41d948cef2934259f7ae4b8112bbeef4cf91887b0d4170ea571fcbb43f7dc5cab01d06f996a851ea0e23e28f1c3dbfcb
+  data.tar.gz: 17376d4b68ed6e74421d31a14eb38c5a9f6f7e403a14e0d6b9528dbf714dbb8a62e666a3254e5933b7da8410907ea33de9a9bda00abbb583a27951b4dc6d7391

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## Rails 4.0.4 ##
+
+*   Added Thor-action for creation of migrations.
+
+    Fixes #13588 and #12674.
+
+    *Gert Goet*
+
+*   Add `ENV['DATABASE_URL']` support in `rails dbconsole`. Fixes #13320.
+
+    *Huiming Teo*
+
+*   Fix default `config/application.rb` template to honor the RAILS_GROUPS env variable.
+
+    *Guillermo Iguaran*
+
+*   Fix default `config/application.rb` template to remove unused `config.assets.enabled` variable.
+
+    *Guillermo Iguaran*
+
+
+## Rails 4.0.3 (February 18, 2014) ##
+
+*No changes*
+
+
+## Rails 4.0.2 (December 02, 2013) ##
+
+*No changes*
+
+
 ## Rails 4.0.1 (November 01, 2013) ##
 
 *   Fix the event name of action_dispatch requests.

data/bin/rails

@@ -2,7 +2,7 @@
 
 git_path = File.join(File.expand_path('../../..', __FILE__), '.git')
 
-if File.exists?(git_path)
+if File.exist?(git_path)
   railties_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(railties_path)
 end

data/lib/rails/app_rails_loader.rb

@@ -55,7 +55,7 @@ EOS
     end
 
     def self.find_executable
-      EXECUTABLES.find { |exe| File.exists?(exe) }
+      EXECUTABLES.find { |exe| File.exist?(exe) }
     end
   end
 end

data/lib/rails/application.rb

@@ -181,7 +181,7 @@ module Rails
     # you need to load files in lib/ during the application configuration as well.
     def add_lib_to_load_path! #:nodoc:
       path = File.join config.root, 'lib'
-      $LOAD_PATH.unshift(path) if File.exists?(path)
+      $LOAD_PATH.unshift(path) if File.exist?(path)
     end
 
     def require_environment! #:nodoc:

data/lib/rails/application/configuration.rb

@@ -101,7 +101,7 @@ module Rails
       # Loads and returns the configuration of the database.
       def database_configuration
         yaml = paths["config/database"].first
-        if File.exists?(yaml)
+        if File.exist?(yaml)
           require "erb"
           YAML.load ERB.new(IO.read(yaml)).result
         elsif ENV['DATABASE_URL']

data/lib/rails/commands.rb

@@ -65,7 +65,7 @@ when 'server'
   # Change to the application's path if there is no config.ru file in current directory.
   # This allows us to run `rails server` from other directories, but still get
   # the main config.ru and properly set the tmp directory.
-  Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path("config.ru"))
+  Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exist?(File.expand_path("config.ru"))
 
   require 'rails/commands/server'
   Rails::Server.new.tap do |server|

data/lib/rails/commands/dbconsole.rb

@@ -81,14 +81,11 @@ module Rails
 
     def config
       @config ||= begin
-        cfg = begin
-          YAML.load(ERB.new(IO.read("config/database.yml")).result)
-        rescue SyntaxError, StandardError
-          require APP_PATH
-          Rails.application.config.database_configuration
-        end
-
-        cfg[environment] || abort("No database is configured for the environment '#{environment}'")
+        require APP_PATH
+        ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(
+          ENV['DATABASE_URL'],
+          (Rails.application.config.database_configuration || {})
+        ).spec.config.stringify_keys
       end
     end
 

data/lib/rails/commands/runner.rb

@@ -50,5 +50,5 @@ elsif File.exist?(code_or_file)
   $0 = code_or_file
   eval(File.read(code_or_file), nil, code_or_file)
 else
-  eval(code_or_file)
+  eval(code_or_file, binding, __FILE__, __LINE__)
 end

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

@@ -0,0 +1,68 @@
+require 'thor/actions/create_file'
+
+module Rails
+  module Generators
+    module Actions
+      class CreateMigration < Thor::Actions::CreateFile
+
+        def migration_dir
+          File.dirname(@destination)
+        end
+
+        def migration_file_name
+          @base.migration_file_name
+        end
+
+        def identical?
+          exists? && File.binread(existing_migration) == render
+        end
+
+        def revoke!
+          say_destination = exists? ? relative_existing_migration : relative_destination
+          say_status :remove, :red, say_destination
+          return unless exists?
+          ::FileUtils.rm_rf(existing_migration) unless pretend?
+          existing_migration
+        end
+
+        def relative_existing_migration
+          base.relative_to_original_destination_root(existing_migration)
+        end
+
+        def existing_migration
+          @existing_migration ||= begin
+            @base.class.migration_exists?(migration_dir, migration_file_name) ||
+            File.exist?(@destination) && @destination
+          end
+        end
+        alias :exists? :existing_migration
+
+        protected
+
+        def on_conflict_behavior(&block)
+          options = base.options.merge(config)
+          if identical?
+            say_status :identical, :blue, relative_existing_migration
+          elsif options[:force]
+            say_status :remove, :green, relative_existing_migration
+            say_status :create, :green
+            unless pretend?
+              ::FileUtils.rm_rf(existing_migration)
+              block.call
+            end
+          elsif options[:skip]
+            say_status :skip, :yellow
+          else
+            say_status :conflict, :red
+            raise Error, "Another migration is already named #{migration_file_name}: " +
+                         "#{existing_migration}. Use --force to replace this migration file."
+          end
+        end
+
+        def say_status(status, color, message = relative_destination)
+          base.shell.say_status(status, message, color) if config[:verbose]
+        end
+      end
+    end
+  end
+end

data/lib/rails/generators/app_base.rb

@@ -134,12 +134,12 @@ module Rails
         if options.dev?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     path: '#{Rails::Generators::RAILS_DEV_PATH}'
-            gem 'arel',      github: 'rails/arel'
+            gem 'arel',      github: 'rails/arel', branch: '4-0-stable'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
-            gem 'rails',     github: 'rails/rails'
-            gem 'arel',      github: 'rails/arel'
+            gem 'rails',     github: 'rails/rails', branch: '4-0-stable'
+            gem 'arel',      github: 'rails/arel', branch: '4-0-stable'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc

data/lib/rails/generators/base.rb

@@ -211,7 +211,7 @@ module Rails
         return unless base_name && generator_name
         return unless default_generator_root
         path = File.join(default_generator_root, 'templates')
-        path if File.exists?(path)
+        path if File.exist?(path)
       end
 
       # Returns the base root for a common set of generators. This is used to dynamically
@@ -365,12 +365,12 @@ module Rails
             source_root && File.expand_path("../USAGE", source_root),
             default_generator_root && File.join(default_generator_root, "USAGE")
           ]
-          paths.compact.detect { |path| File.exists? path }
+          paths.compact.detect { |path| File.exist? path }
         end
 
         def self.default_generator_root
           path = File.expand_path(File.join(base_name, generator_name), base_root)
-          path if File.exists?(path)
+          path if File.exist?(path)
         end
 
     end

data/lib/rails/generators/migration.rb

@@ -1,3 +1,5 @@
+require 'rails/generators/actions/create_migration'
+
 module Rails
   module Generators
     # Holds common methods for migrations. It assumes that migrations has the
@@ -30,6 +32,19 @@ module Rails
         end
       end
 
+      def create_migration(destination, data, config = {}, &block)
+        action Rails::Generators::Actions::CreateMigration.new(self, destination, block || data.to_s, config)
+      end
+
+      def set_migration_assigns!(destination)
+        destination = File.expand_path(destination, self.destination_root)
+
+        migration_dir = File.dirname(destination)
+        @migration_number     = self.class.next_migration_number(migration_dir)
+        @migration_file_name  = File.basename(destination, '.rb')
+        @migration_class_name = @migration_file_name.camelize
+      end
+
       # Creates a migration template at the given destination. The difference
       # to the default template method is that the migration version is appended
       # to the destination file name.
@@ -38,26 +53,18 @@ module Rails
       # available as instance variables in the template to be rendered.
       #
       #   migration_template "migration.rb", "db/migrate/add_foo_to_bar.rb"
-      def migration_template(source, destination=nil, config={})
-        destination = File.expand_path(destination || source, self.destination_root)
+      def migration_template(source, destination, config = {})
+        source  = File.expand_path(find_in_source_paths(source.to_s))
 
-        migration_dir = File.dirname(destination)
-        @migration_number     = self.class.next_migration_number(migration_dir)
-        @migration_file_name  = File.basename(destination).sub(/\.rb$/, '')
-        @migration_class_name = @migration_file_name.camelize
+        set_migration_assigns!(destination)
+        context = instance_eval('binding')
 
-        destination = self.class.migration_exists?(migration_dir, @migration_file_name)
+        dir, base = File.split(destination)
+        numbered_destination = File.join(dir, ["%migration_number%", base].join('_'))
 
-        if !(destination && options[:skip]) && behavior == :invoke
-          if destination && options.force?
-            remove_file(destination)
-          elsif destination
-            raise Error, "Another migration is already named #{@migration_file_name}: #{destination}. Use --force to remove the old migration file and replace it."
-          end
-          destination = File.join(migration_dir, "#{@migration_number}_#{@migration_file_name}.rb")
+        create_migration numbered_destination, nil, config do
+          ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
         end
-
-        template(source, destination, config)
       end
     end
   end

data/lib/rails/generators/rails/app/templates/Gemfile

@@ -16,7 +16,7 @@ group :doc do
 end
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.1.2'
+# gem 'bcrypt', '~> 3.1.7'
 
 # Use unicorn as the app server
 # gem 'unicorn'

data/lib/rails/generators/rails/app/templates/config/application.rb

@@ -13,7 +13,7 @@ require "action_mailer/railtie"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env)
+Bundler.require(*Rails.groups)
 
 module <%= app_const_base %>
   class Application < Rails::Application
@@ -28,10 +28,5 @@ module <%= app_const_base %>
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-<% if options.skip_sprockets? -%>
-
-    # Disable the asset pipeline.
-    config.assets.enabled = false
-<% end -%>
   end
 end

data/lib/rails/generators/rails/app/templates/config/boot.rb

@@ -1,4 +1,4 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

@@ -22,8 +22,8 @@
   <%- unless options.skip_active_record? -%>
   # Raise an error on page load if there are pending migrations
   config.active_record.migration_error = :page_load
-  <%- end -%>
 
+  <%- end -%>
   <%- unless options.skip_sprockets? -%>
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large

data/lib/rails/generators/rails/app/templates/public/robots.txt

@@ -1,4 +1,4 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
 #
 # To ban all spiders from the entire site uncomment the next two lines:
 # User-agent: *

data/lib/rails/generators/rails/model/USAGE

@@ -60,7 +60,7 @@ Available field types:
     For decimal two integers separated by a comma in curly braces will be used
     for precision and scale:
 
-        `rails generate model product price:decimal{10,2}`
+        `rails generate model product 'price:decimal{10,2}'`
 
     You can add a `:uniq` or `:index` suffix for unique or standard indexes
     respectively:

data/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

@@ -317,7 +317,7 @@ task default: :test
         @application_definition ||= begin
 
           dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
-          unless options[:pretend] || !File.exists?(dummy_application_path)
+          unless options[:pretend] || !File.exist?(dummy_application_path)
             contents = File.read(dummy_application_path)
             contents[(contents.index(/module ([\w]+)\n(.*)class Application/m))..-1]
           end

data/lib/rails/generators/rails/plugin_new/templates/bin/rails.tt

@@ -3,5 +3,9 @@
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/<%= name -%>/engine', __FILE__)
 
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
 require 'rails/all'
 require 'rails/engine/commands'

data/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/lib/rails/generators/testing/assertions.rb

@@ -22,7 +22,7 @@ module Rails
         #   end
         def assert_file(relative, *contents)
           absolute = File.expand_path(relative, destination_root)
-          assert File.exists?(absolute), "Expected file #{relative.inspect} to exist, but does not"
+          assert File.exist?(absolute), "Expected file #{relative.inspect} to exist, but does not"
 
           read = File.read(absolute) if block_given? || !contents.empty?
           yield read if block_given?
@@ -44,7 +44,7 @@ module Rails
         #   assert_no_file "config/random.rb"
         def assert_no_file(relative)
           absolute = File.expand_path(relative, destination_root)
-          assert !File.exists?(absolute), "Expected file #{relative.inspect} to not exist, but does"
+          assert !File.exist?(absolute), "Expected file #{relative.inspect} to not exist, but does"
         end
         alias :assert_no_directory :assert_no_file
 

data/lib/rails/generators/testing/behaviour.rb

@@ -61,9 +61,11 @@ module Rails
         # You can provide a configuration hash as second argument. This method returns the output
         # printed by the generator.
         def run_generator(args=self.default_arguments, config={})
-          capture(:stdout) do
-            args += ['--skip-bundle'] unless args.include? '--dev'
-            self.generator_class.start(args, config.reverse_merge(destination_root: destination_root))
+          without_thor_debug do
+            capture(:stdout) do
+              args += ['--skip-bundle'] unless args.include? '--dev'
+              self.generator_class.start(args, config.reverse_merge(destination_root: destination_root))
+            end
           end
         end
 
@@ -100,6 +102,14 @@ module Rails
             dirname, file_name = File.dirname(absolute), File.basename(absolute).sub(/\.rb$/, '')
             Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
           end
+
+          # TODO: remove this once Bundler 1.5.2 is released
+          def without_thor_debug # :nodoc:
+            thor_debug, ENV['THOR_DEBUG'] = ENV['THOR_DEBUG'], nil
+            yield
+          ensure
+            ENV['THOR_DEBUG'] = thor_debug
+          end
       end
     end
   end

data/lib/rails/paths.rb

@@ -203,7 +203,7 @@ module Rails
 
       # Returns all expanded paths but only if they exist in the filesystem.
       def existent
-        expanded.select { |f| File.exists?(f) }
+        expanded.select { |f| File.exist?(f) }
       end
 
       def existent_directories

data/lib/rails/rack/log_tailer.rb

@@ -7,7 +7,7 @@ module Rails
         path = Pathname.new(log || "#{::File.expand_path(Rails.root)}/log/#{Rails.env}.log").cleanpath
 
         @cursor = @file = nil
-        if ::File.exists?(path)
+        if ::File.exist?(path)
           @cursor = ::File.size(path)
           @file = ::File.open(path, 'r')
         end

data/lib/rails/tasks/framework.rake

@@ -46,7 +46,7 @@ namespace :rails do
         require 'rails/generators/rails/app/app_generator'
         gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
                                                              destination_root: Rails.root
-        File.exists?(Rails.root.join("config", "application.rb")) ?
+        File.exist?(Rails.root.join("config", "application.rb")) ?
           gen.send(:app_const) : gen.send(:valid_const?)
         gen
       end
@@ -67,7 +67,7 @@ namespace :rails do
     task :application_controller do
       old_style = Rails.root + '/app/controllers/application.rb'
       new_style = Rails.root + '/app/controllers/application_controller.rb'
-      if File.exists?(old_style) && !File.exists?(new_style)
+      if File.exist?(old_style) && !File.exist?(new_style)
         FileUtils.mv(old_style, new_style)
         puts "#{old_style} has been renamed to #{new_style}, update your SCM as necessary"
       end

data/lib/rails/tasks/log.rake

@@ -10,7 +10,7 @@ namespace :log do
     if ENV['LOGS']
       ENV['LOGS'].split(',')
                   .map    { |file| "log/#{file.strip}.log" }
-                  .select { |file| File.exists?(file) }
+                  .select { |file| File.exist?(file) }
     else
       FileList["log/*.log"]
     end

data/lib/rails/version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION
     MAJOR = 4
     MINOR = 0
-    TINY  = 3
-    PRE   = nil
+    TINY  = 4
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.4.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.4.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.4.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.4.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ files:
 - lib/rails/engine/railties.rb
 - lib/rails/generators.rb
 - lib/rails/generators/actions.rb
+- lib/rails/generators/actions/create_migration.rb
 - lib/rails/generators/active_model.rb
 - lib/rails/generators/app_base.rb
 - lib/rails/generators/base.rb
@@ -320,12 +321,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.