mournmail 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e37a11a19a93dfc9f11a9b9bb98bf3c4c20454668a1d6315627500ec313dc88
-  data.tar.gz: b8d099a3e67cd35761dab9789f5a3af7c13ebb98f152bf1c031d48d88e4ad69a
+  metadata.gz: 55cea609c299af267b279b8434b661ec471776fe26c5175fdc363a527cc3cc7e
+  data.tar.gz: b77b32b8fb3923a8e545cd1cd5084dab346974a4f9aa210ae353f76e17839370
 SHA512:
-  metadata.gz: 999cb57363f9df4f2bc00eca563b93c61d32c7409e27d628d2ed2c27763af80688886d9b034570ed4291bd92251c5a7c4ae2a8942ea35aa01e7928d365675e8b
-  data.tar.gz: 96c435e264104b3ebbd1b71d5d561f7a7c207a8c1ee05f1b687192e4811b3b2ef1c7f476a8d2c0655ce452f2e577cfaff5a4c79a9fd28e9d9dc5fbe51944ed3a
+  metadata.gz: a891f54dc0e39e09d72a5a8eb9e0272560226fe417eb809462f245bf77e535a9dcaacdf34600e45933723dd0b81378d64e73f1538dcb8c5f2e7c4ffea370078a
+  data.tar.gz: f0bee693b1b02a51449e38ca5d001a085f999040be22dcb5d29e1782dffd3dd31698312b9abde9f1fbc57528a72e031df05fa75ed4a6ee2c7535cd318063991e

data/lib/mournmail/message_mode.rb

@@ -13,7 +13,7 @@ module Mournmail
     # See http://nihongo.jp/support/mail_guide/dev_guide.txt
     MAILTO_REGEXP = URI.regexp("mailto")
     URI_REGEXP = /(https?|ftp):\/\/[^ 　\t\n>)"]*[^] 　\t\n>.,:)"]+|#{MAILTO_REGEXP}/
-    MIME_REGEXP = /^\[(([\-0-9.]+) [A-Za-z._\-]+\/[A-Za-z._\-]+.*|PGP\/MIME .*)\]$/
+    MIME_REGEXP = /^\[(([0-9.]+) [A-Za-z._\-]+\/[A-Za-z._\-]+.*|PGP\/MIME .*)\]$/
     URI_OR_MIME_REGEXP = /#{URI_REGEXP}|#{MIME_REGEXP}/
 
     define_syntax :field_name, /^[A-Za-z\-]+: /
@@ -64,7 +64,7 @@ module Mournmail
     def current_part
       @buffer.save_excursion do
         @buffer.beginning_of_line
-        if @buffer.looking_at?(/\[([\-0-9.]+) .*\]/)
+        if @buffer.looking_at?(/\[([0-9.]+) .*\]/)
           index = match_string(1)
           indices = index.split(".").map(&:to_i)
           @buffer[:mournmail_mail].dig_part(*indices)
@@ -130,8 +130,12 @@ module Mournmail
       else
         file_name = "mournmail"
       end
-      f = Tempfile.open(file_name)
-      f.write(part.decoded)
+      f = Tempfile.open(file_name, binmode: true)
+      s = part.decoded
+      if part.charset
+        s = s.encode(part.charset)
+      end
+      f.write(s)
       f.close
       if ext == "txt"
         find_file(f.path)

data/lib/mournmail/message_rendering.rb

@@ -1,4 +1,5 @@
 require "mail"
+require "html2text"
 
 module Mournmail
   module MessageRendering
@@ -27,16 +28,21 @@ module Mournmail
         end
         if multipart?
           parts.each_with_index.map { |part, i|
-            part.render([*indices, i])
+            no_content = sub_type == "alternative" && i > 0
+            part.render([*indices, i], no_content)
           }.join
-        elsif main_type.nil? || (main_type == "text" && sub_type == "plain")
-          s = body.decoded
-          Mournmail.to_utf8(s, charset)
+        elsif main_type.nil? || main_type == "text"
+          s = Mournmail.to_utf8(body.decoded, charset)
+          if sub_type == "html"
+            "[0 text/html]\n" + Html2Text.convert(s)
+          else
+            s
+          end
         else
           type = Mail::Encodings.decode_encode(self["content-type"].to_s,
                                                :decode) rescue
           "broken/type; error=\"#{$!} (#{$!.class})\""
-          "[-1 #{type}]\n"
+          "[0 #{type}]\n"
         end + pgp_signature
       end
 
@@ -45,10 +51,10 @@ module Mournmail
           mail = decrypt(verify: true)
           return mail.dig_part(i, *rest_indices)
         end
-        if i == -1
+        if i == 0
           return self
         end
-        part = parts[i]
+        part = parts[i - 1]
         if rest_indices.empty?
           part
         else
@@ -79,12 +85,13 @@ module Mournmail
     end
 
     refine ::Mail::Part do
-      def render(indices)
-        index = indices.join(".")
+      def render(indices, no_content = false)
+        index = indices.map { |i| i + 1 }.join(".")
         type = Mail::Encodings.decode_encode(self["content-type"].to_s,
                                              :decode) rescue
           "broken/type; error=\"#{$!} (#{$!.class})\""
-        "[#{index} #{type}]\n" + render_content(indices)
+        "[#{index} #{type}]\n" +
+          (no_content ? "" : render_content(indices))
       end
 
       def dig_part(i, *rest_indices)
@@ -92,7 +99,7 @@ module Mournmail
           mail = Mail.new(body.to_s)
           mail.dig_part(i, *rest_indices)
         else
-          part = parts[i]
+          part = parts[i - 1]
           if rest_indices.empty?
             part
           else
@@ -106,7 +113,8 @@ module Mournmail
       def render_content(indices)
         if multipart?
           parts.each_with_index.map { |part, i|
-            part.render([*indices, i])
+            no_content = sub_type == "alternative" && i > 0
+            part.render([*indices, i], no_content)
           }.join
         elsif main_type == "message" && sub_type == "rfc822"
           mail = Mail.new(body.raw_source)
@@ -114,8 +122,12 @@ module Mournmail
         elsif attachment?
           ""
         else
-          if main_type == "text" && sub_type == "plain"
-            decoded.sub(/(?<!\n)\z/, "\n").gsub(/\r\n/, "\n")
+          if main_type == "text"
+            if sub_type == "html"
+              Html2Text.convert(decoded).sub(/(?<!\n)\z/, "\n")
+            else
+              decoded.sub(/(?<!\n)\z/, "\n").gsub(/\r\n/, "\n")
+            end
           else
             ""
           end

data/lib/mournmail/version.rb

@@ -1,3 +1,3 @@
 module Mournmail
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/mournmail.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rroonga"
   spec.add_runtime_dependency "google-api-client"
   spec.add_runtime_dependency "launchy"
+  spec.add_runtime_dependency "html2text"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 12.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mournmail
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: html2text
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: A message user agent for Textbringer.