received 0.3.1 → 0.3.2

data/lib/received/lmtp.rb

@@ -44,7 +44,7 @@ module Received
           error
         end
       when :lhlo_received
-        if ev =~ /^MAIL FROM:<?([^>]+)/
+        if ev =~ /^MAIL FROM:<?([^<>]*)/
           @from = $1
           ok
           :mail_from_received
@@ -52,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
@@ -60,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"

data/lib/received/version.rb

@@ -1,3 +1,3 @@
 module Received
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/lmtp_spec.rb

@@ -2,14 +2,13 @@ require 'spec_helper'
 require 'logger'
 
 describe Received::LMTP do
-  before :each do
-    @mock = mock 'conn'
-    @mock.should_receive(:send_data).with("220 localhost LMTP server ready\r\n")
-    logger = Logger.new($stderr)
-    @mock.stub!(:logger).and_return(logger)
-    @mock.logger.debug "*** Starting test ***"
-    @proto = Received::LMTP.new(@mock)
-    @proto.start!
+  let(:conn) { mock(:conn, :logger => Logger.new(STDERR)) }
+  let(:proto) { Received::LMTP.new(conn) }
+
+  before do
+    conn.should_receive(:send_data).with("220 localhost LMTP server ready\r\n")
+    conn.logger.debug "*** Starting test ***"
+    proto.start!
   end
 
   describe "Full flow" do
@@ -18,28 +17,28 @@ describe Received::LMTP do
     def begin_flow!
       ["LHLO", "MAIL FROM:<spec1@example.com>", "RCPT TO:<spec2@example.com>",
         "RCPT TO:<spec3@example.com>", "DATA", "#{body}.", "QUIT"].each do |line|
-        @mock.logger.debug "client: #{line}"
-        @proto.on_data(line + "\r\n")
+        conn.logger.debug "client: #{line}"
+        proto.on_data(line + "\r\n")
       end
     end
 
     def common_expectations!
-      @mock.should_receive(:send_data).with("250-localhost\r\n")
-      @mock.should_receive(:send_data).with("250-8BITMIME\r\n250 PIPELINING\r\n")
-      @mock.should_receive(:send_data).with("250 OK\r\n").exactly(3).times
-      @mock.should_receive(:send_data).with("354 End data with <CR><LF>.<CR><LF>\r\n")
+      conn.should_receive(:send_data).with("250-localhost\r\n")
+      conn.should_receive(:send_data).with("250-8BITMIME\r\n250 PIPELINING\r\n")
+      conn.should_receive(:send_data).with("250 OK\r\n").exactly(3).times
+      conn.should_receive(:send_data).with("354 End data with <CR><LF>.<CR><LF>\r\n")
     end
 
     it "receives mail" do
       common_expectations!
-      @mock.should_receive(:send_data).with("250 OK\r\n").exactly(2).times
-      @mock.should_receive(:send_data).with("221 Bye\r\n")
-      @mock.should_receive(:mail_received).with({
+      conn.should_receive(:send_data).with("250 OK\r\n").exactly(2).times
+      conn.should_receive(:send_data).with("221 Bye\r\n")
+      conn.should_receive(:mail_received).with({
         :from => 'spec1@example.com',
         :rcpt => ['spec2@example.com', 'spec3@example.com'],
         :body => body
       }).and_return(true)
-      @mock.should_receive(:close_connection_after_writing)
+      conn.should_receive(:close_connection_after_writing)
 
       begin_flow!
     end
@@ -47,38 +46,53 @@ describe Received::LMTP do
 
     it "returns error when it cannot save email" do
       common_expectations!
-      @mock.should_receive(:mail_received).once.and_return(false)
-      @mock.should_receive(:send_data).with(/451/).exactly(2).times
-      @mock.should_receive(:send_data).with("221 Bye\r\n")
-      @mock.should_receive(:close_connection_after_writing)
+      conn.should_receive(:mail_received).once.and_return(false)
+      conn.should_receive(:send_data).with(/451/).exactly(2).times
+      conn.should_receive(:send_data).with("221 Bye\r\n")
+      conn.should_receive(:close_connection_after_writing)
 
       begin_flow!
     end
   end
 
   it "parses multiline" do
-    @mock.should_receive(:send_data).with("250-localhost\r\n")
-    @mock.should_receive(:send_data).with("250-8BITMIME\r\n250 PIPELINING\r\n")
-    @mock.should_receive(:send_data).with("250 OK\r\n")
-    @proto.on_data("LHLO\r\nMAIL FROM:<spec@example.com>\r\n")
+    conn.should_receive(:send_data).with("250-localhost\r\n")
+    conn.should_receive(:send_data).with("250-8BITMIME\r\n250 PIPELINING\r\n")
+    conn.should_receive(:send_data).with("250 OK\r\n")
+    proto.on_data("LHLO\r\nMAIL FROM:<spec@example.com>\r\n")
   end
 
   it "buffers commands up to CR/LF" do
-    @mock.should_receive(:send_data).with("250-localhost\r\n")
-    @mock.should_receive(:send_data).with("250-8BITMIME\r\n250 PIPELINING\r\n")
-    @mock.should_receive(:send_data).with("250 OK\r\n")
-    @proto.on_data("LHLO\r\nMAIL FROM")
-    @proto.on_data(":<spec@example.com>\r\n")
+    conn.should_receive(:send_data).with("250-localhost\r\n")
+    conn.should_receive(:send_data).with("250-8BITMIME\r\n250 PIPELINING\r\n")
+    conn.should_receive(:send_data).with("250 OK\r\n")
+    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|
+    conn.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)
+    conn.should_receive(:mail_received) do |r|
       r[:body].should == body
     end
-    @proto.on_data(".\r\n")
+    proto.on_data(".\r\n")
+  end
+
+  it "allows empty FROM" do
+    conn.stub(:send_data)
+    conn.stub(:close_connection_after_writing)
+    conn.should_receive(:mail_received) do |mail|
+      puts "RECEIVED     '#{mail.inspect}'"
+      mail[:from].should be_empty
+    end
+
+    ["LHLO", "MAIL FROM:<>", "RCPT TO:<spec2@example.com>",
+      "RCPT TO:<spec3@example.com>", "DATA", "testing\r\n.", "QUIT"].each do |line|
+      proto.on_data(line + "\r\n")
+    end
+
   end
 end

metadata

@@ -1,71 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: received
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Roman Shterenzon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: daemons
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mongo
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: Currently stores received mail in MongoDB
-email: 
+email:
 - romanbsd@yahoo.com
-executables: 
+executables:
 - received
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -83,34 +100,31 @@ files:
 - received.gemspec
 - spec/lmtp_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Receive mail from Postfix and store it somewhere
-test_files: 
+test_files:
 - spec/lmtp_spec.rb
 - spec/spec_helper.rb
 has_rdoc: