railties 4.1.0.rc1 → 4.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce4536fa348e7d6d6750a17491f11d5c23a3bd6
-  data.tar.gz: 8c6d2d1f10c3e1778a864c263d97a28d7aa50840
+  metadata.gz: 1be2beeae0c3f636877ae764c0bf1743c168737f
+  data.tar.gz: 60de602bb82cfc7bfe3c9356d09eae6b65a068e3
 SHA512:
-  metadata.gz: b972003890b7eb3341beb81b9afbc2eba44cef4eb36364100dfe676e64c3a5ad94902e442959f4eccabd19b8d371a4e1a0e87eee63cc829d5191c854a9c184bd
-  data.tar.gz: c5cdda3a97d9aa9871503c3043b8f22dec1052c34dfd5e7624d9d24a6658b0601e6c846facb2151d0a899090b8b6f06024fca535152dd23cdd95dc15f3656390
+  metadata.gz: a63d45e26628f9c094af8c5a615eca427c2279f6dee97a18cefb0e2bb629f6d7544500c6ad66af536d4b565238d204312087f6ab0c715192ff4eb2a10ef1679e
+  data.tar.gz: 100f2a2475917f2185eb61ecea773e2a1139e5e72396de461f16a02f1df3a3af95d04483f9bc729bc394e10c954dc3b7267697112b4e1d86b8163aa840bec3d7

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+*   Introduce `Rails.gem_version` as a convenience method to return
+    `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform
+    version comparison.
+
+    Example:
+
+        Rails.version #=> "4.1.2"
+        Rails.gem_version #=> #<Gem::Version "4.1.2">
+
+        Rails.version > "4.1.10" #=> false
+        Rails.gem_version > Gem::Version.new("4.1.10") #=> true
+        Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true
+
+    *Prem Sichanugrist*
+
 *   Do not crash when `config/secrets.yml` is empty.
 
     *Yves Senn*
@@ -25,13 +40,6 @@
 
     *Cristian Mircea Messel*, *Chulki Lee*
 
-*   Only lookup `config.log_level` for stdlib `::Logger` instances.
-    Assign it as is for third party loggers like `Log4r::Logger`.
-
-    Fixes #13421.
-
-    *Yves Senn*
-
 *   The `Gemfile` of new applications depends on SDoc ~> 0.4.0.
 
     *Xavier Noria*
@@ -117,6 +125,7 @@
     *Jon Leighton*
 
 *   Uses .railsrc while creating new plugin if it is available.
+
     Fixes #10700.
 
     *Prathamesh Sonpatki*

data/README.rdoc

@@ -17,7 +17,7 @@ The latest version of Railties can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/railties
+* https://github.com/rails/rails/tree/4-1-stable/railties
 
 == License
 

data/lib/rails.rb

@@ -80,10 +80,6 @@ module Rails
       groups
     end
 
-    def version
-      VERSION::STRING
-    end
-
     def public_path
       application && Pathname.new(application.paths["public"].first)
     end

data/lib/rails/application/bootstrap.rb

@@ -53,11 +53,7 @@ INFO
           logger
         end
 
-        if ::Logger === Rails.logger
-          Rails.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase)
-        else
-          Rails.logger.level = config.log_level
-        end
+        Rails.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase)
       end
 
       # Initialize cache early in the stack so railties can make use of it.

data/lib/rails/commands/commands_tasks.rb

@@ -28,7 +28,7 @@ In addition to those, there are:
 All commands can be run with -h (or --help) for more information.
 EOT
 
-    COMMAND_WHITELIST = %(plugin generate destroy console server dbconsole application runner new version help)
+    COMMAND_WHITELIST = %w(plugin generate destroy console server dbconsole application runner new version help)
 
     def initialize(argv)
       @argv = argv

data/lib/rails/gem_version.rb

@@ -0,0 +1,15 @@
+module Rails
+  # Returns the version of the currently loaded Rails as a <tt>Gem::Version</tt>
+  def self.gem_version
+    Gem::Version.new VERSION::STRING
+  end
+
+  module VERSION
+    MAJOR = 4
+    MINOR = 1
+    TINY  = 0
+    PRE   = "rc2"
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+  end
+end

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

@@ -1,4 +1,4 @@
-require 'thor/actions/create_file'
+require 'thor/actions'
 
 module Rails
   module Generators

data/lib/rails/generators/app_base.rb

@@ -111,7 +111,6 @@ module Rails
           javascript_gemfile_entry,
           jbuilder_gemfile_entry,
           sdoc_gemfile_entry,
-          platform_dependent_gemfile_entry,
           spring_gemfile_entry,
           @extra_entries].flatten.find_all(&@gem_filter)
       end
@@ -178,8 +177,12 @@ module Rails
           super
         end
 
-        def self.github(name, github, comment = nil)
-          new(name, nil, comment, github: github)
+        def self.github(name, github, branch = nil, comment = nil)
+          if branch
+            new(name, nil, comment, github: github, branch: branch)
+          else
+            new(name, nil, comment, github: github)
+          end
         end
 
         def self.version(name, version, comment = nil)
@@ -198,10 +201,10 @@ module Rails
       def rails_gemfile_entry
         if options.dev?
           [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
-           GemfileEntry.github('arel', 'rails/arel')]
+           GemfileEntry.github('arel', 'rails/arel', '5-0-stable')]
         elsif options.edge?
-          [GemfileEntry.github('rails', 'rails/rails'),
-           GemfileEntry.github('arel', 'rails/arel')]
+          [GemfileEntry.github('rails', 'rails/rails', '4-1-stable'),
+           GemfileEntry.github('arel', 'rails/arel', '5-0-stable')]
         else
           [GemfileEntry.version('rails',
                             Rails::VERSION::STRING,
@@ -241,13 +244,13 @@ module Rails
 
         gems = []
         if options.dev? || options.edge?
-          gems << GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails',
+          gems << GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails', nil,
                                     'Use edge version of sprockets-rails')
-          gems << GemfileEntry.github('sass-rails', 'rails/sass-rails',
+          gems << GemfileEntry.github('sass-rails', 'rails/sass-rails', nil,
                                     'Use SCSS for stylesheets')
         else
           gems << GemfileEntry.version('sass-rails',
-                                     '~> 4.0.1',
+                                     '~> 4.0.2',
                                      'Use SCSS for stylesheets')
         end
 
@@ -258,14 +261,6 @@ module Rails
         gems
       end
 
-      def platform_dependent_gemfile_entry
-        gems = []
-        if RUBY_ENGINE == 'rbx'
-          gems << GemfileEntry.version('rubysl', nil)
-        end
-        gems
-      end
-
       def jbuilder_gemfile_entry
         comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder'
         GemfileEntry.version('jbuilder', '~> 2.0', comment)
@@ -279,7 +274,7 @@ module Rails
       def coffee_gemfile_entry
         comment = 'Use CoffeeScript for .js.coffee assets and views'
         if options.dev? || options.edge?
-          GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', comment
+          GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', nil, comment
         else
           GemfileEntry.version 'coffee-rails', '~> 4.0.0', comment
         end

data/lib/rails/generators/erb.rb

@@ -6,7 +6,7 @@ module Erb # :nodoc:
       protected
 
       def formats
-        format
+        [format]
       end
 
       def format
@@ -17,7 +17,7 @@ module Erb # :nodoc:
         :erb
       end
 
-      def filename_with_extensions(name, format)
+      def filename_with_extensions(name, format = self.format)
         [name, format, handler].compact.join(".")
       end
     end

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

@@ -11,7 +11,7 @@ module Erb # :nodoc:
 
         actions.each do |action|
           @action = action
-          Array(formats).each do |format|
+          formats.each do |format|
             @path = File.join(base_path, filename_with_extensions(action, format))
             template filename_with_extensions(:view, format), @path
           end

data/lib/rails/generators/erb/scaffold/scaffold_generator.rb

@@ -14,7 +14,7 @@ module Erb # :nodoc:
 
       def copy_view_files
         available_views.each do |view|
-          Array(formats).each do |format|
+          formats.each do |format|
             filename = filename_with_extensions(view, format)
             template filename, File.join("app/views", controller_file_path, filename)
           end

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

@@ -14,7 +14,7 @@ source 'https://rubygems.org'
 <% end -%>
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.1.2'
+# gem 'bcrypt', '~> 3.1.7'
 
 # Use unicorn as the app server
 # gem 'unicorn'

data/lib/rails/version.rb

@@ -1,10 +1,8 @@
-module Rails
-  module VERSION
-    MAJOR = 4
-    MINOR = 1
-    TINY  = 0
-    PRE   = "rc1"
+require_relative 'gem_version'
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+module Rails
+  # Returns the version of the currently loaded Rails as a string.
+  def self.version
+    VERSION::STRING
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc1
+  version: 4.1.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-25 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.0.rc1
+        version: 4.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -131,6 +131,7 @@ files:
 - lib/rails/engine/commands.rb
 - lib/rails/engine/configuration.rb
 - lib/rails/engine/railties.rb
+- lib/rails/gem_version.rb
 - lib/rails/generators.rb
 - lib/rails/generators/actions.rb
 - lib/rails/generators/actions/create_migration.rb