carterdte_smtp_filter 0.0.3.1 → 0.0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54379beeed5e97c980ef5d630f73e4daa2715910
-  data.tar.gz: 022f9d1dc8f2f48373570921f12dc64731449716
+  metadata.gz: 27253f9b1af9bd45d2f49cb4f7d01ae9826c2c57
+  data.tar.gz: 7a27bfc531615cb815b48bfc71456d3ab7b334f4
 SHA512:
-  metadata.gz: 623f3caa51e8699498edb247227d273a6f298fb14266745d4df85f630c432c7b93daf806f15538921ba0c5a06d8ccbd799a04faa4cd9f5b3b0c81111d20ccb33
-  data.tar.gz: 26f73da02580c836eb72f6b88fcea0bfaa24722a97888022b64ac4765b7cfcdefe5d0be3b414f8592a0681e51a984f168b43192f02d6f2ca78869597f252dd48
+  metadata.gz: 9172d84c5fef7923b38cd9a65da5b980b996fe95219c53c816c40787bc3fab240e3db7c59f8b82ba7ad154d2f7e547aee5c71c7fc9d6e168611b6af387695ee9
+  data.tar.gz: 616d66d591bef54e5e97373cdc98dd2bfea3351fa28da0d2d959f463e16eb126fd0eea943c5b613e85328da0cd07d64d5f60bad9fd47ece2e21d3d643421918f

data/bin/carterdte_smtp_filter

@@ -30,7 +30,7 @@ if options[:config]
   CarterdteSmtpFilter::Config.parse(options[:config])
 
   logger = CarterdteSmtpFilter.logger
-  logger.info("#{Time.now}: Starting CarterDte SMTP Filter")
+  logger.info("#{Time.now}: Starting CarterDte SMTP Filter v: #{CarterdteSmtpFilter::VERSION}")
 
   # Create a new server instance
   server = CarterdteSmtpFilter::SmtpServer.new()

data/lib/carterdte_smtp_filter/message.rb

@@ -2,30 +2,27 @@ module CarterdteSmtpFilter
   
   class Message
     
+    TMP_MESSAGE_DIR = "/tmp/carterdte_smtp_filter"
+    
     attr_accessor :raw_data, :qid, :email, :response, :dte
     
     def initialize(raw_data)
       set_mail_defaults
       @raw_data = raw_data
       @email = Mail.read_from_string raw_data
-      @dte = extract_dte
       @logger = CarterdteSmtpFilter.logger
+      @dte = extract_dte
       @qid = nil
     end
     
     def extract_dte
       return false unless @email.attachments.any?
-      file = @email.attachments.select {|m| m.sub_type == "xml"}.first
+      xml_attachments = @email.attachments.select {|m| m.sub_type == "xml"}
+      file = xml_attachments.any? ? xml_attachments.first : false
       return false unless file
       CarterdteSmtpFilter::Dte.new file.body.decoded
     end
     
-    def process
-      return_email
-      return unless has_dte?
-      extract_qid_from_response
-    end
-    
     def has_dte?
       @dte ? true : false
     end
@@ -34,6 +31,7 @@ module CarterdteSmtpFilter
       JSON.generate({
         to: @email.to,
         from: @email.from,
+        message_id: @email.message_id,
         cc: @email.cc,
         date: @email.date.to_s,
         qid: qid,
@@ -55,9 +53,15 @@ module CarterdteSmtpFilter
       @qid = response.string.split(/\s+/).last
     end
     
+    def save_tmp
+      Dir.mkdir TMP_MESSAGE_DIR unless File.directory? TMP_MESSAGE_DIR
+      File.open("#{TMP_MESSAGE_DIR}/#{@email.message_id}.eml", 'w') { |file| file.write(@raw_data) }
+    end
+    
     def return_email
       @logger.info("Returning email <#{email.message_id}> to #{CarterdteSmtpFilter::Config::return_host}:#{CarterdteSmtpFilter::Config::return_port}")
       @response = email.deliver!
+      extract_qid_from_response
     end
     
   end

data/lib/carterdte_smtp_filter/smtp_server.rb

@@ -14,8 +14,14 @@ module CarterdteSmtpFilter
       message = CarterdteSmtpFilter::Message.new(ctx[:message][:data])
       # return the email back, and extract queue_id unless we are not 
       # working with Postfix
-      message.process unless CarterdteSmtpFilter::Config::stand_alone
+      message.return_email unless CarterdteSmtpFilter::Config::stand_alone
+      
+      # We send it to CarterDte App
       CarterdteSmtpFilter::ApiClient.push message.to_json if message.has_dte?
+      
+      # Save a copy when testing
+      # /tmp/carterdte_smtp_filter/<message-id>
+      message.save_tmp if CarterdteSmtpFilter::Config::testing
     end
     
     # get event before Connection

data/lib/carterdte_smtp_filter/version.rb

@@ -1,3 +1,3 @@
 module CarterdteSmtpFilter
-  VERSION = "0.0.3.1"
+  VERSION = "0.0.3.2"
 end

data/test/test_message.rb

@@ -28,7 +28,7 @@ class TestMessage < Minitest::Test
   def test_message_should_save_server_queueid_response_if_any
     raw_mail = File.open("./test/fixtures/mail_with_dte.eml", "rb").read
     message = CarterdteSmtpFilter::Message.new raw_mail
-    message.process
+    message.return_email
     assert_equal(message.response.string.split(/\s+/).last, message.qid)  
   end
   
@@ -63,5 +63,11 @@ class TestMessage < Minitest::Test
     assert_equal(CarterdteSmtpFilter::Dte, message.dte.class)
   end
   
+  def test_save_tmp_should_make_tmp_dir_if_it_no_exist
+    message = CarterdteSmtpFilter::Message.new File.open("./test/fixtures/mail_with_dte.eml", "rb").read
+    message.save_tmp
+    assert(File.file?("/tmp/carterdte_smtp_filter/#{message.email.message_id}.eml"), "Failure message.")
+  end
+  
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carterdte_smtp_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: 0.0.3.2
 platform: ruby
 authors:
 - Patricio Bruna