popper 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f23fe15b78f11b47aa52fdb5cad73ebedd8facc552d26a607638708e23b3e1f
-  data.tar.gz: 19ed031ffdaa942a0d398557c13baa0fafef8344bbfd253c41a24f8af08f86a3
+  metadata.gz: 7241d920f1cc1df768881863fd35b016df55897ab00eac6be95afe59e59a392b
+  data.tar.gz: a4a80773306057f341999e6deedce2ed8688a4e81006be9b4fe3f0e6c23ba98e
 SHA512:
-  metadata.gz: f116d29ff59f6474200649e54e29721662be4659800abb9effee52b0193384cab8d037d2f18d42ebb8b4f14088450c3e2ab261ca957979d21dc10d4ea3718df9
-  data.tar.gz: 7725660d395fb16f3574e87dbe5db952bea95d4a90675522e6f4d0a49f3c6adf6b6049f6ae6b8268b925b62a54152631d40ba9e55cbeb270419722f5aed67b0a
+  metadata.gz: c2fdc66898ca3b56790fd5a266888c9162ce0ab7b62edd13ba5c613999863d431131e07d400f4f19d76753987a0cac568a338bf46fde51e16632fb41d4ffc89a
+  data.tar.gz: 814434364ccb6c25d3d9bd3a328d5707644741377947417f127bc3299d2329d16f0b81251c29e43ac8e96c174bafece2e2f7700737e6a86ab1e5ac7425fd765f

data/lib/popper/mail_account.rb

@@ -7,13 +7,13 @@ module Popper
     attr_accessor :config, :current_list, :complete_list
 
     def initialize(config)
-      self.config = config
+      @config = config
     end
 
     def run
       session_start do |conn|
-        self.current_list = conn.mails.map(&:uidl)
-        self.complete_list = current_list unless complete_list
+        @current_list = conn.mails.map(&:uidl)
+        @complete_list ||= @current_list
         pop(conn)
       end
     rescue StandardError => e
@@ -27,10 +27,12 @@ module Popper
       Popper.log.info "start popper #{config.name}"
 
       process_uidl_list(conn).each do |m|
+        uidl = m.uidl
+        Popper.log.info "pop mail:#{uidl}"
         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
+        @complete_list += done_uidls
         Popper.log.warn 'pop err write uidl'
         return
       rescue StandardError => e
@@ -38,8 +40,8 @@ module Popper
         Popper.log.warn e
       end
 
-      self.complete_list = current_list - error_uidls
-      Popper.log.info "success popper #{config.name}"
+      @complete_list = @current_list - error_uidls
+      Popper.log.info "success popper #{config.name} current_list:#{@current_list.size} complete_list:#{@complete_list.size}"
     end
 
     def check_and_action(m)
@@ -79,7 +81,7 @@ module Popper
     end
 
     def process_uidl_list(conn)
-      uidl_list = current_list - complete_list
+      uidl_list = @current_list - @complete_list
       conn.mails.select { |_m| uidl_list.include?(_m.uidl) }
     end
 
@@ -120,10 +122,10 @@ class EncodeMail < Mail::Message
   def utf_body
     if multipart?
       parts.map do |part|
-        part.body.decoded.encode('UTF-8', charset) unless part.attachment?
+        part.body.decoded.encode('UTF-8', charset, undef: :replace, invalid: :replace, replace: '') unless part.attachment?
       end.join
     else
-      body.decoded.encode('UTF-8', charset)
+      body.decoded.encode('UTF-8', charset, undef: :replace, invalid: :replace, replace: '')
     end
   end
 end

data/lib/popper/version.rb

@@ -1,3 +1,3 @@
 module Popper
-  VERSION = '0.6.2'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popper
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - pyama86