railties 4.2.1.rc4 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971d3f7b35011410967ed63d0450a179465871fd
-  data.tar.gz: 7e49474fdc4989e20f1f22e85b7c3fba9f4e9c34
+  metadata.gz: cfc2447f20e831982da2fe765c8781bc8789901a
+  data.tar.gz: f0a59700bc5a07c1cff02f6a0c424eac7050209c
 SHA512:
-  metadata.gz: 057eb5b57b8cee819a3310b0c939eb65807332030e81eec3ca22710cf66454ed36c6977a21f5b7c69261f6f498c025392275389f23ea2719ef5c9c3925ea7974
-  data.tar.gz: e3305eb4a1144d2ac924eeb209e350c9abebcb3730fdb0612803275a6c364b49d91013a2b90892b24ef23775260ec4a770933c15d71f4baaaeebef5b9c2d34ee
+  metadata.gz: a391c377ae4e77b2156d1e0cc8151a9dd68a61f3877f7e6781f137eadcda6c1fe27cfaa916764843074e47ddbc079b2a252dd185ce810afddf4cf3de4db3bcb5
+  data.tar.gz: c9e76e652fe8ac0b486974b28080a224e83f514b10eda5d42084433646a362e50d6f633c5a4f3a924a4cc89ba518b8f567ae4b083da73b48ab3f64bd5fa45615

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Rails 4.2.1 (March 19, 2014) ##
+
+*   Add a new-line to the end of route method generated code.
+
+    We need to add a `\n`, because we cannot have two routes
+    in the same line.
+
+    *arthurnn*
+
 *   Force generated routes to be inserted into routes.rb
 
     *Andrew White*

data/lib/rails/gem_version.rb

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

data/lib/rails/generators/actions.rb

@@ -222,7 +222,7 @@ module Rails
         sentinel = /\.routes\.draw do\s*\n/m
 
         in_root do
-          inject_into_file 'config/routes.rb', "  #{routing_code}", { after: sentinel, verbose: false, force: true }
+          inject_into_file 'config/routes.rb', "  #{routing_code}\n", { after: sentinel, verbose: false, force: true }
         end
       end
 

data/lib/rails/generators/app_base.rb

@@ -283,7 +283,7 @@ module Rails
       end
 
       def javascript_runtime_gemfile_entry
-        comment = 'See https://github.com/sstephenson/execjs#readme for more supported runtimes'
+        comment = 'See https://github.com/rails/execjs#readme for more supported runtimes'
         if defined?(JRUBY_VERSION)
           GemfileEntry.version 'therubyrhino', nil, comment
         else

data/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt

@@ -7,7 +7,7 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file.
 //
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
 <% unless options[:skip_javascript] -%>

data/lib/rails/generators/rails/plugin/templates/rails/javascripts.js

@@ -7,7 +7,7 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file.
 //
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
 //= require_tree .

data/lib/rails/generators/rails/resource_route/resource_route_generator.rb

@@ -29,8 +29,10 @@ module Rails
           write("end", route_length - index)
         end
 
-        # route prepends two spaces onto the front of the string that is passed, this corrects that
-        route route_string[2..-1]
+        # route prepends two spaces onto the front of the string that is passed, this corrects that.
+        # Also it adds a \n to the end of each line, as route already adds that
+        # we need to correct that too.
+        route route_string[2..-2]
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.2.1.rc4
+  version: 4.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-19 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.1.rc4
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1.rc4
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1.rc4
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1.rc4
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1.rc4
+        version: 4.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1.rc4
+        version: 4.2.1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -352,9 +352,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5