actionmailer 3.2.22.5 → 4.0.0.beta1

data/lib/action_mailer/collector.rb

@@ -2,7 +2,7 @@ require 'abstract_controller/collector'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/array/extract_options'
 
-module ActionMailer #:nodoc:
+module ActionMailer
   class Collector
     include AbstractController::Collector
     attr_reader :responses
@@ -15,13 +15,13 @@ module ActionMailer #:nodoc:
 
     def any(*args, &block)
       options = args.extract_options!
-      raise "You have to supply at least one format" if args.empty?
+      raise ArgumentError, "You have to supply at least one format" if args.empty?
       args.each { |type| send(type, options.dup, &block) }
     end
     alias :all :any
 
-    def custom(mime, options={})
-      options.reverse_merge!(:content_type => mime.to_s)
+    def custom(mime, options = {})
+      options.reverse_merge!(content_type: mime.to_s)
       @context.formats = [mime.to_sym]
       options[:body] = block_given? ? yield : @default_render.call
       @responses << options

data/lib/action_mailer/delivery_methods.rb

@@ -1,8 +1,8 @@
 require 'tmpdir'
 
 module ActionMailer
-  # This module handles everything related to mail delivery, from registering new
-  # delivery methods to configuring the mail object to be sent.
+  # This module handles everything related to mail delivery, from registering
+  # new delivery methods to configuring the mail object to be sent.
   module DeliveryMethods
     extend ActiveSupport::Concern
 
@@ -20,44 +20,41 @@ module ActionMailer
       self.delivery_method  = :smtp
 
       add_delivery_method :smtp, Mail::SMTP,
-        :address              => "localhost",
-        :port                 => 25,
-        :domain               => 'localhost.localdomain',
-        :user_name            => nil,
-        :password             => nil,
-        :authentication       => nil,
-        :enable_starttls_auto => true
+        address:              "localhost",
+        port:                 25,
+        domain:               'localhost.localdomain',
+        user_name:            nil,
+        password:             nil,
+        authentication:       nil,
+        enable_starttls_auto: true
 
       add_delivery_method :file, Mail::FileDelivery,
-        :location => defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
+        location: defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
 
       add_delivery_method :sendmail, Mail::Sendmail,
-        :location   => '/usr/sbin/sendmail',
-        :arguments  => '-i -t'
+        location:  '/usr/sbin/sendmail',
+        arguments: '-i -t'
 
       add_delivery_method :test, Mail::TestMailer
     end
 
     module ClassMethods
       # Provides a list of emails that have been delivered by Mail::TestMailer
-      delegate :deliveries, :deliveries=, :to => Mail::TestMailer
+      delegate :deliveries, :deliveries=, to: Mail::TestMailer
 
-      # Adds a new delivery method through the given class using the given symbol
-      # as alias and the default options supplied:
-      #
-      # Example:
+      # Adds a new delivery method through the given class using the given
+      # symbol as alias and the default options supplied.
       #
       #   add_delivery_method :sendmail, Mail::Sendmail,
-      #     :location   => '/usr/sbin/sendmail',
-      #     :arguments  => '-i -t'
-      #
+      #     location:  '/usr/sbin/sendmail',
+      #     arguments: '-i -t'
       def add_delivery_method(symbol, klass, default_options={})
         class_attribute(:"#{symbol}_settings") unless respond_to?(:"#{symbol}_settings")
         send(:"#{symbol}_settings=", default_options)
         self.delivery_methods = delivery_methods.merge(symbol.to_sym => klass).freeze
       end
 
-      def wrap_delivery_behavior(mail, method=nil) #:nodoc:
+      def wrap_delivery_behavior(mail, method=nil, options=nil) # :nodoc:
         method ||= self.delivery_method
         mail.delivery_handler = self
 
@@ -65,8 +62,8 @@ module ActionMailer
         when NilClass
           raise "Delivery method cannot be nil"
         when Symbol
-          if klass = delivery_methods[method.to_sym]
-            mail.delivery_method(klass, send(:"#{method}_settings"))
+          if klass = delivery_methods[method]
+            mail.delivery_method(klass,(send(:"#{method}_settings") || {}).merge!(options || {}))
           else
             raise "Invalid delivery method #{method.inspect}"
           end
@@ -79,7 +76,7 @@ module ActionMailer
       end
     end
 
-    def wrap_delivery_behavior!(*args) #:nodoc:
+    def wrap_delivery_behavior!(*args) # :nodoc:
       self.class.wrap_delivery_behavior(message, *args)
     end
   end

data/lib/action_mailer/log_subscriber.rb

@@ -1,15 +1,15 @@
-require 'active_support/core_ext/array/wrap'
-
 module ActionMailer
   class LogSubscriber < ActiveSupport::LogSubscriber
     def deliver(event)
-      recipients = Array.wrap(event.payload[:to]).join(', ')
-      info("\nSent mail to #{recipients} (#{format_duration(event.duration)})")
+      return unless logger.info?
+      recipients = Array(event.payload[:to]).join(', ')
+      info("\nSent mail to #{recipients} (#{event.duration.round(1)}ms)")
       debug(event.payload[:mail])
     end
 
     def receive(event)
-      info("\nReceived mail (#{format_duration(event.duration)})")
+      return unless logger.info?
+      info("\nReceived mail (#{event.duration.round(1)}ms)")
       debug(event.payload[:mail])
     end
 

data/lib/action_mailer/mail_helper.rb

@@ -1,11 +1,11 @@
 module ActionMailer
   module MailHelper
-    # Uses Text::Format to take the text and format it, indented two spaces for
-    # each line, and wrapped at 72 columns.
+    # Take the text and format it, indented two spaces for each line, and
+    # wrapped at 72 columns.
     def block_format(text)
-      formatted = text.split(/\n\r\n/).collect { |paragraph|
+      formatted = text.split(/\n\r?\n/).collect { |paragraph|
         format_paragraph(paragraph)
-      }.join("\n")
+      }.join("\n\n")
 
       # Make list points stand on their own line
       formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
@@ -31,9 +31,7 @@ module ActionMailer
 
     # Returns +text+ wrapped at +len+ columns and indented +indent+ spaces.
     #
-    # === Examples
-    #
-    #   my_text = "Here is a sample text with more than 40 characters"
+    #   my_text = 'Here is a sample text with more than 40 characters'
     #
     #   format_paragraph(my_text, 25, 4)
     #   # => "    Here is a sample text with\n    more than 40 characters"
@@ -41,7 +39,7 @@ module ActionMailer
       sentences = [[]]
 
       text.split.each do |word|
-        if (sentences.last + [word]).join(' ').length > len
+        if sentences.first.present? && (sentences.last + [word]).join(' ').length > len
           sentences << [word]
         else
           sentences.last << word

data/lib/action_mailer/railtie.rb

@@ -3,8 +3,9 @@ require "rails"
 require "abstract_controller/railties/routes_helpers"
 
 module ActionMailer
-  class Railtie < Rails::Railtie
+  class Railtie < Rails::Railtie # :nodoc:
     config.action_mailer = ActiveSupport::OrderedOptions.new
+    config.eager_load_namespaces << ActionMailer
 
     initializer "action_mailer.logger" do
       ActiveSupport.on_load(:action_mailer) { self.logger ||= Rails.logger }
@@ -19,7 +20,6 @@ module ActionMailer
       options.stylesheets_dir ||= paths["public/stylesheets"].first
 
       # make sure readers methods get compiled
-      options.asset_path          ||= app.config.asset_path
       options.asset_host          ||= app.config.asset_host
       options.relative_url_root   ||= app.config.relative_url_root
 

data/lib/action_mailer/test_case.rb

@@ -1,4 +1,4 @@
-require 'active_support/core_ext/class/attribute'
+require 'active_support/test_case'
 
 module ActionMailer
   class NonInferrableMailerError < ::StandardError
@@ -13,6 +13,7 @@ module ActionMailer
     module Behavior
       extend ActiveSupport::Concern
 
+      include ActiveSupport::Testing::ConstantLookup
       include TestHelper
 
       included do
@@ -42,9 +43,11 @@ module ActionMailer
         end
 
         def determine_default_mailer(name)
-          name.sub(/Test$/, '').constantize
-        rescue NameError
-          raise NonInferrableMailerError.new(name)
+          mailer = determine_constant_from_test_name(name) do |constant|
+            Class === constant && constant < ActionMailer::Base
+          end
+          raise NonInferrableMailerError.new(name) if mailer.nil?
+          mailer
         end
       end
 

data/lib/action_mailer/test_helper.rb

@@ -1,27 +1,26 @@
 module ActionMailer
   module TestHelper
-    extend ActiveSupport::Concern
-
     # Asserts that the number of emails sent matches the given number.
     #
     #   def test_emails
     #     assert_emails 0
-    #     ContactMailer.deliver_contact
+    #     ContactMailer.welcome.deliver
     #     assert_emails 1
-    #     ContactMailer.deliver_contact
+    #     ContactMailer.welcome.deliver
     #     assert_emails 2
     #   end
     #
-    # If a block is passed, that block should cause the specified number of emails to be sent.
+    # If a block is passed, that block should cause the specified number of
+    # emails to be sent.
     #
     #   def test_emails_again
     #     assert_emails 1 do
-    #       ContactMailer.deliver_contact
+    #       ContactMailer.welcome.deliver
     #     end
     #
     #     assert_emails 2 do
-    #       ContactMailer.deliver_contact
-    #       ContactMailer.deliver_contact
+    #       ContactMailer.welcome.deliver
+    #       ContactMailer.welcome.deliver
     #     end
     #   end
     def assert_emails(number)
@@ -39,7 +38,7 @@ module ActionMailer
     #
     #   def test_emails
     #     assert_no_emails
-    #     ContactMailer.deliver_contact
+    #     ContactMailer.welcome.deliver
     #     assert_emails 1
     #   end
     #

data/lib/action_mailer/version.rb

@@ -1,9 +1,9 @@
 module ActionMailer
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
-    TINY  = 22
-    PRE   = "5"
+    MAJOR = 4
+    MINOR = 0
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/rails/generators/mailer/USAGE

@@ -1,6 +1,6 @@
 Description:
 ============
-    Stubs out a new mailer and its views. Pass the mailer name, either
+    Stubs out a new mailer and its views. Passes the mailer name, either
     CamelCased or under_scored, and an optional list of emails as arguments.
 
     This generates a mailer class in app/mailers and invokes your template
@@ -10,9 +10,8 @@ Example:
 ========
     rails generate mailer Notifications signup forgot_password invoice
 
-    creates a Notifications mailer class, views, test, and fixtures:
+    creates a Notifications mailer class, views, and test:
         Mailer:     app/mailers/notifications.rb
-        Views:      app/views/notifications/signup.erb [...]
-        Test:       test/functional/notifications_test.rb
-        Fixtures:   test/fixtures/notifications/signup [...]
+        Views:      app/views/notifications/signup.text.erb [...]
+        Test:       test/mailers/notifications_test.rb
 

data/lib/rails/generators/mailer/mailer_generator.rb

@@ -3,7 +3,7 @@ module Rails
     class MailerGenerator < NamedBase
       source_root File.expand_path("../templates", __FILE__)
 
-      argument :actions, :type => :array, :default => [], :banner => "method method"
+      argument :actions, type: :array, default: [], banner: "method method"
       check_class_collision
 
       def create_mailer_file

data/lib/rails/generators/mailer/templates/mailer.rb

@@ -1,17 +1,17 @@
 <% module_namespacing do -%>
 class <%= class_name %> < ActionMailer::Base
-  default <%= key_value :from, '"from@example.com"' %>
+  default from: "from@example.com"
 <% actions.each do |action| -%>
 
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
-  #   en.<%= file_path.gsub("/",".") %>.<%= action %>.subject
+  #   en.<%= file_path.tr("/",".") %>.<%= action %>.subject
   #
   def <%= action %>
     @greeting = "Hi"
 
-    mail <%= key_value :to, '"to@example.org"' %>
+    mail to: "to@example.org"
   end
 <% end -%>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 3.2.22.5
+  version: 4.0.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.5
+        version: 4.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.5
+        version: 4.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.5.3
 description: Email on Rails. Compose, deliver, receive, and test emails using the
   familiar controller/view pattern. First-class support for multipart email and attachments.
 email: david@loudthinking.com
@@ -46,9 +46,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- MIT-LICENSE
 - README.rdoc
-- lib/action_mailer.rb
+- MIT-LICENSE
 - lib/action_mailer/base.rb
 - lib/action_mailer/collector.rb
 - lib/action_mailer/delivery_methods.rb
@@ -58,9 +57,10 @@ files:
 - lib/action_mailer/test_case.rb
 - lib/action_mailer/test_helper.rb
 - lib/action_mailer/version.rb
-- lib/rails/generators/mailer/USAGE
+- lib/action_mailer.rb
 - lib/rails/generators/mailer/mailer_generator.rb
 - lib/rails/generators/mailer/templates/mailer.rb
+- lib/rails/generators/mailer/USAGE
 homepage: http://www.rubyonrails.org
 licenses:
 - MIT
@@ -71,20 +71,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      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: 
-rubygems_version: 2.6.6
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).
 test_files: []
-has_rdoc: