delivery_uncle 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c82ca7fd6f9519d2be47f9a80ebc224ddaaee316
-  data.tar.gz: 567fa4e2d40269dd757215fe540ed4a7f624735c
+  metadata.gz: de5ee577c5e27a5af7c6a23a18bd0a4e40db2638
+  data.tar.gz: 7dee24ce6cd17303ee5ed398d0125671ff2c11a8
 SHA512:
-  metadata.gz: fdbc42aeff0635ddcc6400a82f6cfa8767cc7cd251d4a30bd5f1f6327c1620cac42af7053c9327acb1bef8fff5c9335acc7c880decef4e236548ff8e70134350
-  data.tar.gz: 0a477d7668f1714688f562f61845de9287216a65314ef4956eb4d95333a2a7cd5fbe946cdffb30a0581801c32cce02eb6b0cd814e2f86596180aff09625153e7
+  metadata.gz: ebec7c672e690d0a8d30e7aa37186bbe710875e12247bd105d0491eb4229abad452f6145f77cdf24c6f320f4552043297b1842ee31f82c47f9f51d07ef39cc38
+  data.tar.gz: e31cf2883a0ea33e94dd5de9548870a4eb924333370bb870944502e4a65a3b588e7843e7a20aafe1755729eec8e357e44411ece8febcf4aa6484e2cdda74c578

data/app/models/delivery_uncle/email_request.rb

@@ -5,7 +5,7 @@ module DeliveryUncle
     scope :with_mailer_method, ->(mailer, mailer_method) { where(mailer: mailer, mailer_method: mailer_method) }      
     
     def mail
-      ::Mail.new(mail_body)
+      @mail ||= ::Mail.new(mail_body)
     end
     
     def paused?
@@ -16,6 +16,10 @@ module DeliveryUncle
       status == :sent || status == 'sent'
     end
     
+    def save_status!(status)
+      update_attribute(:status,status)
+    end
+    
     def self.mailers
       group(:mailer).order('mailer ASC').map(&:mailer)
     end

data/app/services/delivery_uncle/email_queue.rb

@@ -4,53 +4,51 @@ module DeliveryUncle
       def queue(request)
         return if not_allowed?(request)
         
-        save_status(request, :enqueue)
         QueueRequest.new(request)
-        save_status(request, :queued)
       end
 
       def pause(request)
         return if not_allowed?(request)
         
-        save_status(request, :paused)
+        request.save_status!(:paused)
       end
 
       def retry(request)
         return if not_allowed?(request)
         
-        save_status(request, :retrying)
         RetryRequest.new(request)
-        save_status(request, :queued)
       end
  
       def not_allowed?(request)
         return true if request.blank? || request.sent?
 
         if Activity.blocked_mailers.include?(request.mailer)
-          save_status(request, :blocked)
+          request.save_status!(:blocked)
           return true
         end
 
         return false
       end
-     
-      private
-      def save_status(request, status)
-        request.status = status
-        request.save
-      end
     end
     extend ClassMethods 
      
     protected
     class QueueRequest
       def initialize(request)
-        Resque.enqueue(DeliveryUncle::SendEmailRequest, request.id)
+        request.save_status!(:enqueue)
+        begin
+          Resque.enqueue(DeliveryUncle::SendEmailRequest, request.id)
+        rescue => e
+          Rails.logger.error e.message
+          Rails.logger.error e.backtrace.join("\n")
+          request.save_status!(:error_on_enqueue)
+        end
       end
     end
     
     class RetryRequest
       def initialize(request)
+        request.save_status!(:retrying)
         QueueRequest.new(request)
       end
     end  

data/app/workers/delivery_uncle/send_email_request.rb

@@ -6,24 +6,18 @@ module DeliveryUncle
       request = DeliveryUncle::EmailRequest.find(request_id)
       
       return if request.paused? || EmailQueue.not_allowed?(request)
-      change_status(request, :processing)
-      
-      @queue = "delivery_uncle:#{request.mail_type}" if request.mail_type
+      request.save_status!(:processing)
       
       begin 
         mail = request.mail
         method = ActionMailer::Base.delivery_method
         mail.delivery_method method, ActionMailer::Base.send(:"#{method}_settings")
         mail.deliver
-        change_status(request, :sent)
-      rescue
-        change_status(request, :error_when_deliver)
+        request.save_status!(:sent)
+      rescue => e
+        request.save_status!(:error_when_deliver)
+        raise e
       end
     end
-
-    def self.change_status(request, status)
-      request.status = status
-      request.save
-    end
   end
 end

data/lib/delivery_uncle/version.rb

@@ -1,3 +1,3 @@
 module DeliveryUncle
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end