railties 4.1.11 → 4.1.12.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b97b047c3681d6ad90f3938f05270e54141cd64
-  data.tar.gz: 3480a1343a3e624a6e37db5d5606db5f831922f3
+  metadata.gz: 9d4ec2e1a99662595997a4c253682e4ccdbf26eb
+  data.tar.gz: 5be5238b276cdb079b22b7469ab900d45dcc692b
 SHA512:
-  metadata.gz: 60b022f0084c4e64e35f2f0b1b4e7e3036c28f66ac7feb5c08f1e73f0bd351ef9ece05b4f43a7575def12adbdcf53fa786b6f583672a0b070506f0daaed8c907
-  data.tar.gz: 4e0815b33bf257366751e76d5ff398b5ff3a6cbd0e029eb9f4f3671a0fe571b12b0914389c62a9196ebdf3c348cdf5a414764f96c6928f35b8198b5f9829b331
+  metadata.gz: 7bc013e89ab5ac90d2034a494e79db409f14e65b6a05a6d9c9407a73d34f4b9c7e024e700c4c2a5dc414217454a1efe078128be88fa1874784ebfc5260211761
+  data.tar.gz: 80c2572f0f7dce657201add2d7bdf380bf2abd6f5c7de4ec15636e3413555ff25612241e27e39e9ab262bd8d587d7bd0b646ab91aebd571f94796b7f8f3cdf14

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## Rails 4.1.12 (June 22, 2015) ##
+
+*   Add support for inline images in mailer previews by using an interceptor
+    class to convert cid: urls in image src attributes to data urls. The
+    interceptor is not enabled by default but can be done in an initializer:
+
+        # config/initializer/preview_interceptors.rb
+        ActionMailer::Base.register_preview_interceptor(ActionMailer::InlinePreviewInterceptor)
+
+    *Andrew White*
+
+*   Fix mailer previews with attachments by using the mail gem's own API to
+    locate the first part of the correct mime type.
+
+    Fixes #14435.
+
+    *Andrew White*
+
+
 ## Rails 4.1.11 (June 16, 2015) ##
 
 *   No changes.

data/lib/rails/code_statistics.rb

@@ -42,11 +42,9 @@ class CodeStatistics #:nodoc:
 
         if File.directory?(path) && (/^\./ !~ file_name)
           stats.add(calculate_directory_statistics(path, pattern))
+        elsif file_name =~ pattern
+          stats.add_by_file_path(path)
         end
-
-        next unless file_name =~ pattern
-
-        stats.add_by_file_path(path)
       end
 
       stats

data/lib/rails/gem_version.rb

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

data/lib/rails/mailers_controller.rb

@@ -16,10 +16,10 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
       @page_title = "Mailer Previews for #{@preview.preview_name}"
       render action: 'mailer'
     else
-      email = File.basename(params[:path])
+      @email_action = File.basename(params[:path])
 
-      if @preview.email_exists?(email)
-        @email = @preview.call(email)
+      if @preview.email_exists?(@email_action)
+        @email = @preview.call(@email_action)
 
         if params[:part]
           part_type = Mime::Type.lookup(params[:part])
@@ -28,14 +28,14 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
             response.content_type = part_type
             render text: part.respond_to?(:decoded) ? part.decoded : part
           else
-            raise AbstractController::ActionNotFound, "Email part '#{part_type}' not found in #{@preview.name}##{email}"
+            raise AbstractController::ActionNotFound, "Email part '#{part_type}' not found in #{@preview.name}##{@email_action}"
           end
         else
           @part = find_preferred_part(request.format, Mime::HTML, Mime::TEXT)
           render action: 'email', layout: false, formats: %w[html]
         end
       else
-        raise AbstractController::ActionNotFound, "Email '#{email}' not found in #{@preview.name}"
+        raise AbstractController::ActionNotFound, "Email '#{@email_action}' not found in #{@preview.name}"
       end
     end
   end
@@ -54,18 +54,20 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
     end
 
     def find_preferred_part(*formats)
-      if @email.multipart?
-        formats.each do |format|
-          return find_part(format) if @email.parts.any?{ |p| p.mime_type == format }
+      formats.each do |format|
+        if part = @email.find_first_mime_type(format)
+          return part
         end
-      else
+      end
+
+      if formats.any?{ |f| @email.mime_type == f }
         @email
       end
     end
 
     def find_part(format)
-      if @email.multipart?
-        @email.parts.find{ |p| p.mime_type == format }
+      if part = @email.find_first_mime_type(format)
+        part
       elsif @email.mime_type == format
         @email
       end

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

@@ -31,6 +31,10 @@
     padding: 1px;
   }
 
+  dd:empty:before {
+    content: "\00a0"; //  
+  }
+
   iframe {
     border: 0;
     width: 100%;
@@ -77,7 +81,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 }.inspect %>
+        <%= @email.attachments.map { |a| a.respond_to?(:original_filename) ? a.original_filename : a.filename }.join(', ') %>
       </dd>
     <% end %>
 
@@ -92,7 +96,14 @@
   </dl>
 </header>
 
-<iframe seamless name="messageBody" src="?part=<%= Rack::Utils.escape(@part.mime_type) %>"></iframe>
+<% 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 %>
 
 </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, "/rails/mailers/#{preview.preview_name}" %></h3>
+<h3><%= link_to preview.preview_name.titleize, url_for(controller: "rails/mailers", action: "preview", path: preview.preview_name) %></h3>
 <ul>
 <% preview.emails.each do |email| %>
-<li><%= link_to email, "/rails/mailers/#{preview.preview_name}/#{email}" %></li>
+<li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{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, "/rails/mailers/#{@preview.preview_name}/#{email}" %></li>
+<li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{@preview.preview_name}/#{email}") %></li>
 <% end %>
 </ul>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.1.11
+  version: 4.1.12.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-22 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.11
+        version: 4.1.12.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.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.11
+        version: 4.1.12.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.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