padrino-mailer 0.18.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4a35a3b463e0277af6d821160b7248107bebf4d0ce7268eebbab0f6029b112e
-  data.tar.gz: b7f4a2d763b09822284caf2cf928ff40f3f127a7cbe08f21722ea1324fa9db78
+  metadata.gz: ac2d83b55958d57fb6cced02c2ec08e3613982594069bc9b08036bd95f02e63b
+  data.tar.gz: 0500d718cf0f13ca82fd90097cec7548eb4e824e0e72678bb1cffff87f947955
 SHA512:
-  metadata.gz: 37d000d7ebf478426ce3fa63da3730f1c05e4e028abe791e79b0e2d59f920534bb0ae808f056ff347ab9c46e1dbeb6fadf855ae6046b14d0162dff8327f5528d
-  data.tar.gz: e87b9b1e57b52747c48115bd6da012553233c02cea28512cb2c8eb2b6ed7f2dbbcc6a653e13363e8b477bf14afd438dd6a297eaa146c4e685889c979e33ffe86
+  metadata.gz: ae82b89755b7e13c0c66b629ff060f3e24ea509fba47b0e9259ec8a637230021f109bdb8edb70b56f31c2cc8b54c09ad4185240f5f8cbcf0e3cbcf93d72bf713
+  data.tar.gz: 98d1b6fd13eb78d43fac67b5e1372ed01fe4bb6d5312b5fd73bdb0df0cf1ebaffd89ab44d22ab03fcdd9b3c1a4f25f685f0b1aacc618e5ca16c9fab13e8210aa

data/lib/padrino-mailer/helpers.rb

@@ -148,16 +148,19 @@ module Padrino
         # Returns the parsed delivery method options.
         #
         def delivery_settings
-          @_delivery_setting ||= begin
-            if Gem.win_platform? && !respond_to?(:delivery_method)
-              raise 'To use mailers on Windows you must set a :delivery_method, see http://padrinorb.com/guides/features/padrino-mailer/#configuration'
-            end
-
-            return [:sendmail, { location: `which sendmail`.chomp }] unless respond_to?(:delivery_method)
-            return [delivery_method.keys[0], delivery_method.values[0]] if delivery_method.is_a?(Hash)
-            return [delivery_method, {}] if delivery_method.is_a?(Symbol)
-            [nil, {}]
+          if Gem.win_platform? && !respond_to?(:delivery_method)
+            raise 'To use mailers on Windows you must set a :delivery_method, see http://padrinorb.com/guides/features/padrino-mailer/#configuration'
           end
+
+          # Only the sendmail lookup spawns a process, so only it is memoised.
+          # The rest is read from the setting each time, so a changed
+          # :delivery_method is picked up. Concurrent first calls at worst
+          # repeat the same lookup.
+          return [:sendmail, { location: (@_sendmail_location ||= `which sendmail`.chomp) }] unless respond_to?(:delivery_method)
+          return [delivery_method.keys[0], delivery_method.values[0]] if delivery_method.is_a?(Hash)
+          return [delivery_method, {}] if delivery_method.is_a?(Symbol)
+
+          [nil, {}]
         end
       end
     end

data/padrino-mailer.gemspec

@@ -8,16 +8,21 @@ Gem::Specification.new do |s|
   s.authors = ['Padrino Team', 'Nathan Esquenazi', "Davide D'Agostino", 'Arthur Chiu']
   s.email = 'padrinorb@gmail.com'
   s.summary = 'Mailer system for padrino'
-  s.homepage = 'http://www.padrinorb.com'
+  s.homepage = 'https://padrinorb.com'
   s.description = 'Mailer system for padrino allowing easy delivery of application emails'
+  s.required_ruby_version = '>= 2.7.8'
   s.required_rubygems_version = '>= 1.3.6'
   s.version = Padrino.version
-  s.date = Time.now.strftime('%Y-%m-%d')
   s.license = 'MIT'
+  s.metadata = {
+    'bug_tracker_uri' => 'https://github.com/padrino/padrino-framework/issues',
+    'changelog_uri' => 'https://github.com/padrino/padrino-framework/blob/master/CHANGES.rdoc',
+    'documentation_uri' => 'https://padrinorb.com/guides/',
+    'source_code_uri' => 'https://github.com/padrino/padrino-framework'
+  }
 
   s.extra_rdoc_files = Dir['*.rdoc']
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
   s.rdoc_options  = ['--charset=UTF-8']

data/test/test_email.rb

@@ -287,4 +287,63 @@ describe 'Email' do
       assert_equal(['gamma plain', 'gamma html'], email.parts.map { |part| part.body.to_s })
     end
   end
+
+  describe 'delivery settings' do
+    def counted_app
+      mock_app do
+        register Padrino::Mailer
+        @sendmail_lookups = 0
+        class << self
+          attr_reader :sendmail_lookups
+
+          def `(command)
+            @sendmail_lookups += 1
+            "/fake/#{command.split.last}\n"
+          end
+        end
+      end
+    end
+
+    it 'should look up sendmail once when no delivery method is set' do
+      app = counted_app
+      first = app.send(:delivery_settings)
+      second = app.send(:delivery_settings)
+      assert_equal [:sendmail, { location: '/fake/sendmail' }], first
+      assert_equal first, second
+      assert_equal 1, app.sendmail_lookups
+    end
+
+    it 'should follow a delivery method changed after the first call' do
+      app = counted_app
+      assert_equal :sendmail, app.send(:delivery_settings).first
+      app.set :delivery_method, :test
+      assert_equal [:test, {}], app.send(:delivery_settings)
+      app.set :delivery_method, smtp: { address: 'localhost' }
+      assert_equal [:smtp, { address: 'localhost' }], app.send(:delivery_settings)
+      app.set :delivery_method, 'unusual'
+      assert_equal [nil, {}], app.send(:delivery_settings)
+      assert_equal 1, app.sendmail_lookups
+    end
+
+    it 'should read a Symbol and a Hash delivery method on repeated calls' do
+      app = counted_app
+      app.set :delivery_method, :test
+      2.times { assert_equal [:test, {}], app.send(:delivery_settings) }
+      app.set :delivery_method, smtp: { port: 25 }
+      2.times { assert_equal [:smtp, { port: 25 }], app.send(:delivery_settings) }
+      assert_equal 0, app.sendmail_lookups
+    end
+
+    it 'should still raise on Windows without a delivery method' do
+      app = counted_app
+      original = Gem.method(:win_platform?)
+      Gem.define_singleton_method(:win_platform?) { true }
+      begin
+        2.times { assert_raises(RuntimeError) { app.send(:delivery_settings) } }
+      ensure
+        Gem.define_singleton_method(:win_platform?, original)
+      end
+      assert_equal 0, app.sendmail_lookups
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-mailer
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-31 00:00:00.000000000 Z
+date: 2026-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -109,10 +109,14 @@ files:
 - test/test_message.rb
 - test/test_padrino_mailer.rb
 - test/test_part.rb
-homepage: http://www.padrinorb.com
+homepage: https://padrinorb.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/padrino/padrino-framework/issues
+  changelog_uri: https://github.com/padrino/padrino-framework/blob/master/CHANGES.rdoc
+  documentation_uri: https://padrinorb.com/guides/
+  source_code_uri: https://github.com/padrino/padrino-framework
 post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
@@ -122,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="