uron 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 072c0d933a2d856884ac242e14aa43d492a67b0c
-  data.tar.gz: 0c6314192d29d6e07b2138f996ff12c068ce3e06
+  metadata.gz: f871350a697b79679efebff3405e7dbb41ab1482
+  data.tar.gz: 24bab3b0b45859b16274052414a1e4e6a4a02420
 SHA512:
-  metadata.gz: b67e1876044aeecf5fa4632d6d38b5cdfbaf45b64ae7dd8ee946ff75c7b59391bf595ef3a4382d2694e311478a2a3fd7a304933c6486d44079da1d105ccf2b57
-  data.tar.gz: e5b1b16a386bc3d3d4cfe2f460d79342b742d39cf9d758c2ba4997a067d630384633e55bc0f998fa7cb9f68252367be75968f18b47d04683e6413376dcee74b7
+  metadata.gz: 53e08437fb63416cd5092ff0f6fab00806d60a1f16218e42e983e46119b25b3e63d2a2488f6400acb6030c40907332032eed3750fd5cf56a9762a1671285b22e
+  data.tar.gz: c90e87d74ffdb389ad50fefb652c2130994256da2ca9c040b57d7cc68bcf7ccea24af3821a21c3217a83f840afbde89b8216049e2d1c2ece6098ad83654845ee

data/bin/uron.rb

@@ -34,7 +34,7 @@ require "socket"
 #= uron - a mail delivery agent
 #
 class Uron
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 
   ConfigError = Class.new(RuntimeError)
 
@@ -82,7 +82,7 @@ class Uron
   def run(io = $stdin)
     @mail = self.class::Mail.read(io)
 
-    logging "From #{(@mail.headers[:from] || []).first}  #{Time.now}"
+    logging @mail.from || "From #{(@mail.headers[:from] || []).first}  #{Time.now}"
     logging " Subject: #{@mail.headers[:subject].first[0, 69]}" if @mail.headers.include?(:subject)
 
     catch(:tag) do
@@ -241,6 +241,9 @@ class Uron
       self.new(io.binmode.read)
     end
 
+    # `From` line from MTA, if exists
+    attr_reader :from
+
     # a Hash of mail headers
     attr_reader :headers
 
@@ -254,6 +257,9 @@ class Uron
     #
     # _plain_ is the original mail text.
     def initialize(plain)
+      @from = nil
+      @headers = {}
+      @body = []
       @plain = plain.dup
       parse(@plain)
     end
@@ -262,8 +268,14 @@ class Uron
     #
     # _plain_ is the original mail text.
     def parse(plain)
+      @from = nil
       @headers = {}
       @body = []
+
+      if plain.sub!(/\AFrom .*?\r?\n/, '')
+        @from = $&.chomp
+      end
+
       header_p = true
       prev = nil
       plain.each_line do |line|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uron
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler