lib/mailkick/model.rb in mailkick-0.0.2 vs lib/mailkick/model.rb in mailkick-0.0.3

@@ -1,35 +1,53 @@
 module Mailkick
   module Model
 
     def mailkick_user(options = {})
       class_eval do
-        scope :subscribed, proc{ joins(sanitize_sql_array(["LEFT JOIN mailkick_opt_outs ON #{table_name}.email = mailkick_opt_outs.email OR (#{table_name}.id = mailkick_opt_outs.user_id AND mailkick_opt_outs.user_type = ?)", name])).where("active != ?", true).uniq }
+        scope :opted_out, proc {|options = {}|
+          binds = [self.class.name, true]
+          if options[:list]
+            query = "(list IS NULL OR list = ?)"
+            binds << options[:list]
+          else
+            query = "list IS NULL"
+          end
+          where("#{options[:not] ? "NOT " : ""}EXISTS(SELECT * FROM mailkick_opt_outs WHERE (#{table_name}.email = mailkick_opt_outs.email OR (#{table_name}.id = mailkick_opt_outs.user_id AND mailkick_opt_outs.user_type = ?)) AND active = ? AND #{query})", *binds)
+        }
+        scope :not_opted_out, proc {|options = {}|
+          opted_out(options.merge(not: true))
+        }
 
-        def opt_outs
-          Mailkick::OptOut.where("email = ? OR (user_id = ? AND user_type = ?)", email, id, self.class.name)
+        def opt_outs(options = {})
+          relation = Mailkick::OptOut.where("email = ? OR (user_id = ? AND user_type = ?)", email, id, self.class.name)
+          if options[:list]
+            relation.where("list IS NULL OR list = ?", options[:list])
+          else
+            relation.where(list: nil)
+          end
         end
 
-        def subscribed?
-          opt_outs.where(active: true).empty?
+        def opted_out?(options = {})
+          opt_outs(options).where(active: true).any?
         end
 
-        def subscribe
-          opt_outs.where(active: true).each do |opt_out|
-            opt_out.active = false
-            opt_out.save!
-          end
-          true
-        end
-
-        def unsubscribe
-          if subscribed?
+        def opt_out(options = {})
+          if !opted_out?(options)
             OptOut.create! do |o|
               o.email = email
               o.user = self
               o.reason = "unsubscribe"
+              o.list = options[:list]
               o.save!
             end
+          end
+          true
+        end
+
+        def opt_in(options = {})
+          opt_outs(options).where(active: true).each do |opt_out|
+            opt_out.active = false
+            opt_out.save!
           end
           true
         end
 
       end