robincurry-dl-fughley 0.1.1 → 0.1.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 1
+:patch: 2

data/lib/dl_fughley.rb

@@ -44,9 +44,9 @@ module DL
         options = {
           :allow => [],
           :email_field => :email,
-          :reply_to => :sender
+          :reply_to => :sender 
           }.merge!(people.extract_options!)
-          
+
           people.flatten!
 
           if (options[:allow].nil? || options[:allow].empty?) || 
@@ -58,7 +58,7 @@ module DL
               email.reply_to = email.from if options[:reply_to] == :sender
               email.reply_to = to if options[:reply_to] == :list
               email.from = options[:from] if options[:from]
-              
+
               case options[:subject_prefix]
               when :list_name
                 email.subject = "[#{list.downcase}] #{email.subject}" unless email.subject =~ /\[#{list}\]/i
@@ -67,15 +67,18 @@ module DL
               else
                 email.subject = "[#{options[:subject_prefix]}] #{email.subject}" unless email.subject =~ /\[#{options[:subject_prefix]}\]/i
               end
-              
 
-              ActionMailer::Base.deliver(email)
+              # yield to block if given, otherwise, go ahead and send the email using ActionMailer.
+              if block_given?
+                yield person, email
+              else 
+                ActionMailer::Base.deliver(email)
+              end
             end
           end
         end
       end
-    end
-    
+    end 
   end
 
   ActiveRecord::Base.send(:include, DL::Fughley)

data/test/dl_fughley_test.rb

@@ -446,6 +446,48 @@ class DlFughleyTest < ActiveSupport::TestCase
     end
   end
   
+  context "distribute" do
+    setup do
+      Factory(:person)
+      Person.is_dl(:all)
+
+      # Reset deliveries during setup. Otherwise they will accumulate after each test.
+      ActionMailer::Base.deliveries = []
+
+      @email = to_email(
+      :from => 'user@example.com', 
+      :to => 'all@example.com', 
+      :subject => 're: [all-my-peeps] test to the whole group', 
+      :body => 'Hello everybody!')
+    end
+
+    context "default" do
+      setup do
+        Person.distribute(@email)
+      end
+
+      should "send email via ActionMailer to each member of dl" do
+        assert_deliveries Person.count
+      end
+    end
+
+    context "with block" do
+      setup do
+        @count = 0
+        Person.distribute(@email) {|person, email| @count = @count+1 }
+      end
+      
+      should "yield each person and email to the block" do
+        assert @count == Person.count
+      end
+    
+      should "not send via ActionMailer (unless called by block)" do
+        assert_deliveries 0
+      end
+    end
+  end
+  
+
   
   private
     def to_email(values)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: robincurry-dl-fughley
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - robincurry
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 -07:00
+date: 2009-04-24 00:00:00 -07:00
 default_executable: 
 dependencies: []