received 0.1.0 → 0.2.0

data/README.md

@@ -22,10 +22,12 @@ Installation
 Modify your [Postfix][4] configuration to deliver mail via LMTP to TCP or UNIX socket.
 
 Example main.cf:
+
     virtual_transport = lmtp:192.168.2.106:1111
     virtual_mailbox_domains = example.com
 
 Create a YAML configuration file which has the following parameters:
+
     {'production'=>{'host'=>hostname, 'database'=>db, 'collection'=>col}}
 
 The mongoid.yml will do, just add the name of collection, i.e.
@@ -60,4 +62,4 @@ Bugs and missing features
 [4]: http://www.postfix.org/
 [5]: http://tools.ietf.org/html/rfc2034
 
-Copyright (c) 2011 Roman Shterenzon, released under the MIT license
+Copyright (c) 2011 Roman Shterenzon, released under the MIT license

data/lib/received/backend/base.rb

@@ -4,10 +4,13 @@ module Received
       # Stores the data
       #
       # @abstract
-      # @param [String] data
-      def store(data)
+      # @param [Hash] mail
+      # @option mail [String] :from
+      # @option mail [Array] :rcpt
+      # @option mail [String] :body
+      def store(mail)
         raise NotImplementedError
       end
     end
   end
-end
+end

data/lib/received/connection.rb

@@ -33,9 +33,7 @@ module Received
     # Callback, called by protocol handler
     #
     # @param [Hash] mail
-    # @option mail [String] :from
-    # @option mail [Array] :rcpt
-    # @option mail [String] :body
+    # @see Received::Backend::Base#store
     def mail_received(mail)
       begin
         @backend.store(mail)

data/lib/received/lmtp.rb

@@ -4,30 +4,35 @@ module Received
 
     def initialize(conn)
       @conn = conn
+      @state = :start
+      @buf = ''
     end
 
     def on_data(data)
       @buf += data
-      while line = @buf.slice!(/.+\r\n/)
+      while line = @buf.slice!(/.*\r\n/)
         line.chomp! unless @state == :data
         event(line)
       end
     end
 
     def start!
-      @state = :start
+      event(nil)
+    end
+
+    private
+    def reset!
       @buf = ''
       @from = nil
       @rcpt = []
-      event(nil)
+      @body = []
     end
 
-    private
     def event(ev)
       @conn.logger.debug {"state was: #{@state.inspect}"}
       @state = case @state
       when :start
-        @body = []
+        reset!
         banner
         :banner_sent
       when :banner_sent
@@ -39,7 +44,7 @@ module Received
           error
         end
       when :lhlo_received
-        if ev =~ /MAIL FROM:<?([^>]+)/
+        if ev =~ /^MAIL FROM:<?([^>]+)/
           @from = $1
           ok
           :mail_from_received
@@ -47,7 +52,7 @@ module Received
           error
         end
       when :mail_from_received
-        if ev =~ /RCPT TO:<?([^>]+)/
+        if ev =~ /^RCPT TO:<?([^>]+)/
           @rcpt << $1
           ok
           :rcpt_to_received
@@ -55,7 +60,7 @@ module Received
           error
         end
       when :rcpt_to_received
-        if ev =~ /RCPT TO:<?([^>]+)/
+        if ev =~ /^RCPT TO:<?([^>]+)/
           @rcpt << $1
           ok
         elsif ev == "DATA"
@@ -107,7 +112,7 @@ module Received
     # FIXME: RFC2033 requires ENHANCEDSTATUSCODES,
     # but it's not used in Postfix
     def extensions
-       emit "250-8BITMIME\r\n250 PIPELINING"
+      emit "250-8BITMIME\r\n250 PIPELINING"
     end
 
     def ok

data/lib/received/version.rb

@@ -1,3 +1,3 @@
 module Received
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/received.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'daemons'
   s.add_runtime_dependency 'eventmachine'
   s.add_runtime_dependency 'mongo', '~>1.3.0'

data/spec/lmtp_spec.rb

@@ -48,4 +48,15 @@ describe Received::LMTP do
     @proto.on_data("LHLO\r\nMAIL FROM")
     @proto.on_data(":<spec@example.com>\r\n")
   end
+
+  it "passes CR/LF through" do
+    body = "Subject: test\r\n\r\nTest\r\n"
+    @mock.stub!(:send_data)
+    @proto.on_data("LHLO\r\nMAIL FROM:<spec1@example.com>\r\nRCPT TO:<spec2@example.com>\r\nDATA\r\n")
+    @proto.on_data(body)
+    @mock.should_receive(:mail_received) do |r|
+      r[:body].should == body
+    end
+    @proto.on_data(".\r\n")
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Roman Shterenzon
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 +03:00
+date: 2011-06-02 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: daemons
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: eventmachine
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,23 +43,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mongo
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -70,11 +57,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bson_ext
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -85,7 +72,7 @@ dependencies:
         - 0
         version: 1.3.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 description: Currently stores received mail in MongoDB
 email: 
 - romanbsd@yahoo.com