railties 4.2.0 → 4.2.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55baacf9acdd0d42344c849d3b057fbc89ac979d
-  data.tar.gz: 9ade7f6a3318f7aad6227abcc28c18bece50ebb1
+  metadata.gz: 10dc40c7374d5bd5c36a87aa0806a13753b3c3f4
+  data.tar.gz: 7c7988dab5d9a5bb70e610328baa573a78bf75dd
 SHA512:
-  metadata.gz: eae7ddad125a425b93487bd646b65c1fa058d73ee993cdd1729a7bc631d61a1ed6466a7ef5bad146e9bf27d5f7afd02af2c4dc27d5a93590ce27f0e9c5ec569d
-  data.tar.gz: 23e2210d29927128d38510c7c6ccc73d3c199d2aaed0e8eaa8a4233a3e14d128a70eba2ecf1b28c39b0310aa2c6908953b19781286aa206d6c57c199bed2ab35
+  metadata.gz: 9a72ac84fbaf55ebe47be46ee77f4967358ffefd92ccb78607b0aba8f1b6bcfc3e43e6fc4fcbbf3fee20e222a132abeebe328c235bfa195dd180d808656630f5
+  data.tar.gz: 330732b41a529befb7c41f1f1e7458d7e250aeb1028fb099e6601ae9f460d0c1360d18035b416582616a9f43020211576cd899b3bf3a97141bfa15857c4612d8

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+*   Force generated routes to be inserted into routes.rb
+
+    *Andrew White*
+
+*   Don't remove all line endings from routes.rb when revoking scaffold.
+
+    Fixes #15913.
+
+    *Andrew White*
+
+*   Fix scaffold generator with `--helper=false` option.
+
+    *Rafael Mendonça França*
+
+
+## Rails 4.2.0 (December 20, 2014) ##
+
 *   Deprecate `config.serve_static_assets` in favor of `config.serve_static_files`
     to clarify that the option is unrelated to the asset pipeline.
 

data/lib/rails/application.rb

@@ -368,7 +368,21 @@ module Rails
       @config = configuration
     end
 
-    def secrets #:nodoc:
+    # Returns secrets added to config/secrets.yml.
+    #
+    # Example:
+    #
+    #     development:
+    #       secret_key_base: 836fa3665997a860728bcb9e9a1e704d427cfc920e79d847d79c8a9a907b9e965defa4154b2b86bdec6930adbe33f21364523a6f6ce363865724549fdfc08553
+    #     test:
+    #       secret_key_base: 5a37811464e7d378488b0f073e2193b093682e4e21f5d6f3ae0a4e1781e61a351fdc878a843424e81c73fb484a40d23f92c8dafac4870e74ede6e5e174423010
+    #     production:
+    #       secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+    #       namespace: my_app_production
+    #
+    # +Rails.application.secrets.namespace+ returns +my_app_production+ in the
+    # production environment.
+    def secrets
       @secrets ||= begin
         secrets = ActiveSupport::OrderedOptions.new
         yaml = config.paths["config/secrets"].first

data/lib/rails/engine.rb

@@ -571,10 +571,10 @@ module Rails
     end
 
     initializer :add_routing_paths do |app|
-      paths = self.paths["config/routes.rb"].existent
+      routing_paths = self.paths["config/routes.rb"].existent
 
-      if routes? || paths.any?
-        app.routes_reloader.paths.unshift(*paths)
+      if routes? || routing_paths.any?
+        app.routes_reloader.paths.unshift(*routing_paths)
         app.routes_reloader.route_sets << routes
       end
     end

data/lib/rails/gem_version.rb

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

data/lib/rails/generators/actions.rb

@@ -219,10 +219,10 @@ module Rails
       #   route "root 'welcome#index'"
       def route(routing_code)
         log :route, routing_code
-        sentinel = /\.routes\.draw do\s*$/
+        sentinel = /\.routes\.draw do\s*\n/m
 
         in_root do
-          inject_into_file 'config/routes.rb', "\n  #{routing_code}", { after: sentinel, verbose: false }
+          inject_into_file 'config/routes.rb', "  #{routing_code}", { after: sentinel, verbose: false, force: true }
         end
       end
 

data/lib/rails/generators/generated_attribute.rb

@@ -159,6 +159,10 @@ module Rails
             options.delete(:required)
             options[:null] = false
           end
+
+          if reference? && !polymorphic?
+            options[:foreign_key] = true
+          end
         end
       end
     end

data/lib/rails/generators/rails/app/app_generator.rb

@@ -340,7 +340,7 @@ module Rails
     #
     # This class should be called before the AppGenerator is required and started
     # since it configures and mutates ARGV correctly.
-    class ARGVScrubber # :nodoc
+    class ARGVScrubber # :nodoc:
       def initialize(argv = ARGV)
         @argv = argv
       end

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

@@ -3,6 +3,7 @@ require File.expand_path('../boot', __FILE__)
 <% if include_all_railties? -%>
 require 'rails/all'
 <% else -%>
+require "rails"
 # Pick the frameworks you want:
 require "active_model/railtie"
 require "active_job/railtie"

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

@@ -22,7 +22,7 @@ Description:
 
     If you pass a namespaced model name (e.g. admin/account or Admin::Account)
     then the generator will create a module with a table_name_prefix method
-    to prefix the model's table name with the module name (e.g. admin_account)
+    to prefix the model's table name with the module name (e.g. admin_accounts)
 
 Available field types:
 

data/lib/rails/generators/rails/plugin/templates/Gemfile

@@ -45,3 +45,7 @@ end
 # gem 'byebug', group: [:development, :test]
   <%- end -%>
 <% end -%>
+
+<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+<% end -%>

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

@@ -20,4 +20,5 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+  ActiveSupport::TestCase.fixtures :all
 end

data/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb

@@ -7,6 +7,7 @@ module Rails
 
       check_class_collision suffix: "Controller"
 
+      class_option :helper, type: :boolean
       class_option :orm, banner: "NAME", type: :string, required: true,
                          desc: "ORM to generate the controller for"
 

data/lib/rails/railtie.rb

@@ -93,7 +93,7 @@ module Rails
   #     end
   #   end
   #
-  # By default, Rails load generators from your load path. However, if you want to place
+  # By default, Rails loads generators from your load path. However, if you want to place
   # your generators at a different location, you can specify in your Railtie a block which
   # will load them during normal generators lookup:
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1.rc1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -352,12 +352,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.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.