railties 4.1.9 → 4.1.10.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94b5a8d6e63436c7b90e4c872ce8be503b9fa4cd
-  data.tar.gz: b6148fcecf92b1a8b7fc498d1918d31e63c9b81b
+  metadata.gz: ec946c52c557e04cefa1b1ee39885643af576688
+  data.tar.gz: d1fc76275c44d3f182e77a28f97abe3c1ad19337
 SHA512:
-  metadata.gz: 6ebdf026a895a71695842fb65bbe065bf92359b52a7234064746061f24fc6d256b3810a761055c6275b1cc259e95f1919d781bcc59e95a51731a7255a903bb84
-  data.tar.gz: e8e9ef8fd1706755f3d0d1693d0355536b6880b9c44158cb8b9cc99271fca8a8c7ba0ef0803485a86acaeb8a57c8985a6a08eab13239ddf898c80b7936f1dcda
+  metadata.gz: f52fc98afb4dadfff02fe27370b9406356b4142ccf25c2203e27cbb00aa79222bc0525ee16460df237fb7b513f0ceab88796954137ccdfe1630964b716facee4
+  data.tar.gz: 2d85081725e79003fbf7b3dcb57c0db5e267306ce8f73a1e4a39c6802c2e996926d4a573df7d0f9406543ef0326e57730ab780788ac66c1a77f5fb668163b83a

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+*   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.1.9 (January 6, 2015) ##
 
 *   No changes.

data/lib/rails/gem_version.rb

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

data/lib/rails/generators/actions.rb

@@ -218,10 +218,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/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"
 <%= comment_if :skip_active_record %>require "active_record/railtie"

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"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.1.9
+  version: 4.1.10.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 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.1.9
+        version: 4.1.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -349,9 +349,9 @@ 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.4.5