popper 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ac0486fff5d4f83876ef9886d1c28995406a2b
-  data.tar.gz: 74fb566a42ced8e653ec1fb4ba28351a703a51aa
+  metadata.gz: f00b7008ef966d2df6766ef842a17a560cf26b83
+  data.tar.gz: 0ddadcef3b9fa3513866832e99e74686f567e970
 SHA512:
-  metadata.gz: 4b38a249533f6104b875bf86abdcbaa9df13c890bc49fb30adc1048e33e28ba381d5c0fb45cdeb2efed7df4ee95831d06a3ba842c4af30a88e5730f5ccd05e2b
-  data.tar.gz: 18fc4142645cc586c61f9fa364159a03baa93423b96ffc88c9c5b734224607c4af96e73ee1711601131ecaeb625fcfa118b532819b4ec885b31ca8dd1211e7ca
+  metadata.gz: cf618186323477f48b7ecf604cb819b7b30f136ab0bd3bef1ddb929a49a1d437c7263e56a1f48f93d2e2f6fc314766cab30d089820ffcef13b0835b09cacf944
+  data.tar.gz: 06fac7bd05a05bd63d843e8f4faf5b4d1812aacfc9b445fc0f0cd262618623a92101c14948670e57969bb44ccdad1bb27047f5316b864e4a2abbec6ddfb95d82

data/README.md

@@ -50,6 +50,7 @@ server = "example.com"
 user = "example@example.com"
 password = "password"
 port = 110(default)
+ssl = false
 
 # [config_name].default.condition
 [example.default.condition]

data/lib/popper/cli.rb

@@ -65,18 +65,16 @@ module Popper
         last_rule = nil
         puts config.name
 
-        config.rules.to_h.keys.each do |rule|
-          config.condition_by_rule(rule).to_h.each do |mail_header,conditions|
-            if rule != last_rule
-              puts " "*1 + "rule[#{rule}]"
-              puts " "*2 + "actions"
-              print_action(config, rule)
-            end
-
-            puts " "*2 + "header[#{mail_header}]"
-            puts " "*3 + "#{conditions}"
-            last_rule = rule
+        config.rule_with_conditions_each do |rule,mail_header,conditions|
+          if rule != last_rule
+            puts " "*1 + "rule[#{rule}]"
+            puts " "*2 + "actions"
+            print_action(config, rule)
           end
+
+          puts " "*2 + "header[#{mail_header}]"
+          puts " "*3 + "#{conditions}"
+          last_rule = rule
         end
       end
 

data/lib/popper/config.rb

@@ -39,6 +39,19 @@ module Popper
       @hash_table
     end
 
+    [
+      %w(find all?),
+      %w(each each),
+    ].each do |arr|
+      define_method("rule_with_conditions_#{arr[0]}") do |&blk|
+        self.rules.to_h.keys.send(arr[0]) do |rule|
+          self.condition_by_rule(rule).to_h.send(arr[1]) do |mail_header,conditions|
+            blk.call(rule, mail_header, conditions)
+          end
+        end
+      end
+    end
+
     %w(
       condition
       action
@@ -59,10 +72,13 @@ module Popper
         end
       }
 
+      # merge global default and account default
       define_method("#{name}_by_rule") do |rule|
         hash = self.send("global_default_#{name}")
         hash = hash.deep_merge(self.send("account_default_#{name}").to_h) if self.send("account_default_#{name}")
         hash = hash.deep_merge(self.rules.send(rule).send(name).to_h) if rules.send(rule).respond_to?(name.to_sym)
+
+        # replace body to utf_body
         AccountAttributes.new(Hash[hash.map {|k,v| [k.to_s.gsub(/^body$/, "utf_body").to_sym, v]}])
       end
     end

data/lib/popper/mail_account.rb

@@ -4,14 +4,16 @@ require 'kconv'
 
 module Popper
   class MailAccount
+    attr_accessor :config, :current_list, :complete_list
+
     def initialize(config)
-      @config = config
+      self.config = config
     end
 
     def run
       session_start do |conn|
-        @current_uidl_list = conn.mails.map(&:uidl)
-        @complete_uidl_list = @current_uidl_list unless @complete_uidl_list
+        self.current_list = conn.mails.map(&:uidl)
+        self.complete_list = current_list unless complete_list
         pop(conn)
       end
       rescue => e
@@ -22,7 +24,7 @@ module Popper
       done_uidls = []
       error_uidls = []
 
-      Popper.log.info "start popper #{@config.name}"
+      Popper.log.info "start popper #{config.name}"
 
       process_uidl_list(conn).each do |m|
         begin
@@ -31,12 +33,12 @@ module Popper
 
           if rule = match_rule?(mail)
             Popper.log.info "do action:#{mail.subject}"
-            Popper::Action::Git.run(@config.action_by_rule(rule), mail) if @config.action_by_rule(rule)
+            Popper::Action::Git.run(config.action_by_rule(rule), mail) if config.action_by_rule(rule)
           end
           done_uidls << m.uidl
 
         rescue Net::POPError => e
-          @complete_uidl_list += done_uidls
+          self.complete_list += done_uidls
           Popper.log.warn "pop err write uidl"
           return
         rescue => e
@@ -45,38 +47,38 @@ module Popper
         end
       end
 
-      @complete_uidl_list = @current_uidl_list - error_uidls
-      Popper.log.info "success popper #{@config.name}"
+      self.complete_list = current_list - error_uidls
+      Popper.log.info "success popper #{config.name}"
     end
 
     def session_start(&block)
-      pop = Net::POP3.new(@config.login.server, @config.login.port || 110)
+      pop = Net::POP3.new(config.login.server, config.login.port || 110)
+      pop.enable_ssl if config.login.respond_to?(:ssl) && config.login.ssl
+
       %w(
         open_timeout
         read_timeout
       ).each {|m| pop.instance_variable_set("@#{m}", ENV['POP_TIMEOUT'] || 120) }
 
       pop.start(
-        @config.login.user,
-        @config.login.password
+        config.login.user,
+        config.login.password
       ) do |pop|
-        Popper.log.info "connect server #{@config.name}"
+        Popper.log.info "connect server #{config.name}"
         block.call(pop)
-        Popper.log.info "disconnect server #{@config.name}"
+        Popper.log.info "disconnect server #{config.name}"
       end
     end
 
     def process_uidl_list(conn)
-      uidl_list = @current_uidl_list - @complete_uidl_list
+      uidl_list = current_list - complete_list
       conn.mails.select {|_m|uidl_list.include?(_m.uidl)}
     end
 
     def match_rule?(mail)
-      @config.rules.to_h.keys.find do |rule|
-        @config.condition_by_rule(rule).to_h.all? do |mail_header,conditions|
-          conditions.all? do |condition|
-            mail.respond_to?(mail_header) && mail.send(mail_header).to_s.match(/#{condition}/)
-          end
+      config.rule_with_conditions_find do |rule,mail_header,conditions|
+        conditions.all? do |condition|
+          mail.respond_to?(mail_header) && mail.send(mail_header).to_s.match(/#{condition}/)
         end
       end
     end

data/lib/popper/version.rb

@@ -1,3 +1,3 @@
 module Popper
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: popper
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - pyama86
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor