popper 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b808e5e8c4b22939a7f9aa38f929a48fe47cc99cf569f97149e168d77e5ab5b
-  data.tar.gz: 13f1787819e224b2eeb96dd99cdfc0f210300e31decbe1752f133fc4520a5c81
+  metadata.gz: 3247fe4e78dc92357e74dbef91a27adad0f2b9fe93115aa6d5003b4a1888bd9a
+  data.tar.gz: bbeadd71ec4abfe61587f2181809a8f1a40786affd0ebf17526f884bb0aaa8cf
 SHA512:
-  metadata.gz: 15e3d186627b15f17b14f57e6829d0fa534e6d3792dad0fc080a51a833e3584044a2dd94bfcdea6c3860868e624538f87654d462559b61b4d0c039db9a42eb1b
-  data.tar.gz: e155391686166a6e6f24c498576fb523ad6bc0ccda98b5c293f9506649568d8a7fc6da488db32068da8a51f7ea537ca50ae1bef993fb03475e18b0e64a02ce94
+  metadata.gz: d2e3f30baf3d3739675d7d515b9efc5a9913350d8ffb19c01a53d7d579ceb3a5ff751ffbee638b21b07d773f4c163b415524b0e678aed6da0b8801eb97f89e41
+  data.tar.gz: 5a79445a2d2606b9943fdb3c7ca05888757edf6f109d6b5dea55ac90f722dd0a2a72a665753b016755366147fb9de8688e48b9484428aa9c716240d889cece5e

data/.github/workflows/ruby.yml

@@ -22,15 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['3.2', '3.3']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@0a29871fe2b0200a17a4497bae54fe5df0d973aa # v1.115.3
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/lib/popper/action/exec_cmd.rb

@@ -3,15 +3,17 @@ require 'shellwords'
 require 'tempfile'
 module Popper::Action
   class ExecCmd < Base
-    def self.task(mail, params={})
-      tmps = mail.attachments.map do |a|
-        ::Tempfile.open(a.filename) do |f|
-          f.write a.body.decoded
-          f
+    def self.task(mail, params = {})
+      unless mail.attachments.empty?
+        tmps = mail.attachments.map do |a|
+          ::Tempfile.open(a.filename) do |f|
+            f.write a.body.decoded
+            f
+          end
         end
-      end unless mail.attachments.empty?
-      cmd = "#{@action_config.cmd} #{Shellwords.escape(mail.subject)} #{Shellwords.escape(mail.utf_body)} #{Shellwords.escape(mail.from.join(";"))} #{Shellwords.escape(mail.to.join(";"))}"
-      cmd += " #{tmps.map {|t| Shellwords.escape(t.path) }.join(' ')}" if tmps && !tmps.empty?
+      end
+      cmd = "#{@action_config.cmd} #{Shellwords.escape(mail.subject)} #{Shellwords.escape(mail.utf_body)} #{Shellwords.escape(mail.from.join(';'))} #{Shellwords.escape(mail.to.join(';'))}"
+      cmd += " #{tmps.map { |t| Shellwords.escape(t.path) }.join(' ')}" if tmps && !tmps.empty?
       ::Bundler.with_clean_env do
         system(cmd)
       end

data/lib/popper/mail_account.rb

@@ -16,8 +16,8 @@ module Popper
         self.complete_list = current_list unless complete_list
         pop(conn)
       end
-      rescue => e
-        Popper.log.warn e
+    rescue StandardError => e
+      Popper.log.warn e
     end
 
     def pop(conn)
@@ -27,17 +27,15 @@ module Popper
       Popper.log.info "start popper #{config.name}"
 
       process_uidl_list(conn).each do |m|
-        begin
-          done_uidls << check_and_action(m)
-          m.delete if config.login.respond_to?(:delete_after) && config.login.delete_after
-        rescue Net::POPError => e
-          self.complete_list += done_uidls
-          Popper.log.warn "pop err write uidl"
-          return
-        rescue => e
-          error_uidls << m.uidl
-          Popper.log.warn e
-        end
+        done_uidls << check_and_action(m)
+        m.delete if config.login.respond_to?(:delete_after) && config.login.delete_after
+      rescue Net::POPError => e
+        self.complete_list += done_uidls
+        Popper.log.warn 'pop err write uidl'
+        return
+      rescue StandardError => e
+        error_uidls << m.uidl
+        Popper.log.warn e
       end
 
       self.complete_list = current_list - error_uidls
@@ -46,7 +44,7 @@ module Popper
 
     def check_and_action(m)
       mail = EncodeMail.new(m.mail)
-      Popper.log.info "check mail:#{mail.date.to_s} #{mail.subject}"
+      Popper.log.info "check mail:#{mail.date} #{mail.subject}"
       match_rules?(mail).each do |rule|
         Popper.log.info "do action:#{mail.subject}"
         Popper::Action::Webhook.run(config.action_by_rule(rule), mail) if config.action_by_rule(rule)
@@ -71,10 +69,10 @@ module Popper
 
     def set_pop_option(pop)
       pop.enable_ssl if config.login.respond_to?(:ssl) && config.login.ssl
-      %w(
+      %w[
         open_timeout
         read_timeout
-      ).each do |m|
+      ].each do |m|
         pop.instance_variable_set("@#{m}", ENV['POP_TIMEOUT'] || 120)
       end
       pop
@@ -82,11 +80,11 @@ module Popper
 
     def process_uidl_list(conn)
       uidl_list = current_list - complete_list
-      conn.mails.select {|_m|uidl_list.include?(_m.uidl)}
+      conn.mails.select { |_m| uidl_list.include?(_m.uidl) }
     end
 
     def match_rules?(mail)
-      config.rule_with_conditions_select do |rule,mail_header,conditions|
+      config.rule_with_conditions_select do |_rule, mail_header, conditions|
         conditions.all? do |condition|
           mail.respond_to?(mail_header) && mail.send(mail_header).to_s.match(/#{condition}/)
         end
@@ -97,12 +95,20 @@ end
 
 class ::Hash
   def deep_merge(second)
-    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
-    self.merge(second.to_h, &merger)
+    merger = proc { |_key, v1, v2|
+      if v1.is_a?(Hash) && v2.is_a?(Hash)
+        v1.merge(v2, &merger)
+      elsif v1.is_a?(Array) && v2.is_a?(Array)
+        v1 | v2
+      else
+        [:undefined, nil, :nil].include?(v2) ? v1 : v2
+      end
+    }
+    merge(second.to_h, &merger)
   end
 
   def deep_merge!(second)
-    self.merge!(deep_merge(second))
+    merge!(deep_merge(second))
   end
 end
 
@@ -113,13 +119,11 @@ class EncodeMail < Mail::Message
 
   def utf_body
     if multipart?
-      if text_part
-        text_part.decoded.encode("UTF-8", charset)
-      elsif html_part
-        html_part.decoded.encode("UTF-8", charset)
-      end
+      parts.map do |part|
+        part.body.decoded.encode('UTF-8', charset) unless part.attachment?
+      end.join
     else
-      body.decoded.encode("UTF-8", charset)
+      body.decoded.encode('UTF-8', charset)
     end
   end
 end

data/lib/popper/version.rb

@@ -1,3 +1,3 @@
 module Popper
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: popper
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: email notification tool