smailer 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45ce6bb0557460b8103244d490a474e83fe56055
-  data.tar.gz: e40b57d41795c0594c368aefc3b6e1ba75e04175
+  metadata.gz: 5a802147c81ef44bbccab4c0dd6319aadb8ba8ad
+  data.tar.gz: 51d003004e3bf9296ec29d656b9119dfaf62c044
 SHA512:
-  metadata.gz: 035cf4b2a412ba828ea8d16321a8a2ea5f82125375c61f1de53fd2b01addafd23db7d5b769daca44407a2a998a5396180df9790872a0cd75157bf6a6f24de428
-  data.tar.gz: d8fa22c31c189a8452a16468e1377d3480ea56c79724a78ace3ca313753c1128aa18d96820767bd888236288d25e70bbdac291c23a695eb59c61c80aa600fdfb
+  metadata.gz: 5518b27f7990285c16ec5571da8263b9600eddea60f4c386dca742a1c62aa0833fdb58898220141016e8604b6034e1588f4e6105c86fc7fa658982c6604b16a3
+  data.tar.gz: 45c66ce79bdee5eb44d626990d99c1d1679916248a295205dbe38788d5b21c1d7b61188e8c931c8963cc2569ddb0bc680e40e61e48c54a92a5b9d6223e019ed0

data/lib/smailer/models/mail_campaign.rb

@@ -10,24 +10,24 @@ module Smailer
       belongs_to :mailing_list
       has_many :queued_mails, :dependent => :destroy
       has_many :finished_mails, :dependent => :destroy
-      has_many :attachments,
-               :class_name => '::Smailer::Models::MailCampaignAttachment'
 
       validates_presence_of :mailing_list_id, :from
       validates_numericality_of :mailing_list_id, :unsubscribe_methods, :only_integer => true, :allow_nil => true
       validates_length_of :from, :subject, :maximum => 255, :allow_nil => true
 
-      unless Smailer::Compatibility.rails_4?
-        attr_accessible :mailing_list_id, :from, :subject, :body_html, :body_text
-      end
+      attr_accessible :mailing_list_id, :from, :subject, :body_html, :body_text
 
-      def add_unsubscribe_method(method)
-        self.unsubscribe_methods = (self.unsubscribe_methods || 0) | method
+      def add_unsubscribe_method(method_specification)
+        unsubscribe_methods_list_from(method_specification).each do |method|
+          self.unsubscribe_methods = (self.unsubscribe_methods || 0) | method
+        end
       end
 
-      def remove_unsubscribe_method(method)
-        if has_unsubscribe_method?(method)
-          self.unsubscribe_methods = (self.unsubscribe_methods || 0) ^ method
+      def remove_unsubscribe_method(method_specification)
+        unsubscribe_methods_list_from(method_specification).each do |method|
+          if has_unsubscribe_method?(method)
+            self.unsubscribe_methods = (self.unsubscribe_methods || 0) ^ method
+          end
         end
       end
 
@@ -50,10 +50,6 @@ module Smailer
         opened_mails_count.to_f / sent_mails_count
       end
 
-      def add_attachment(filename, path)
-        self.attachments.create!(:filename => filename, :path => path)
-      end
-
       def self.unsubscribe_methods
         methods = {}
         UnsubscribeMethods.constants.map do |method_name|
@@ -62,6 +58,16 @@ module Smailer
 
         methods
       end
+
+      private
+
+      def unsubscribe_methods_list_from(method_specification)
+        if method_specification == :all
+          self.class.unsubscribe_methods.keys
+        else
+          [method_specification]
+        end
+      end
     end
   end
 end

data/lib/smailer/version.rb

@@ -1,7 +1,7 @@
 module Smailer
   MAJOR = 0
   MINOR = 7
-  PATCH = 1
+  PATCH = 2
 
   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.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Dimitar Dimitrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler