actionmailer 4.1.5 → 4.1.6.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bc2a0b8cae158bad3e18aa34ccc1dd4805ed758
-  data.tar.gz: 70f586cd1089ee17b6a9da9a1f46cf2e7fb615b5
+  metadata.gz: 8085e6053a70191ca1357e214508c6ddef97fea7
+  data.tar.gz: 62cd59b6c064d2ad2d3d245cdc56f27b8cf303dc
 SHA512:
-  metadata.gz: 5a33f52174be73da93bca45e52d28cb60c325da27a5146213ed841c9c88e9cc7f8cef8afe4c6e285140a894223013da55efdc4345ba8d4825f3aeff4b591f55d
-  data.tar.gz: fdea28a7f64adf263e69c3573f67956072471aa423a70bb13e5a25542584b475ed710fd677f825422d6880284fb9ea4b5b92505392cfcad6f4b5045168dfcebc
+  metadata.gz: bf7543476acd0aa5d08027e821709b04d221a763b011bfb80821078f79f6cb10047ef8b305df868e7f1b00035c302fd3902649c5754e9b783d7e0cffc41ffcd0
+  data.tar.gz: 47d59442f5223d7eb35b3a8b2ba47f23515e6643df9ad5ca418f0383826679ff6ceb122ca0756a2aaf9d88979f69230b1f44477d83d73a5722cd2b711fdf36e4

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## Rails 4.1.6 (August 19, 2014) ##
+
+*   Make ActionMailer::Previews methods class methods. Previously they were
+    instance methods and ActionMailer tries to render a message when they
+    are called.
+
+    *Cristian Bica*
+
+*   Raise an exception when attachments are added after `mail` was called.
+    This is a safeguard to prevent invalid emails.
+
+    Fixes #16163.
+
+    *Yves Senn*
+
+*   Allow preview interceptors to be registered through
+    `config.action_mailer.preview_interceptors`.
+
+    See #15739.
+
+    *Yves Senn*
+
+
 ## Rails 4.1.5 (August 18, 2014) ##
 
 *   No changes.

data/lib/action_mailer/base.rb

@@ -339,7 +339,7 @@ module ActionMailer
   #     end
   #   end
   #
-  #   config.action_mailer.register_preview_interceptor :css_inline_styler
+  #   config.action_mailer.preview_interceptors :css_inline_styler
   #
   # Note that interceptors need to be registered both with <tt>register_interceptor</tt>
   # and <tt>register_preview_interceptor</tt> if they should operate on both sending and
@@ -648,7 +648,22 @@ module ActionMailer
     #  mail.attachments[0]                # => Mail::Part (first attachment)
     #
     def attachments
-      @_message.attachments
+      if @_mail_was_called
+        LateAttachmentsProxy.new(@_message.attachments)
+      else
+        @_message.attachments
+      end
+    end
+
+    class LateAttachmentsProxy < SimpleDelegator
+      def inline; _raise_error end
+      def []=(_name, _content); _raise_error end
+
+      private
+        def _raise_error
+          raise RuntimeError, "Can't add attachments after `mail` was called.\n" \
+                              "Make sure to use `attachments[]=` before calling `mail`."
+        end
     end
 
     # The main method that creates the message and renders the email templates. There are

data/lib/action_mailer/gem_version.rb

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

data/lib/action_mailer/preview.rb

@@ -14,7 +14,9 @@ module ActionMailer
       # :nodoc:
       mattr_accessor :preview_interceptors, instance_writer: false
       self.preview_interceptors = []
+    end
 
+    module ClassMethods
       # Register one or more Interceptors which will be called before mail is previewed.
       def register_preview_interceptors(*interceptors)
         interceptors.flatten.compact.each { |interceptor| register_preview_interceptor(interceptor) }

data/lib/action_mailer/railtie.rb

@@ -33,6 +33,7 @@ module ActionMailer
         include app.routes.mounted_helpers
 
         register_interceptors(options.delete(:interceptors))
+        register_preview_interceptors(options.delete(:preview_interceptors))
         register_observers(options.delete(:observers))
 
         options.each { |k,v| send("#{k}=", v) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,33 +16,36 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.4
   type: :runtime
@@ -50,6 +53,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.4
 description: Email on Rails. Compose, deliver, receive, and test emails using the
@@ -92,9 +98,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:
 - none
 rubyforge_project: