railties 4.1.16 → 4.2.0.beta1

data/lib/rails/railtie.rb

@@ -183,8 +183,8 @@ module Rails
       end
 
       protected
-        def generate_railtie_name(class_or_module)
-          ActiveSupport::Inflector.underscore(class_or_module).tr("/", "_")
+        def generate_railtie_name(string)
+          ActiveSupport::Inflector.underscore(string).tr("/", "_")
         end
 
         # If the class method does not have a method, then send the method call

data/lib/rails/ruby_version_check.rb

@@ -2,7 +2,7 @@ if RUBY_VERSION < '1.9.3'
   desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
   abort <<-end_message
 
-    Rails 4 prefers to run on Ruby 2.0.
+    Rails 4 prefers to run on Ruby 2.1 or newer.
 
     You're running
       #{desc}

data/lib/rails/source_annotation_extractor.rb

@@ -18,6 +18,20 @@ class SourceAnnotationExtractor
       @@directories ||= %w(app config db lib test) + (ENV['SOURCE_ANNOTATION_DIRECTORIES'] || '').split(',')
     end
 
+    def self.extensions
+      @@extensions ||= {}
+    end
+
+    # Registers new Annotations File Extensions
+    #   SourceAnnotationExtractor::Annotation.register_extensions("css", "scss", "sass", "less", "js") { |tag| /\/\/\s*(#{tag}):?\s*(.*)$/ }
+    def self.register_extensions(*exts, &block)
+      extensions[/\.(#{exts.join("|")})$/] = block
+    end
+
+    register_extensions("builder", "rb", "rake", "yml", "yaml", "ruby") { |tag| /#\s*(#{tag}):?\s*(.*)$/ }
+    register_extensions("css", "js") { |tag| /\/\/\s*(#{tag}):?\s*(.*)$/ }
+    register_extensions("erb") { |tag| /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/ }
+
     # Returns a representation of the annotation that looks like this:
     #
     #   [126] [TODO] This algorithm is simple and clearly correct, make it faster.
@@ -78,21 +92,14 @@ class SourceAnnotationExtractor
       if File.directory?(item)
         results.update(find_in(item))
       else
-        pattern =
-            case item
-            when /\.(builder|rb|coffee|rake)$/
-              /#\s*(#{tag}):?\s*(.*)$/
-            when /\.(css|scss|sass|less|js)$/
-              /\/\/\s*(#{tag}):?\s*(.*)$/
-            when /\.erb$/
-              /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/
-            when /\.haml$/
-              /-\s*#\s*(#{tag}):?\s*(.*)$/
-            when /\.slim$/
-              /\/\s*\s*(#{tag}):?\s*(.*)$/
-            else nil
-            end
-        results.update(extract_annotations_from(item, pattern)) if pattern
+        extension = Annotation.extensions.detect do |regexp, _block|
+          regexp.match(item)
+        end
+
+        if extension
+          pattern = extension.last.call(tag)
+          results.update(extract_annotations_from(item, pattern)) if pattern
+        end
       end
     end
 
@@ -115,7 +122,7 @@ class SourceAnnotationExtractor
   # Prints the mapping from filenames to annotations in +results+ ordered by filename.
   # The +options+ hash is passed to each annotation's +to_s+.
   def display(results, options={})
-    options[:indent] = results.map { |f, a| a.map(&:line) }.flatten.max.to_s.size
+    options[:indent] = results.flat_map { |f, a| a.map(&:line) }.max.to_s.size
     results.keys.sort.each do |file|
       puts "#{file}:"
       results[file].each do |note|

data/lib/rails/tasks/framework.rake

@@ -3,7 +3,7 @@ namespace :rails do
   task update: [ "update:configs", "update:bin" ]
 
   desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
-  task :template do
+  task template: :environment do
     template = ENV["LOCATION"]
     raise "No LOCATION value given. Please set LOCATION either as path to a file or a URL" if template.blank?
     template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://}

data/lib/rails/tasks/statistics.rake

@@ -1,3 +1,6 @@
+# while having global constant is not good,
+# many 3rd party tools depend on it, like rspec-rails, cucumber-rails, etc
+# so if will be removed - deprecation warning is needed
 STATS_DIRECTORIES = [
   %w(Controllers        app/controllers),
   %w(Helpers            app/helpers),
@@ -13,10 +16,12 @@ STATS_DIRECTORIES = [
   %w(Integration\ tests test/integration),
   %w(Functional\ tests\ (old)  test/functional),
   %w(Unit\ tests \ (old)       test/unit)
-].collect { |name, dir| [ name, "#{Rails.root}/#{dir}" ] }.select { |name, dir| File.directory?(dir) }
+].collect do |name, dir| 
+  [ name, "#{File.dirname(Rake.application.rakefile_location)}/#{dir}" ]
+end.select { |name, dir| File.directory?(dir) }
 
-desc "Report code statistics (KLOCs, etc) from the application"
+desc "Report code statistics (KLOCs, etc) from the application or engine"
 task :stats do
   require 'rails/code_statistics'
   CodeStatistics.new(*STATS_DIRECTORIES).to_s
-end
+end

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

@@ -31,10 +31,6 @@
     padding: 1px;
   }
 
-  dd:empty:before {
-    content: "\00a0"; //  
-  }
-
   iframe {
     border: 0;
     width: 100%;
@@ -81,7 +77,7 @@
     <% unless @email.attachments.nil? || @email.attachments.empty? %>
       <dt>Attachments:</dt>
       <dd>
-        <%= @email.attachments.map { |a| a.respond_to?(:original_filename) ? a.original_filename : a.filename }.join(', ') %>
+        <%= @email.attachments.map { |a| a.respond_to?(:original_filename) ? a.original_filename : a.filename }.inspect %>
       </dd>
     <% end %>
 
@@ -96,14 +92,7 @@
   </dl>
 </header>
 
-<% if @part && @part.mime_type %>
-  <iframe seamless name="messageBody" src="?part=<%= Rack::Utils.escape(@part.mime_type) %>"></iframe>
-<% else %>
-  <p>
-    You are trying to preview an email that does not have any content.
-    This is probably because the <em>mail</em> method has not been called in <em><%= @preview.preview_name %>#<%= @email_action %></em>.
-  </p>
-<% end %>
+<iframe seamless name="messageBody" src="?part=<%= Rack::Utils.escape(@part.mime_type) %>"></iframe>
 
 </body>
 </html>

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

@@ -1,8 +1,8 @@
 <% @previews.each do |preview| %>
-<h3><%= link_to preview.preview_name.titleize, url_for(controller: "rails/mailers", action: "preview", path: preview.preview_name) %></h3>
+<h3><%= link_to preview.preview_name.titleize, "/rails/mailers/#{preview.preview_name}" %></h3>
 <ul>
 <% preview.emails.each do |email| %>
-<li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{preview.preview_name}/#{email}") %></li>
+<li><%= link_to email, "/rails/mailers/#{preview.preview_name}/#{email}" %></li>
 <% end %>
 </ul>
 <% end %>

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

@@ -1,6 +1,6 @@
 <h3><%= @preview.preview_name.titleize %></h3>
 <ul>
 <% @preview.emails.each do |email| %>
-<li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{@preview.preview_name}/#{email}") %></li>
+<li><%= link_to email, "/rails/mailers/#{@preview.preview_name}/#{email}" %></li>
 <% end %>
 </ul>

data/lib/rails/test_unit/sub_test_task.rb

@@ -7,7 +7,7 @@ module Rails
     #
     # This class takes a TestInfo class and defines the appropriate rake task
     # based on the information, then invokes it.
-    class TestCreator
+    class TestCreator # :nodoc:
       def initialize(info)
         @info = info
       end
@@ -41,7 +41,7 @@ module Rails
     # to test files (or can be transformed into test files). Calling <tt>files</tt>
     # provides the set of test files and is used when initializing tests after
     # a call to <tt>rake test</tt>.
-    class TestInfo
+    class TestInfo # :nodoc:
       def initialize(tasks)
         @tasks = tasks
         @files = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.1.16
+  version: 4.2.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2014-08-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.16
+        version: 4.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -157,6 +157,7 @@ files:
 - lib/rails/generators/js/assets/assets_generator.rb
 - lib/rails/generators/js/assets/templates/javascript.js
 - lib/rails/generators/migration.rb
+- lib/rails/generators/model_helpers.rb
 - lib/rails/generators/named_base.rb
 - lib/rails/generators/rails/app/USAGE
 - lib/rails/generators/rails/app/app_generator.rb
@@ -171,6 +172,7 @@ files:
 - lib/rails/generators/rails/app/templates/bin/bundle
 - lib/rails/generators/rails/app/templates/bin/rails
 - lib/rails/generators/rails/app/templates/bin/rake
+- lib/rails/generators/rails/app/templates/bin/setup
 - lib/rails/generators/rails/app/templates/config.ru
 - lib/rails/generators/rails/app/templates/config/application.rb
 - lib/rails/generators/rails/app/templates/config/boot.rb
@@ -276,7 +278,6 @@ files:
 - lib/rails/generators/test_unit/generator/generator_generator.rb
 - lib/rails/generators/test_unit/generator/templates/generator_test.rb
 - lib/rails/generators/test_unit/helper/helper_generator.rb
-- lib/rails/generators/test_unit/helper/templates/helper_test.rb
 - lib/rails/generators/test_unit/integration/integration_generator.rb
 - lib/rails/generators/test_unit/integration/templates/integration_test.rb
 - lib/rails/generators/test_unit/mailer/mailer_generator.rb
@@ -306,7 +307,6 @@ files:
 - lib/rails/railtie/configurable.rb
 - lib/rails/railtie/configuration.rb
 - lib/rails/ruby_version_check.rb
-- lib/rails/rubyprof_ext.rb
 - lib/rails/source_annotation_extractor.rb
 - lib/rails/tasks.rb
 - lib/rails/tasks/annotations.rake
@@ -349,12 +349,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.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.

data/lib/rails/generators/test_unit/helper/templates/helper_test.rb

@@ -1,6 +0,0 @@
-require 'test_helper'
-
-<% module_namespacing do -%>
-class <%= class_name %>HelperTest < ActionView::TestCase
-end
-<% end -%>

data/lib/rails/rubyprof_ext.rb

@@ -1,35 +0,0 @@
-require 'prof'
-
-module Prof #:nodoc:
-  # Adapted from Shugo Maeda's unprof.rb
-  def self.print_profile(results, io = $stderr)
-    total = results.detect { |i|
-      i.method_class.nil? && i.method_id == :"#toplevel"
-    }.total_time
-    total = 0.001 if total < 0.001
-
-    io.puts "  %%   cumulative   self              self     total"
-    io.puts " time   seconds   seconds    calls  ms/call  ms/call  name"
-
-    sum = 0.0
-    results.each do |r|
-      sum += r.self_time
-
-      name =  if r.method_class.nil?
-                r.method_id.to_s
-              elsif r.method_class.is_a?(Class)
-                "#{r.method_class}##{r.method_id}"
-              else
-                "#{r.method_class}.#{r.method_id}"
-              end
-      io.printf "%6.2f %8.3f  %8.3f %8d %8.2f %8.2f  %s\n",
-        r.self_time / total * 100,
-        sum,
-        r.self_time,
-        r.count,
-        r.self_time * 1000 / r.count,
-        r.total_time * 1000 / r.count,
-        name
-    end
-  end
-end