net-smtp 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a873c949eb563b55b9ea2d29eaecdf2bad09006b7cc2aab14954971021619de1
-  data.tar.gz: c7ed69e3a3e56805953b5ff7ed8f31288eeb4bd113a13e559b38fca5fd85e1cf
+  metadata.gz: 642b3ab1e326ac890c33653e8293421558c50a8d6cdc3483b5c41edb26bdaebe
+  data.tar.gz: 8c31ba69f42e11a41eda04a31cffe375bcca4cee447b9bc1b1cda218a8f905f3
 SHA512:
-  metadata.gz: 87fcd365f156b81c1124182b09973665607f201909e3bdd8463a007dadda060f6cde0069d4c8db9127233a61531b276b9a0b15e93b77f691a04baacd4c09c6cc
-  data.tar.gz: d8930794d97b2c1dbb8e507bc72b6a4e2f58da8f7e14a6546e87aed8082bbaf7be7c0cde7adeb6c80f66d57c6237edeaf5bc07fbbba6e63905e7c5dcf3777ba1
+  metadata.gz: a2b5433005fe906635edee7e0bb1c9d0d81a6fff1da5af97ad39b16bf7e8a3330dafa9d9a513a3e83b17fe5a53c1489e07f52445c8cdefd81192f83a8cc4f6e7
+  data.tar.gz: be1a223db50575fbb0f14ebac46af142b0f109d422049d5ae49c57a0548c4560904931d8b8c75cc35e95c1978ad9c620ed059bee541d7b443f7a3668e1df2a43

data/lib/net/smtp.rb

@@ -35,8 +35,13 @@ module Net
     attr_reader :response
 
     def initialize(response, message: nil)
-      @response = response
-      @message = message
+      if response.is_a?(::Net::SMTP::Response)
+        @response = response
+        @message = message
+      else
+        @response = nil
+        @message = message || response 
+      end
     end
 
     def message
@@ -179,7 +184,7 @@ module Net
   #                     user: 'Your Account', secret: 'Your Password', authtype: :cram_md5)
   #
   class SMTP < Protocol
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
 
     Revision = %q$Revision$.split[1]
 
@@ -251,6 +256,15 @@ module Net
       @ssl_context_params = ssl_context_params
     end
 
+    # If +true+, verify th server's certificate.
+    attr_accessor :tls_verify
+
+    # The hostname for verifying hostname in the server certificatate.
+    attr_accessor :tls_hostname
+
+    # Hash for additional SSLContext parameters.
+    attr_accessor :ssl_context_params
+
     # Provide human-readable stringification of class state.
     def inspect
       "#<#{self.class} #{@address}:#{@port} started=#{@started}>"
@@ -274,11 +288,14 @@ module Net
       capable?('STARTTLS')
     end
 
+    # true if the EHLO response contains +key+.
     def capable?(key)
       return nil unless @capabilities
       @capabilities[key] ? true : false
     end
-    private :capable?
+
+    # The server capabilities by EHLO response
+    attr_reader :capabilities
 
     # true if server advertises AUTH PLAIN.
     # You cannot get valid value before opening SMTP session.
@@ -631,7 +648,7 @@ module Net
       do_helo helo_domain
       if ! tls? and (starttls_always? or (capable_starttls? and starttls_auto?))
         unless capable_starttls?
-          raise SMTPUnsupportedCommand.new(nil, message: "STARTTLS is not supported on this server")
+          raise SMTPUnsupportedCommand, "STARTTLS is not supported on this server"
         end
         starttls
         @socket = new_internet_message_io(tlsconnect(s, @ssl_context_starttls))
@@ -703,9 +720,9 @@ module Net
     # binary message with this method. +msgstr+ should include both
     # the message headers and body.
     #
-    # +from_addr+ is a String representing the source mail address.
+    # +from_addr+ is a String or Net::SMTP::Address representing the source mail address.
     #
-    # +to_addr+ is a String or Strings or Array of Strings, representing
+    # +to_addr+ is a String or Net::SMTP::Address or Array of them, representing
     # the destination mail address or addresses.
     #
     # === Example
@@ -716,6 +733,12 @@ module Net
     #                         ['dest@example.com', 'dest2@example.com']
     #     end
     #
+    #     Net::SMTP.start('smtp.example.com') do |smtp|
+    #       smtp.send_message msgstr,
+    #                         Net::SMTP::Address.new('from@example.com', size: 12345),
+    #                         Net::SMTP::Address.new('dest@example.com', notify: :success)
+    #     end
+    #
     # === Errors
     #
     # This method may raise:
@@ -752,9 +775,9 @@ module Net
     #
     # === Parameters
     #
-    # +from_addr+ is a String representing the source mail address.
+    # +from_addr+ is a String or Net::SMTP::Address representing the source mail address.
     #
-    # +to_addr+ is a String or Strings or Array of Strings, representing
+    # +to_addr+ is a String or Net::SMTP::Address or Array of them, representing
     # the destination mail address or addresses.
     #
     # === Example
@@ -904,8 +927,10 @@ module Net
       getok("EHLO #{domain}")
     end
 
+    # +from_addr+ is +String+ or +Net::SMTP::Address+
     def mailfrom(from_addr)
-      getok("MAIL FROM:<#{from_addr}>")
+      addr = Address.new(from_addr)
+      getok((["MAIL FROM:<#{addr.address}>"] + addr.parameters).join(' '))
     end
 
     def rcptto_list(to_addrs)
@@ -916,7 +941,7 @@ module Net
         begin
           rcptto addr
         rescue SMTPAuthenticationError
-          unknown_users << addr.dump
+          unknown_users << addr.to_s.dump
         else
           ok_users << addr
         end
@@ -929,8 +954,10 @@ module Net
       ret
     end
 
+    # +to_addr+ is +String+ or +Net::SMTP::Address+
     def rcptto(to_addr)
-      getok("RCPT TO:<#{to_addr}>")
+      addr = Address.new(to_addr)
+      getok((["RCPT TO:<#{addr.address}>"] + addr.parameters).join(' '))
     end
 
     # This method sends a message.
@@ -1139,6 +1166,33 @@ module Net
       @debug_output << msg + "\n" if @debug_output
     end
 
+    # Address with parametres for MAIL or RCPT command
+    class Address
+      # mail address [String]
+      attr_reader :address
+      # parameters [Array<String>]
+      attr_reader :parameters
+
+      # :call-seq:
+      #  initialize(address, parameter, ...)
+      #
+      # address +String+ or +Net::SMTP::Address+
+      # parameter +String+ or +Hash+
+      def initialize(address, *args, **kw_args)
+        if address.kind_of? Address
+          @address = address.address
+          @parameters = address.parameters
+        else
+          @address = address
+          @parameters = (args + [kw_args]).map{|param| Array(param)}.flatten(1).map{|param| Array(param).compact.join('=')}
+        end
+      end
+
+      def to_s
+        @address
+      end
+    end
+
   end   # class SMTP
 
   SMTPSession = SMTP # :nodoc:

data/net-smtp.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Simple Mail Transfer Protocol client library for Ruby.}
   spec.homepage      = "https://github.com/ruby/net-smtp"
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -30,6 +30,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "net-protocol"
-  spec.add_dependency "digest"
-  spec.add_dependency "timeout"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-smtp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Yukihiro Matsumoto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-protocol
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: digest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timeout
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Simple Mail Transfer Protocol client library for Ruby.
 email:
 - matz@ruby-lang.org
@@ -77,14 +49,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Simple Mail Transfer Protocol client library for Ruby.