railties 4.2.0.beta3 → 4.2.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d972f0957eb28d32a58ad8fb2e4e96f853263bf2
-  data.tar.gz: 5a69d1a60ac4a69a1c554a7a09f4fa401100e118
+  metadata.gz: 0762e4948920f6a4982be97cdf7941b8fba50810
+  data.tar.gz: afc9c44925b92fadaea2e6556f6ae29707dc98d7
 SHA512:
-  metadata.gz: c919e20c5d95231e9417ea626c02de6ba9f44d76b056ab05c7551b8a72739c12892ad8e4074aa002cdd1f190557b895c94589fc4106c90a142060bd4242774b7
-  data.tar.gz: bce251eaaced259b6275c2dd9c7aeaf027ae9b057b9982c4dbe30b39dc076ef94cd0e3887662148fa8cfb01152f37cd1b1149638ecb874a3a47a96ece304fc56
+  metadata.gz: 7f52cbcfea3201647694b0ff274dc56e84c226676f923af1525f6e35fa48696a64a815b5da8d07aa0d9bdc15a38c91dec7ca51371e8a559b4dd510eb34802190
+  data.tar.gz: 8ff73da75dda716b4f5218ee127129b382ae5bd2256debfa897d3a340f127d1fd13398aeab17a0af7e2b5b6e59f8b33eb5fa636580576fd9ec780245a1d69b54

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-*   Remove --skip-action-view option from Rails::Generators::AppBase
+*   Remove `--skip-action-view` option from `Rails::Generators::AppBase`.
 
     Fixes #17023.
 
@@ -89,13 +89,7 @@
 
     *Rafael Mendonça França*
 
-*   Add a generic --skip-gems options to generator
-
-    This option is useful if users want to remove some gems like jbuilder,
-    turbolinks, coffee-rails, etc that don't have specific options on the
-    generator.
-
-        rails new my_app --skip-gems turbolinks coffee-rails
+*   Add a generic --skip-turbolinks options to generator.
 
     *Rafael Mendonça França*
 

data/lib/rails/backtrace_cleaner.rb

@@ -4,12 +4,16 @@ module Rails
   class BacktraceCleaner < ActiveSupport::BacktraceCleaner
     APP_DIRS_PATTERN = /^\/?(app|config|lib|test)/
     RENDER_TEMPLATE_PATTERN = /:in `_render_template_\w*'/
+    EMPTY_STRING = ''.freeze
+    SLASH        = '/'.freeze
+    DOT_SLASH    = './'.freeze
 
     def initialize
       super
-      add_filter   { |line| line.sub("#{Rails.root}/", '') }
-      add_filter   { |line| line.sub(RENDER_TEMPLATE_PATTERN, '') }
-      add_filter   { |line| line.sub('./', '/') } # for tests
+      @root = "#{Rails.root}/".freeze
+      add_filter { |line| line.sub(@root, EMPTY_STRING) }
+      add_filter { |line| line.sub(RENDER_TEMPLATE_PATTERN, EMPTY_STRING) }
+      add_filter { |line| line.sub(DOT_SLASH, SLASH) } # for tests
 
       add_gem_filters
       add_silencer { |line| line !~ APP_DIRS_PATTERN }
@@ -21,7 +25,8 @@ module Rails
         return if gems_paths.empty?
 
         gems_regexp = %r{(#{gems_paths.join('|')})/gems/([^/]+)-([\w.]+)/(.*)}
-        add_filter { |line| line.sub(gems_regexp, '\2 (\3) \4') }
+        gems_result = '\2 (\3) \4'.freeze
+        add_filter { |line| line.sub(gems_regexp, gems_result) }
       end
   end
 end

data/lib/rails/commands/commands_tasks.rb

@@ -127,7 +127,7 @@ EOT
         require 'rails/generators'
         require_application_and_environment!
         Rails.application.load_generators
-        require "rails/commands/#{command}"
+        require_command!(command)
       end
 
       # Change to the application's path if there is no config.ru file in current directory.

data/lib/rails/gem_version.rb

@@ -8,7 +8,7 @@ module Rails
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/actions.rb

@@ -85,10 +85,10 @@ module Rails
       #   environment(nil, env: "development") do
       #     "config.autoload_paths += %W(#{config.root}/extras)"
       #   end
-      def environment(data=nil, options={}, &block)
+      def environment(data=nil, options={})
         sentinel = /class [a-z_:]+ < Rails::Application/i
         env_file_sentinel = /Rails\.application\.configure do/
-        data = block.call if !data && block_given?
+        data = yield if !data && block_given?
 
         in_root do
           if options[:env].nil?

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

@@ -39,7 +39,7 @@ module Rails
 
         protected
 
-        def on_conflict_behavior(&block)
+        def on_conflict_behavior
           options = base.options.merge(config)
           if identical?
             say_status :identical, :blue, relative_existing_migration
@@ -48,7 +48,7 @@ module Rails
             say_status :create, :green
             unless pretend?
               ::FileUtils.rm_rf(existing_migration)
-              block.call
+              yield
             end
           elsif options[:skip]
             say_status :skip, :yellow

data/lib/rails/generators/app_base.rb

@@ -41,9 +41,6 @@ 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_sprockets,     type: :boolean, aliases: '-S', default: false,
                                           desc: 'Skip Sprockets files'
 
@@ -65,6 +62,9 @@ module Rails
         class_option :edge,               type: :boolean, default: false,
                                           desc: "Setup the #{name} with Gemfile pointing to Rails repository"
 
+        class_option :skip_turbolinks,    type: :boolean, default: false,
+                                          desc: 'Skip turbolinks gem'
+
         class_option :skip_test_unit,     type: :boolean, aliases: '-T', default: false,
                                           desc: 'Skip Test::Unit files'
 
@@ -79,7 +79,7 @@ module Rails
       end
 
       def initialize(*args)
-        @gem_filter    = lambda { |gem| !options[:skip_gems].include?(gem.name) }
+        @gem_filter    = lambda { |gem| true }
         @extra_entries = []
         super
         convert_database_option_for_jruby
@@ -265,11 +265,11 @@ module Rails
       end
 
       def coffee_gemfile_entry
-        comment = 'Use CoffeeScript for .js.coffee assets and views'
+        comment = 'Use CoffeeScript for .coffee assets and views'
         if options.dev? || options.edge?
           GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', comment
         else
-          GemfileEntry.version 'coffee-rails', '~> 4.0.0', comment
+          GemfileEntry.version 'coffee-rails', '~> 4.1.0', comment
         end
       end
 
@@ -287,8 +287,11 @@ module Rails
                                          "Use #{options[:javascript]} as the JavaScript library")
           end
 
-          gems << GemfileEntry.version("turbolinks", nil,
-            "Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks")
+          unless options[:skip_turbolinks]
+            gems << GemfileEntry.version("turbolinks", nil,
+             "Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks")
+          end
+
           gems
         end
       end

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

@@ -23,10 +23,11 @@ source 'https://rubygems.org'
 
 group :development, :test do
 <% unless defined?(JRUBY_VERSION) -%>
-  # Call 'debugger' anywhere in the code to stop execution and get a debugger console
   <%- if RUBY_VERSION < '2.0.0' -%>
+  # Call 'debugger' anywhere in the code to stop execution and get a debugger console
   gem 'debugger'
   <%- else -%>
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
   <%- end -%>
 
@@ -39,7 +40,7 @@ group :development, :test do
 <% end -%>
 end
 
-<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince/) -%>
+<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 <% end -%>

data/lib/rails/generators/rails/controller/controller_generator.rb

@@ -12,7 +12,7 @@ module Rails
 
       def add_routes
         unless options[:skip_routes]
-          actions.reverse.each do |action|
+          actions.reverse_each do |action|
             route generate_routing_code(action)
           end
         end

data/lib/rails/generators/rails/plugin/templates/test/test_helper.rb

@@ -4,6 +4,9 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../<%= options[:dummy_path] -%>/config/environment.rb",  __FILE__)
 <% unless options[:skip_active_record] -%>
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../<%= options[:dummy_path] -%>/db/migrate", __FILE__)]
+<% if options[:mountable] -%>
+ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
+<% end -%>
 <% end -%>
 require "rails/test_help"
 

data/lib/rails/generators/test_unit/job/job_generator.rb

@@ -6,7 +6,7 @@ module TestUnit # :nodoc:
       check_class_collision suffix: 'JobTest'
 
       def create_test_file
-        template 'unit_test.rb.erb', File.join('test/jobs', class_path, "#{file_name}_test.rb")
+        template 'unit_test.rb.erb', File.join('test/jobs', class_path, "#{file_name}_job_test.rb")
       end
     end
   end

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

@@ -50,7 +50,7 @@ module Rails
         #   class AppGeneratorTest < Rails::Generators::TestCase
         #     tests AppGenerator
         #     destination File.expand_path("../tmp", File.dirname(__FILE__))
-        #     teardown :cleanup_destination_root
+        #     setup :prepare_destination
         #
         #     test "database.yml is not created when skipping Active Record" do
         #       run_generator %w(myapp --skip-active-record)

data/lib/rails/rack/log_tailer.rb

@@ -4,7 +4,7 @@ module Rails
   module Rack
     class LogTailer
       def initialize(app, log = nil)
-        ActiveSupport::Deprecation.warn "LogTailer is deprecated and will be removed on Rails 5"
+        ActiveSupport::Deprecation.warn('LogTailer is deprecated and will be removed on Rails 5.')
 
         @app = app
 

data/lib/rails/templates/rails/mailers/email.html.erb

@@ -2,6 +2,10 @@
 <html><head>
 <meta name="viewport" content="width=device-width" />
 <style type="text/css">
+  html, body, iframe {
+    height: 100%;
+  }
+
   body {
     margin: 0;
   }
@@ -38,7 +42,6 @@
   iframe {
     border: 0;
     width: 100%;
-    height: 800px;
   }
 </style>
 </head>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta3
+  version: 4.2.0.beta4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,60 +16,60 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
 - !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
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -122,7 +122,6 @@ files:
 - lib/rails/commands/plugin.rb
 - lib/rails/commands/runner.rb
 - lib/rails/commands/server.rb
-- lib/rails/commands/update.rb
 - lib/rails/configuration.rb
 - lib/rails/console/app.rb
 - lib/rails/console/helpers.rb
@@ -340,23 +339,23 @@ licenses:
 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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.

data/lib/rails/commands/update.rb

@@ -1,9 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'generators'))
-
-if ARGV.size == 0
-  Rails::Generators.help
-  exit
-end
-
-name = ARGV.shift
-Rails::Generators.invoke name, ARGV, behavior: :skip