mailman 0.5.3 → 0.5.4

data/README.md

@@ -14,8 +14,6 @@ end
 
 See the [User Guide](https://github.com/titanous/mailman/blob/master/USER_GUIDE.md) for more information.
 
-There is also a great [Getting Started Guide](http://dansowter.com/mailman-guide/) written by Dan Sowter.
-
 
 ## Installation
 
@@ -42,6 +40,7 @@ and my mentor was [Steven Soroka](http://github.com/ssoroka).
 
 - [Nicolas Aguttes](http://github.com/tranquiliste)
 - [Nathan Broadbent](https://github.com/ndbroadbent)
+- [John Cant](https://github.com/johncant)
 - [Tim Carey-Smith](http://github.com/halorgium)
 - [Dan Cheail](https://github.com/DanCheail)
 - [Francis Chong](https://github.com/siuying)

data/lib/mailman/application.rb

@@ -18,10 +18,17 @@ module Mailman
     # @param [Hash] options the application options
     # @option options [true,false] :graceful_death catch interrupt signal and don't die until end of poll
     # @param [Proc] block a block with routes
+
     def initialize(&block)
       @router = Mailman::Router.new
       @processor = MessageProcessor.new(:router => @router)
-      instance_eval(&block)
+
+      if Mailman.config.maildir
+        require 'maildir'
+        @maildir = Maildir.new(Mailman.config.maildir)
+      end
+
+      instance_eval(&block) if block_given?
     end
 
     def polling?
@@ -37,10 +44,12 @@ module Mailman
     def run
       Mailman.logger.info "Mailman v#{Mailman::VERSION} started"
 
-      rails_env = File.join(Mailman.config.rails_root, 'config', 'environment.rb')
-      if Mailman.config.rails_root && File.exist?(rails_env) && !(defined?(Rails) && Rails.env)
-        Mailman.logger.info "Rails root found in #{Mailman.config.rails_root}, requiring environment..."
-        require rails_env
+      if Mailman.config.rails_root
+        rails_env = File.join(Mailman.config.rails_root, 'config', 'environment.rb')
+        if File.exist?(rails_env) && !(defined?(Rails) && Rails.env)
+          Mailman.logger.info "Rails root found in #{Mailman.config.rails_root}, requiring environment..."
+          require rails_env
+        end
       end
 
       if Mailman.config.graceful_death
@@ -67,36 +76,31 @@ module Mailman
 
       # Maildir
       elsif Mailman.config.maildir
-        require 'maildir'
 
         Mailman.logger.info "Maildir receiver enabled (#{Mailman.config.maildir})."
-        @maildir = Maildir.new(Mailman.config.maildir)
 
-        process_maildir
+        Mailman.logger.debug "Processing new message queue..."
+        @maildir.list(:new).each do |message|
+          @processor.process_maildir_message(message)
+        end
 
         if Mailman.config.watch_maildir
           require 'listen'
           Mailman.logger.debug "Monitoring the Maildir for new messages..."
 
           callback = Proc.new do |modified, added, removed|
-            process_maildir
+            added.each do |new_file|
+              message = Maildir::Message.new(@maildir, "new/#{new_file}")
+              @processor.process_maildir_message(message)
+            end
           end
 
-          @listener = Listen.to(File.join(Mailman.config.maildir, 'new')).change(&callback)
+          @listener = Listen.to(File.join(@maildir.path, 'new'), :relative_paths => true).change(&callback)
           @listener.start
         end
       end
     end
 
-    # List all message in Maildir new directory and process it
-    def process_maildir
-      # Process messages queued in the new directory
-      Mailman.logger.debug "Processing new message queue..."
-      @maildir.list(:new).each do |message|
-        @processor.process_maildir_message(message)
-      end
-    end
-
     private
 
     # Run the polling loop for the email inbox connection

data/lib/mailman/route/conditions.rb

@@ -38,11 +38,11 @@ module Mailman
     class BodyCondition < Condition
       def match(message)
         if message.multipart?
+          result = nil
           message.parts.each do |part|
-            if result = @matcher.match(part.decoded)
-              return result
-            end
+            break if result = @matcher.match(part.decoded)
           end
+          return result
         else
           @matcher.match(message.body.decoded)
         end

data/lib/mailman/version.rb

@@ -1,3 +1,3 @@
 module Mailman
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailman
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail