railties 4.0.13 → 4.1.0.beta1

data/lib/rails/version.rb

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

data/lib/rails/welcome_controller.rb

@@ -1,6 +1,7 @@
-class Rails::WelcomeController < ActionController::Base # :nodoc:
-  self.view_paths = File.expand_path('../templates', __FILE__)
-  layout nil
+require 'rails/application_controller'
+
+class Rails::WelcomeController < Rails::ApplicationController # :nodoc:
+  layout false
 
   def index
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.1.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,62 +16,76 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.18.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.18.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.0.beta1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.0.beta1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -80,50 +94,49 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- RDOC_MAIN.rdoc
 - README.rdoc
+- RDOC_MAIN.rdoc
 - bin/rails
-- lib/rails.rb
 - lib/rails/all.rb
 - lib/rails/api/task.rb
 - lib/rails/app_rails_loader.rb
-- lib/rails/application.rb
 - lib/rails/application/bootstrap.rb
 - lib/rails/application/configuration.rb
+- lib/rails/application/default_middleware_stack.rb
 - lib/rails/application/finisher.rb
 - lib/rails/application/routes_reloader.rb
+- lib/rails/application.rb
+- lib/rails/application_controller.rb
 - lib/rails/backtrace_cleaner.rb
 - lib/rails/cli.rb
 - lib/rails/code_statistics.rb
 - lib/rails/code_statistics_calculator.rb
-- lib/rails/commands.rb
 - lib/rails/commands/application.rb
+- lib/rails/commands/commands_tasks.rb
 - lib/rails/commands/console.rb
 - lib/rails/commands/dbconsole.rb
 - lib/rails/commands/destroy.rb
 - lib/rails/commands/generate.rb
-- lib/rails/commands/plugin_new.rb
+- lib/rails/commands/plugin.rb
 - lib/rails/commands/runner.rb
 - lib/rails/commands/server.rb
 - lib/rails/commands/update.rb
+- lib/rails/commands.rb
 - lib/rails/configuration.rb
 - lib/rails/console/app.rb
 - lib/rails/console/helpers.rb
 - lib/rails/deprecation.rb
-- lib/rails/engine.rb
 - lib/rails/engine/commands.rb
 - lib/rails/engine/configuration.rb
 - lib/rails/engine/railties.rb
-- lib/rails/generators.rb
+- lib/rails/engine.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
 - lib/rails/generators/css/assets/assets_generator.rb
 - lib/rails/generators/css/assets/templates/stylesheet.css
 - lib/rails/generators/css/scaffold/scaffold_generator.rb
-- lib/rails/generators/erb.rb
 - lib/rails/generators/erb/controller/controller_generator.rb
 - lib/rails/generators/erb/controller/templates/view.html.erb
 - lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -134,16 +147,13 @@ files:
 - lib/rails/generators/erb/scaffold/templates/index.html.erb
 - lib/rails/generators/erb/scaffold/templates/new.html.erb
 - lib/rails/generators/erb/scaffold/templates/show.html.erb
+- lib/rails/generators/erb.rb
 - lib/rails/generators/generated_attribute.rb
 - lib/rails/generators/js/assets/assets_generator.rb
 - lib/rails/generators/js/assets/templates/javascript.js
 - lib/rails/generators/migration.rb
 - lib/rails/generators/named_base.rb
-- lib/rails/generators/rails/app/USAGE
 - lib/rails/generators/rails/app/app_generator.rb
-- lib/rails/generators/rails/app/templates/Gemfile
-- lib/rails/generators/rails/app/templates/README.rdoc
-- lib/rails/generators/rails/app/templates/Rakefile
 - lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
 - lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
 - lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt
@@ -152,7 +162,6 @@ files:
 - lib/rails/generators/rails/app/templates/bin/bundle
 - lib/rails/generators/rails/app/templates/bin/rails
 - lib/rails/generators/rails/app/templates/bin/rake
-- lib/rails/generators/rails/app/templates/config.ru
 - lib/rails/generators/rails/app/templates/config/application.rb
 - lib/rails/generators/rails/app/templates/config/boot.rb
 - lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
@@ -174,90 +183,94 @@ files:
 - lib/rails/generators/rails/app/templates/config/initializers/filter_parameter_logging.rb
 - lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
 - lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb
-- lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
 - lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
 - lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
 - lib/rails/generators/rails/app/templates/config/locales/en.yml
 - lib/rails/generators/rails/app/templates/config/routes.rb
+- lib/rails/generators/rails/app/templates/config/secrets.yml
+- lib/rails/generators/rails/app/templates/config.ru
 - lib/rails/generators/rails/app/templates/db/seeds.rb.tt
+- lib/rails/generators/rails/app/templates/Gemfile
 - lib/rails/generators/rails/app/templates/gitignore
 - lib/rails/generators/rails/app/templates/public/404.html
 - lib/rails/generators/rails/app/templates/public/422.html
 - lib/rails/generators/rails/app/templates/public/500.html
 - lib/rails/generators/rails/app/templates/public/favicon.ico
 - lib/rails/generators/rails/app/templates/public/robots.txt
+- lib/rails/generators/rails/app/templates/Rakefile
+- lib/rails/generators/rails/app/templates/README.rdoc
 - lib/rails/generators/rails/app/templates/test/test_helper.rb
-- lib/rails/generators/rails/assets/USAGE
+- lib/rails/generators/rails/app/USAGE
 - lib/rails/generators/rails/assets/assets_generator.rb
 - lib/rails/generators/rails/assets/templates/javascript.js
 - lib/rails/generators/rails/assets/templates/stylesheet.css
-- lib/rails/generators/rails/controller/USAGE
+- lib/rails/generators/rails/assets/USAGE
 - lib/rails/generators/rails/controller/controller_generator.rb
 - lib/rails/generators/rails/controller/templates/controller.rb
-- lib/rails/generators/rails/generator/USAGE
+- lib/rails/generators/rails/controller/USAGE
 - lib/rails/generators/rails/generator/generator_generator.rb
 - lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
 - lib/rails/generators/rails/generator/templates/USAGE.tt
-- lib/rails/generators/rails/generator/templates/templates/.empty_directory
-- lib/rails/generators/rails/helper/USAGE
+- lib/rails/generators/rails/generator/USAGE
 - lib/rails/generators/rails/helper/helper_generator.rb
 - lib/rails/generators/rails/helper/templates/helper.rb
-- lib/rails/generators/rails/integration_test/USAGE
+- lib/rails/generators/rails/helper/USAGE
 - lib/rails/generators/rails/integration_test/integration_test_generator.rb
-- lib/rails/generators/rails/migration/USAGE
+- lib/rails/generators/rails/integration_test/USAGE
 - lib/rails/generators/rails/migration/migration_generator.rb
-- lib/rails/generators/rails/model/USAGE
+- lib/rails/generators/rails/migration/USAGE
 - lib/rails/generators/rails/model/model_generator.rb
-- lib/rails/generators/rails/plugin_new/USAGE
-- lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
-- lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
-- lib/rails/generators/rails/plugin_new/templates/Gemfile
-- lib/rails/generators/rails/plugin_new/templates/MIT-LICENSE
-- lib/rails/generators/rails/plugin_new/templates/README.rdoc
-- lib/rails/generators/rails/plugin_new/templates/Rakefile
-- lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt
-- lib/rails/generators/rails/plugin_new/templates/app/helpers/%name%/application_helper.rb.tt
-- lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory
-- lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
-- lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
-- lib/rails/generators/rails/plugin_new/templates/bin/rails.tt
-- lib/rails/generators/rails/plugin_new/templates/config/routes.rb
-- lib/rails/generators/rails/plugin_new/templates/gitignore
-- lib/rails/generators/rails/plugin_new/templates/lib/%name%.rb
-- lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb
-- lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb
-- lib/rails/generators/rails/plugin_new/templates/lib/tasks/%name%_tasks.rake
-- lib/rails/generators/rails/plugin_new/templates/rails/application.rb
-- lib/rails/generators/rails/plugin_new/templates/rails/boot.rb
-- lib/rails/generators/rails/plugin_new/templates/rails/javascripts.js
-- lib/rails/generators/rails/plugin_new/templates/rails/routes.rb
-- lib/rails/generators/rails/plugin_new/templates/rails/stylesheets.css
-- lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb
-- lib/rails/generators/rails/plugin_new/templates/test/integration/navigation_test.rb
-- lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
-- lib/rails/generators/rails/resource/USAGE
+- lib/rails/generators/rails/model/USAGE
+- lib/rails/generators/rails/plugin/plugin_generator.rb
+- lib/rails/generators/rails/plugin/templates/%name%.gemspec
+- lib/rails/generators/rails/plugin/templates/app/controllers/%name%/application_controller.rb.tt
+- lib/rails/generators/rails/plugin/templates/app/helpers/%name%/application_helper.rb.tt
+- lib/rails/generators/rails/plugin/templates/app/views/layouts/%name%/application.html.erb.tt
+- lib/rails/generators/rails/plugin/templates/bin/rails.tt
+- lib/rails/generators/rails/plugin/templates/config/routes.rb
+- lib/rails/generators/rails/plugin/templates/Gemfile
+- lib/rails/generators/rails/plugin/templates/gitignore
+- lib/rails/generators/rails/plugin/templates/lib/%name%/engine.rb
+- lib/rails/generators/rails/plugin/templates/lib/%name%/version.rb
+- lib/rails/generators/rails/plugin/templates/lib/%name%.rb
+- lib/rails/generators/rails/plugin/templates/lib/tasks/%name%_tasks.rake
+- lib/rails/generators/rails/plugin/templates/MIT-LICENSE
+- lib/rails/generators/rails/plugin/templates/rails/application.rb
+- lib/rails/generators/rails/plugin/templates/rails/boot.rb
+- lib/rails/generators/rails/plugin/templates/rails/javascripts.js
+- lib/rails/generators/rails/plugin/templates/rails/routes.rb
+- lib/rails/generators/rails/plugin/templates/rails/stylesheets.css
+- lib/rails/generators/rails/plugin/templates/Rakefile
+- lib/rails/generators/rails/plugin/templates/README.rdoc
+- lib/rails/generators/rails/plugin/templates/test/%name%_test.rb
+- lib/rails/generators/rails/plugin/templates/test/integration/navigation_test.rb
+- lib/rails/generators/rails/plugin/templates/test/test_helper.rb
+- lib/rails/generators/rails/plugin/USAGE
 - lib/rails/generators/rails/resource/resource_generator.rb
+- lib/rails/generators/rails/resource/USAGE
 - lib/rails/generators/rails/resource_route/resource_route_generator.rb
-- lib/rails/generators/rails/scaffold/USAGE
 - lib/rails/generators/rails/scaffold/scaffold_generator.rb
 - lib/rails/generators/rails/scaffold/templates/scaffold.css
-- lib/rails/generators/rails/scaffold_controller/USAGE
+- lib/rails/generators/rails/scaffold/USAGE
 - lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
 - lib/rails/generators/rails/scaffold_controller/templates/controller.rb
-- lib/rails/generators/rails/task/USAGE
+- lib/rails/generators/rails/scaffold_controller/USAGE
 - lib/rails/generators/rails/task/task_generator.rb
 - lib/rails/generators/rails/task/templates/task.rb
+- lib/rails/generators/rails/task/USAGE
 - lib/rails/generators/resource_helpers.rb
 - lib/rails/generators/test_case.rb
-- lib/rails/generators/test_unit.rb
 - lib/rails/generators/test_unit/controller/controller_generator.rb
 - lib/rails/generators/test_unit/controller/templates/functional_test.rb
+- lib/rails/generators/test_unit/generator/generator_generator.rb
+- lib/rails/generators/test_unit/generator/templates/generator_test.rb
 - lib/rails/generators/test_unit/helper/helper_generator.rb
 - lib/rails/generators/test_unit/helper/templates/helper_test.rb
 - lib/rails/generators/test_unit/integration/integration_generator.rb
 - lib/rails/generators/test_unit/integration/templates/integration_test.rb
 - lib/rails/generators/test_unit/mailer/mailer_generator.rb
 - lib/rails/generators/test_unit/mailer/templates/functional_test.rb
+- lib/rails/generators/test_unit/mailer/templates/preview.rb
 - lib/rails/generators/test_unit/model/model_generator.rb
 - lib/rails/generators/test_unit/model/templates/fixtures.yml
 - lib/rails/generators/test_unit/model/templates/unit_test.rb
@@ -266,24 +279,26 @@ files:
 - lib/rails/generators/test_unit/plugin/templates/test_helper.rb
 - lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
 - lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+- lib/rails/generators/test_unit.rb
 - lib/rails/generators/testing/assertions.rb
 - lib/rails/generators/testing/behaviour.rb
 - lib/rails/generators/testing/setup_and_teardown.rb
+- lib/rails/generators.rb
 - lib/rails/info.rb
 - lib/rails/info_controller.rb
 - lib/rails/initializable.rb
+- lib/rails/mailers_controller.rb
 - lib/rails/paths.rb
-- lib/rails/rack.rb
 - lib/rails/rack/debugger.rb
 - lib/rails/rack/log_tailer.rb
 - lib/rails/rack/logger.rb
-- lib/rails/railtie.rb
+- lib/rails/rack.rb
 - lib/rails/railtie/configurable.rb
 - lib/rails/railtie/configuration.rb
+- lib/rails/railtie.rb
 - lib/rails/ruby_version_check.rb
 - lib/rails/rubyprof_ext.rb
 - lib/rails/source_annotation_extractor.rb
-- lib/rails/tasks.rb
 - lib/rails/tasks/annotations.rake
 - lib/rails/tasks/documentation.rake
 - lib/rails/tasks/engine.rake
@@ -294,9 +309,13 @@ files:
 - lib/rails/tasks/routes.rake
 - lib/rails/tasks/statistics.rake
 - lib/rails/tasks/tmp.rake
+- lib/rails/tasks.rb
 - lib/rails/templates/layouts/application.html.erb
 - lib/rails/templates/rails/info/properties.html.erb
 - lib/rails/templates/rails/info/routes.html.erb
+- lib/rails/templates/rails/mailers/email.html.erb
+- lib/rails/templates/rails/mailers/index.html.erb
+- lib/rails/templates/rails/mailers/mailer.html.erb
 - lib/rails/templates/rails/welcome/index.html.erb
 - lib/rails/test_help.rb
 - lib/rails/test_unit/railtie.rb
@@ -304,29 +323,33 @@ files:
 - lib/rails/test_unit/testing.rake
 - lib/rails/version.rb
 - lib/rails/welcome_controller.rb
+- lib/rails.rb
+- lib/rails/generators/rails/generator/templates/templates/.empty_directory
+- lib/rails/generators/rails/plugin/templates/app/mailers/.empty_directory
+- lib/rails/generators/rails/plugin/templates/app/models/.empty_directory
 homepage: http://www.rubyonrails.org
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--exclude"
-- "."
+- --exclude
+- .
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       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.4.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.

data/lib/rails/commands/plugin_new.rb

@@ -1,9 +0,0 @@
-if ARGV.first != "new"
-  ARGV[0] = "--help"
-else
-  ARGV.shift
-end
-
-require 'rails/generators'
-require 'rails/generators/rails/plugin_new/plugin_new_generator'
-Rails::Generators::PluginNewGenerator.start

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

@@ -1,68 +0,0 @@
-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