smailer 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c72c27e350a0cd53f23e5b4e961f4addceea0fff
-  data.tar.gz: 6c4fe79f61f4e3ec824d1b6f33d6b9177a9e7ba0
+  metadata.gz: 45ce6bb0557460b8103244d490a474e83fe56055
+  data.tar.gz: e40b57d41795c0594c368aefc3b6e1ba75e04175
 SHA512:
-  metadata.gz: 78a7371b1ec129605f13b0998ad7dc8a41ee462ab077213becdbd88d6bf43e03eda6dd5fdf6ca571e8891a7fc1c5685c0b6393f781b41ef859aee875784dd286
-  data.tar.gz: 9a9fcd6397f2735e5fd8eb8c5fdb5a7056831c994c69b9b52ec2d06f8162c0a2fe55b777a9c923ba921e98e6e2fb3b5770c6c606e24239f24655f53dba18e137
+  metadata.gz: 035cf4b2a412ba828ea8d16321a8a2ea5f82125375c61f1de53fd2b01addafd23db7d5b769daca44407a2a998a5396180df9790872a0cd75157bf6a6f24de428
+  data.tar.gz: d8fa22c31c189a8452a16468e1377d3480ea56c79724a78ace3ca313753c1128aa18d96820767bd888236288d25e70bbdac291c23a695eb59c61c80aa600fdfb

data/lib/smailer/compatibility.rb

@@ -1,19 +1,29 @@
 module Smailer
   module Compatibility
-    def self.rails_3?
+    extend self
+
+    def rails_3?
       Rails::VERSION::MAJOR == 3
     end
 
-    def self.rails_4?
+    def rails_4?
       Rails::VERSION::MAJOR == 4
     end
 
-    def self.rails_3_or_4?
-      self.rails_3? || self.rails_4?
+    def rails_3_or_4?
+      rails_3? || rails_4?
     end
 
-    def self.save_without_validation(object)
+    def save_without_validation(object)
       rails_3_or_4? ? object.save(:validate => false) : object.save(false)
     end
+
+    def update_all(scope, fields, conditions)
+      if rails_3_or_4?
+        scope.where(conditions).update_all(fields)
+      else
+        scope.update_all(fields, conditions)
+      end
+    end
   end
 end

data/lib/smailer/models/finished_mail.rb

@@ -29,7 +29,7 @@ module Smailer
         Compatibility.save_without_validation self if changed?
       end
 
-      def self.add(queued_mail, status = Statuses::SENT)
+      def self.add(queued_mail, status = Statuses::SENT, update_sent_mails_count = true)
         finished = self.new
 
         fields_to_copy = [:mail_campaign_id, :key, :from, :to, :subject, :retries, :last_retry_at, :last_error]
@@ -45,7 +45,7 @@ module Smailer
         finished.save!
         queued_mail.destroy
 
-        if finished.mail_campaign
+        if update_sent_mails_count && finished.mail_campaign
           finished.mail_campaign.sent_mails_count += 1
           Compatibility.save_without_validation finished.mail_campaign
         end

data/lib/smailer/tasks/send.rb

@@ -30,11 +30,7 @@ module Smailer
 
         # clean up any old locked items
         expired_locks_condition = ['locked = ? AND locked_at <= ?', true, 1.hour.ago.utc]
-        if Smailer::Compatibility.rails_3_or_4?
-          Smailer::Models::QueuedMail.where(expired_locks_condition).update_all(:locked => false)
-        else
-          Smailer::Models::QueuedMail.update_all({:locked => false}, expired_locks_condition)
-        end
+        Smailer::Compatibility.update_all(Smailer::Models::QueuedMail, {:locked => false}, expired_locks_condition)
 
         # load the queue items to process
         queue_sort_order = 'retries ASC, id ASC'
@@ -47,15 +43,12 @@ module Smailer
         # lock the queue items
         lock_condition = {:id => items_to_process.map(&:id)}
         lock_update = {:locked => true, :locked_at => Time.now.utc}
-        if Smailer::Compatibility.rails_3_or_4?
-          Smailer::Models::QueuedMail.where(lock_condition).update_all(lock_update)
-        else
-          Smailer::Models::QueuedMail.update_all(lock_update, lock_condition)
-        end
+        Smailer::Compatibility.update_all(Smailer::Models::QueuedMail, lock_update, lock_condition)
 
         # map of attachment ID to contents - so we don't keep opening files
         # or URLs
         cached_attachments = {}
+        finished_mails_counts = Hash.new(0)
 
         items_to_process.each do |queue_item|
           # try to send the email
@@ -107,16 +100,22 @@ module Smailer
 
             if retries_exceeded || too_old
               # the message has expired; move to finished_mails
-              Smailer::Models::FinishedMail.add(queue_item, Smailer::Models::FinishedMail::Statuses::FAILED)
+              Smailer::Models::FinishedMail.add(queue_item, Smailer::Models::FinishedMail::Statuses::FAILED, false)
+              finished_mails_counts[queue_item.mail_campaign.id] += 1
             end
             results.push [queue_item, :failed]
           else
             # great job, message sent
-            Smailer::Models::FinishedMail.add(queue_item, Smailer::Models::FinishedMail::Statuses::SENT)
+            Smailer::Models::FinishedMail.add(queue_item, Smailer::Models::FinishedMail::Statuses::SENT, false)
+            finished_mails_counts[queue_item.mail_campaign.id] += 1
             results.push [queue_item, :sent]
           end
         end
 
+        finished_mails_counts.each do |mail_campaign_id, finished_mails_for_campaign|
+          Smailer::Models::MailCampaign.update_counters mail_campaign_id, :sent_mails_count => finished_mails_for_campaign
+        end
+
         results
       end
     end

data/lib/smailer/version.rb

@@ -1,7 +1,7 @@
 module Smailer
   MAJOR = 0
   MINOR = 7
-  PATCH = 0
+  PATCH = 1
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smailer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Dimitar Dimitrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: smailer
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple newsletter mailer for Rails.