leanweb 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54fc1b8b4dff318eb3ccc51e8f0862706c0b8de9879dadf403580f00a224b9df
-  data.tar.gz: e2a5d17a9f7a2f13f0cb2983031f91127387021a26d70a7bc91e0722ffb19bf3
+  metadata.gz: f4420d0acf838a96016cabcbdf4fb5977044c4c43c7102bbb7c520dab34a3908
+  data.tar.gz: 861d7f89f86f9749ac69e007ffd23218047f6cabf825a53074df2aab953e9bb3
 SHA512:
-  metadata.gz: 0563e596c38aefdd7af7150ed4f87dbbb55c6bee5459d397574e5fb1da18fe31e5091d6f8346e952729118fed9fda8f6e0b3f2579e0b39fc54d426cee76b81ed
-  data.tar.gz: 579991147e69766158a1168d28ec58f8da90a94ad4383e2fe8001b15cc4460895892600d53968e063e067a7be2c12347f25e37ec94cb2237e5adc32c04333a1a
+  metadata.gz: 3377a07bfdee4a0fe5ebfdd40d3094786ac204b2301eafbf796b296bcce86ab6728352246f74abea581d5910f0f3868d5d11c7706ee4f61ce5275f74914365c4
+  data.tar.gz: 616f2bcc6979253f43d20135a72a3537c6eb3680278c39fa73c879e0a088434c1242f10f200202ab0ec5533c746cab0ca971e655ed79956cdd3f3bca6886bac8

data/contrib/lib/lean_mail.rb

@@ -12,6 +12,7 @@ require 'net/smtp'
 require 'securerandom'
 require 'socket'
 require 'time'
+require 'uri/mailto'
 
 # Send an email with SMTP easily.
 #
@@ -25,27 +26,32 @@ require 'time'
 # - SMTP_FROM: In the format `Name <user@mail>` or `user@mail`.
 #
 # @example Single address
-#   LeanMail.deliver('to@mail', 'subject', 'body')
+#   LeanMail.deliver('to@mail', 'subject', 'body', reply_to: 'to@other.host')
 #
 # @example Multiple addresses
 #   LeanMail.deliver(['to@mail', 'to2@mail'], 'subject', 'body')
 module LeanMail
   # RFC 2821 message data representation.
   class Data
-    attr_reader :from, :to, :subject, :message
+    attr_reader :from, :to, :subject, :message, :reply_to
+
+    def initialize(from, to, subject, message, reply_to: nil)
+      self.class.validate_recipients(to)
+      self.class.validate_recipients(reply_to) if reply_to
 
-    def initialize(from, to, subject, message)
       @from = from
       @to = to
       @subject = subject
       @message = message
+      @reply_to = reply_to
     end
 
     def to_s
       <<~MAIL
         Content-type: text/plain; charset=UTF-8
         From: #{@from}
-        To: #{to.instance_of?(Array) ? to.join(', ') : to}
+        To: #{@to.instance_of?(Array) ? @to.join(', ') : @to}
+        Reply-To: #{@reply_to || @from}
         Subject: =?UTF-8?B?#{Base64.strict_encode64(subject)}?=
         Date: #{Time.new.rfc2822}
         Message-Id: <#{SecureRandom.uuid}@#{Socket.gethostname}>
@@ -53,6 +59,29 @@ module LeanMail
         #{@message}
       MAIL
     end
+
+    class << self
+      def validate_recipients(recipients)
+        return recipients.each{ |recipient| validate_recipients(recipient) } if
+          recipients.instance_of?(Array)
+
+        raise(ArgumentError, "#{recipients} is not a valid recipient") unless
+          URI::MailTo::EMAIL_REGEXP.match?(extract_addr(recipients))
+      end
+
+      def extract_addr(str)
+        match = str.match(/\A[^\n\r<]+<([^\n\r>]+)>\z/)
+        return match[1] if match
+
+        str
+      end
+
+      def extract_addrs(to)
+        return to.map{ |addr| extract_addr(addr) } if to.instance_of?(Array)
+
+        extract_addr(to)
+      end
+    end
   end
 
   # Email deliverer.
@@ -76,12 +105,17 @@ module LeanMail
     # @param to [Array, String] In the format `Name <user@mail>` or `user@mail`.
     # @param subject [String]
     # @param body [String]
+    # @param reply_to [Array, String] In the same format as `to`.
     # @return [Deliver]
-    def call(to, subject, body)
-      @data = Data.new(@from, to, subject, body)
+    def call(to, subject, body, reply_to: nil)
+      @data = Data.new(@from, to, subject, body, reply_to: reply_to)
 
       @smtp.start(Socket.gethostname, @user, @password, :plain) do |smtp|
-        smtp.send_message(@data.to_s, extract_addr(@from), extract_addrs(to))
+        smtp.send_message(
+          @data.to_s,
+          Data.extract_addr(@from),
+          Data.extract_addrs(to)
+        )
       end
 
       self
@@ -100,19 +134,6 @@ module LeanMail
       when 'starttls' then @smtp.enable_starttls
       end
     end
-
-    def extract_addr(str)
-      match = str.match(%r{<([^/]+)>})
-      return match[1] if match
-
-      str
-    end
-
-    def extract_addrs(to)
-      return to.map{ |addr| extract_addr(addr) } if to.instance_of?(Array)
-
-      extract_addr(to)
-    end
   end
 
   # Deliver email.
@@ -120,8 +141,9 @@ module LeanMail
   # @param to [Array, String] In the format `Name <user@mail>` or `user@mail`.
   # @param subject [String]
   # @param body [String]
+  # @param reply_to [Array, String] In the same format as `to`.
   # @return [Deliver]
-  def self.deliver(to, subject, body)
-    LeanMail::Deliver.new.call(to, subject, body)
+  def self.deliver(to, subject, body, reply_to: nil)
+    LeanMail::Deliver.new.call(to, subject, body, reply_to: reply_to)
   end
 end

data/lib/leanweb/route.rb

@@ -72,11 +72,6 @@ module LeanWeb
       return respond_proc(request) if @action.instance_of?(Proc)
 
       respond_method(request)
-    rescue NoMethodError
-      raise unless @static == true && (view_path = guess_view_path)
-
-      controller = default_controller_class.new(self)
-      controller.default_static_action(view_path)
     end
 
     # String path, independent if {#path} is Regexp or String.
@@ -159,14 +154,28 @@ module LeanWeb
       Controller
     end
 
+    def default_static_action
+      default_controller_class.new(self).default_static_action(guess_view_path)
+    end
+
+    def controller_for_request(request)
+      require_relative("#{CONTROLLER_PATH}/#{@action.controller.to_s.snakeize}")
+      Object.const_get(@action.controller).new(self, request)
+    rescue LoadError
+      nil
+    end
+
     # @param request [Rack::Request]
     # @return [Array] a valid Rack response.
     def respond_method(request)
       params = action_params(request.path)
-      require_relative("#{CONTROLLER_PATH}/#{@action.controller.to_s.snakeize}")
-      controller = Object.const_get(@action.controller).new(self, request)
-      return controller.public_send(@action.action, **params) \
-        if params.instance_of?(Hash)
+      controller = controller_for_request(request)
+
+      return default_static_action unless
+        controller&.class&.method_defined?(@action.action)
+
+      return controller.public_send(@action.action, **params) if
+        params.instance_of?(Hash)
 
       controller.public_send(@action.action, *params)
     end

data/lib/leanweb/version.rb

@@ -9,5 +9,5 @@
 
 
 module LeanWeb
-  VERSION = '0.5.1'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leanweb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Felix Freeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-13 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: LeanWeb is a minimal hybrid static / dynamic web framework