mail-sanitizer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26454d01da259601ec46f36f437fbe94131a934e17a409e4f1904ef7f56a2ffe
-  data.tar.gz: 7f02a19cf2490a73c5348b0b0e191429486f9464dc88fbefda542fb4d4d922c0
+  metadata.gz: 658fd411823dcad053eede5f1c678558c216e60a3719c6e027051594734031f4
+  data.tar.gz: ed9a14a70b8d9453f5c0ba23959d0c85926d369f1daf67e0db8025074bcfd164
 SHA512:
-  metadata.gz: 182d3b9e083e5238d72525bbff8da388727baa41c3a3b523d366cc89145aacf475ce103f78c0203c7ff537b981ade35916af18ef82e731200657b4fcc2d48a0a
-  data.tar.gz: 4be0f0b0b81e61b09d6a707c45d6863fef66a1316efe68706f9aaaa939e3258d067121a658befc17c7ee41081b9499897200ba00d154307831f00039d808fbbd
+  metadata.gz: acfa6e0931da027d2c016735f650f809f1e90c89596c41cc03be9c1052d2b58818482e75450b4cd2f81a84453e6e0fd629bd33ef49576853aede72b699ff5f51
+  data.tar.gz: 6254de9db9f514f511fa9b2df7947a819409faea88a1ac2228a308cb8407479f4d5c4d438604a24e2554c7058b15abf2d75c7db6f84898c822a45e432d758f3a

data/lib/mail/sanitizer/constant.rb

@@ -2,7 +2,7 @@ module Mail
   module Sanitizer
     class Constant
       QUOT_SYMBOL_PATTERN = /^>/
-      QUOT_PATTERN = /wrote:|-originalmessage-|-forwardedmessage-/
+      QUOT_PATTERN = /wrote:|-originalmessage-|-forwardedmessage-|forwardedby/
       QUOT_DATETIME_PATTERN = /^(on|at)/
       QUOT_KEYWORD_SET = [
         ['from:', 'sent:', 'to:', 'subject:'],

data/lib/mail/sanitizer/sanitizer.rb

@@ -22,7 +22,7 @@ module Mail
       def delete_quot_sign(str)
         return nil, nil, nil if str.nil?
 
-        lines = split_line(str.strip)
+        lines = Mail::Sanitizer::String.split_line(str.strip)
         quot_lines = []
         sign_lines = []
 
@@ -43,23 +43,8 @@ module Mail
         return lines.join("\n").strip, quot_lines.join("\n").strip, sign_lines.join("\n").strip
       end
 
-      def split_line(str)
-        str.split(/[\r\n]/)
-      end
-
-      def downcase(str)
-        str.downcase.gsub(/[[:space:]]/, '')
-      end
-
-      def include_datetime?(str)
-        DateTime.parse(str)
-        true
-      rescue
-        false
-      end
-
       def split_block(str)
-        lines = split_line(str)
+        lines = Mail::Sanitizer::String.split_line(str)
         numrow = lines.size
 
         line_types = Array.new(numrow, :normal)
@@ -95,7 +80,7 @@ module Mail
             set.each do |key|
               keywords[key] = false
               while (i + sidx) < numrow do
-                downcased_line = downcase(lines[i + sidx])
+                downcased_line = Mail::Sanitizer::String.downcase(lines[i + sidx])
                 unless downcased_line.empty?
                   keywords[key] = true if downcased_line =~ /^#{key}/
                   sidx += 1
@@ -108,8 +93,10 @@ module Mail
             break if keywords.values.all?
           end
 
-          if keywords.values.all? || downcase(line) =~ Mail::Sanitizer::Constant::QUOT_PATTERN ||
-             (downcase(line) =~ Mail::Sanitizer::Constant::QUOT_DATETIME_PATTERN && include_datetime?(line))
+          downcased_line = Mail::Sanitizer::String.downcase(line)
+          if keywords.values.all? || downcased_line =~ Mail::Sanitizer::Constant::QUOT_PATTERN ||
+             (downcased_line =~ Mail::Sanitizer::Constant::QUOT_DATETIME_PATTERN && Mail::Sanitizer::String.include_datetime?(line)) ||
+             (Mail::Sanitizer::String.include_datetime?(line) && Mail::Sanitizer::String.include_email_address?(line))
             line_types[i, numrow - i] = Array.new(numrow - i, :quot) unless line_types[i] == :quot
             break
           end

data/lib/mail/sanitizer/string.rb

@@ -0,0 +1,54 @@
+module Mail
+  module Sanitizer
+    class String
+      ADDRESS_REGEXP = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+      SP    = "[[:space:]]"
+      DIGIT = "[0-9０-９]"
+      YEAR  = "(#{DIGIT}{4})#{SP}*年"
+      MONTH = "(#{DIGIT}{1,2})#{SP}*月"
+      DAY   = "(#{DIGIT}{1,2})#{SP}*日"
+      HOUR  = "(#{DIGIT}+)#{SP}*時"
+      MIN   = "(#{DIGIT}+)#{SP}*分"
+
+      PATTERNS = [
+        [/#{YEAR}#{MONTH}#{DAY}/, '\1/\2/\3'],
+        [/#{HOUR}#{MIN}/, '\1:\2']
+      ]
+
+      class << self
+        def split_line(str)
+          str.split(/[\r\n]/)
+        end
+
+        def downcase(str)
+          str.downcase.gsub(/[[:space:]]/, '')
+        end
+
+        def include_datetime?(str)
+          str = replace_jp_datetime(str)
+          DateTime.parse(str)
+          true
+        rescue
+          false
+        end
+
+        def include_email_address?(str)
+          texts = str.split(/#{SP}/)
+          texts.each do |text|
+            text.strip!
+            text.gsub!(/^\(|^<|[^[:alpha:]]*$/, '')
+            return true if ADDRESS_REGEXP === text
+          end
+          return false
+        end
+
+        def replace_jp_datetime(str)
+          return nil if str.nil? || str == ''
+          fstr = str.dup
+          PATTERNS.each { |pattern| fstr.gsub!(pattern[0], pattern[1]) }
+          fstr
+        end
+      end
+    end
+  end
+end

data/lib/mail/sanitizer/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Sanitizer
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/mail/sanitizer.rb

@@ -1,5 +1,6 @@
 require "mail/sanitizer/version"
 require "mail/sanitizer/constant"
+require "mail/sanitizer/string"
 require "mail/sanitizer/sanitizer"
 
 module Mail

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - MasatoMiyoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - lib/mail/sanitizer.rb
 - lib/mail/sanitizer/constant.rb
 - lib/mail/sanitizer/sanitizer.rb
+- lib/mail/sanitizer/string.rb
 - lib/mail/sanitizer/version.rb
 - mail-sanitizer.gemspec
 homepage: https://github.com/MasatoMiyoshi/mail-sanitizer