uron 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0591180df0f68252415b03b5a89b7d05126f8916
-  data.tar.gz: c71803232c8244075cdad60c3b888ff06bbd1ad6
+  metadata.gz: 7c3fd3a3d7da61594f5acf17e0543a8b022cdb28
+  data.tar.gz: f311b5bf137a009b20917816698a3fd2b645cd22
 SHA512:
-  metadata.gz: 443387254be0ecaf8dca82886036822369b5c266b9ea642bdb3098cafc32b3afaf33db3f2878a7cddee814eb339816c98e24ab81039d5112ea9ac6b2444bdcf2
-  data.tar.gz: 1ce8c88b1106bf918c36e2050dddd20195f94054111f50783d9ba42a5db791032143e86b606ea92a6c4e8cfd6cd5047c756001adb0c11deb0df2683a7d37f5a7
+  metadata.gz: 656a133a04b2eb9b333034e581ff4ebfb7a9347fd28ba724527faf750c619c23cecc384c58ea3ab449c919549bc7e84b5caf7da79af0df4d1822931b76139434
+  data.tar.gz: 300f29edaa9d2a25c9901e9002ac197eb374ca2992b37e1e69152c1714997df40ceea339b5cbcb15086c421ea0f18efe96af60b4f3b755875f70f227a565ad20

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.3.1
+  - 2.2.5
+  - 2.1.10
   - 2.0.0
   - 1.9.3
   - 1.8.7

data/README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://img.shields.io/travis/unak/uron.svg)](https://travis-ci.org/unak/uron)
-
+[![Version     ](https://img.shields.io/gem/v/uron.svg)](https://rubygems.org/gems/uron)
 uron
 ====
 
@@ -72,6 +72,7 @@ If a block is passed, call the block.
 Examples:
 
     header :subject => /\A[mailing-list:/, :delivery => "mailing-list"
+
 This means that if the subject of the mail starts with `[mailing-list:`,
 delivery the mail to `mailing-list` directory (it's relative from your
 Maildir.)
@@ -79,8 +80,18 @@ Maildir.)
     header :subject => /\A[mailing-list:/ do
       delivery "mailing-list"
     end
+
 Same as above.
 
+If you want to check multiple headers, simple put them as:
+
+   header :subject => /\A[mailing-list:/,
+          :from => /\Amailing-list-owner\b/,
+          :delivery => "mailing-list"
+
+When `subject` and `from` are both matched, the mail will be delivered to `mailling-list` directory.
+
+
 ### Delivery Commands
 
 #### `delivery`
@@ -126,7 +137,7 @@ Takes one String parameter and outout it to the log file.
 License
 -------
 
-Copyright (c) 2012 NAKAMURA Usaku usa@garbagecollect.jp
+Copyright (c) 2012,2014 NAKAMURA Usaku usa@garbagecollect.jp
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/bin/uron.rb

@@ -34,6 +34,8 @@ require "socket"
 #= uron - a mail delivery agent
 #
 class Uron
+  VERSION = "1.2.0"
+
   ConfigError = Class.new(RuntimeError)
 
   # execute uron
@@ -59,7 +61,7 @@ class Uron
   # _rc_ is a String of the configuration file.
   # _io_ is a IO of the mail.
   def initialize(rc)
-    self.class.class_eval do
+    self.class.class_exec do
       remove_const :Maildir if defined?(Maildir)
       remove_const :Log if defined?(Log)
     end
@@ -84,19 +86,38 @@ class Uron
     logging " Subject: #{@mail.headers[:subject].first[0, 69]}" if @mail.headers.include?(:subject)
 
     catch(:tag) do
-      @ruleset.each do |sym, conds, block|
-        if @mail.headers[sym]
-          conds = [conds] unless conds.is_a?(Array)
-          conds.each do |cond|
-            @mail.headers[sym].each do |header|
-              begin
-                block.call(@mail) && throw(:tag) if cond =~ header
-              rescue
-                logging $!
-                raise $!
+      @ruleset.each do |args, block|
+        matched = false
+        args.each_pair do |sym, conds|
+          unless @mail.headers[sym]
+            matched = false
+            break
+          end
+
+          conds = Array(conds)
+          found = false
+          @mail.headers[sym].each do |header|
+            conds.each do |cond|
+              if cond =~ header
+                found = true
+                break
               end
             end
           end
+
+          if found
+            matched = true
+          else
+            matched = false
+            break
+          end
+        end
+
+        begin
+          block.call(@mail) && throw(:tag) if matched
+        rescue
+          logging $!
+          raise $!
         end
       end
 
@@ -141,7 +162,7 @@ class Uron
     block = proc{ delivery deliv } if deliv
     block = proc{ transfer *trans } if trans
     block = proc{ invoke(*invok) == 0 } if invok
-    @ruleset.push([h.keys.first, h.values.flatten(1), block])
+    @ruleset.push([h, block])
   end
 
   # deliver the mail to a directory

data/test/test_uron.rb

@@ -177,6 +177,32 @@ header :to => /\\Ausa3@/, :invoke => ["#{ruby}", "-e", "exit /^To:.*usa3@/ =~ AR
       assert_match /\AFrom [^\n]+\r?\n\z/, File.read(@logfile)
     end
     tmprc.unlink
+    File.unlink(@logfile) if File.exist?(@logfile)
+
+    tmprc = make_rc <<-END_OF_RC
+      Log = "#{@logfile}"
+      header :from => /\\Ausa\\b/, :to => /\\Ausa\\b/ do
+        delivery ".mine"
+      end
+      header :from => /\\Ausa\\b/ do
+        delivery ".others"
+      end
+    END_OF_RC
+    assert_nothing_raised do
+      io = StringIO.new("From: usa@example.com\r\nTo: usa@example.com\r\n\r\n")
+      assert_equal 0, Uron.run(tmprc.path, io)
+      mail = Dir.glob(File.join(@maildir, "new", "*")).find{|e| /\A[^\.]/ =~ e}
+      assert_nil mail
+      assert_match /\AFrom [^\n]+\r?\n\s+Folder: .mine/, File.read(@logfile)
+      File.unlink(@logfile) if File.exist?(@logfile)
+
+      io = StringIO.new("From: usa@example.com\r\nTo: hoge@example.com\r\n\r\n")
+      assert_equal 0, Uron.run(tmprc.path, io)
+      mail = Dir.glob(File.join(@maildir, "new", "*")).find{|e| /\A[^\.]/ =~ e}
+      assert_nil mail
+      assert_match /\AFrom [^\n]+\r?\n\s+Folder: .others/, File.read(@logfile)
+    end
+    tmprc.unlink
   end
 
   def test_delivery

data/uron.gemspec

@@ -1,8 +1,10 @@
 # coding: utf-8
 # -*- Ruby -*-
+require File.expand_path("bin/uron")
+
 Gem::Specification.new do |spec|
   spec.name          = "uron"
-  spec.version       = "1.0.0"
+  spec.version       = Uron::VERSION
   spec.authors       = ["U.Nakamura"]
   spec.email         = ["usa@garbagecollect.jp"]
   spec.description   = %q{uron is a mail delivery agent}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uron
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: uron is a mail delivery agent