the_merger 0.1.1 → 0.1.2

data/README.org

@@ -75,7 +75,8 @@ Currently it's just one method and this is how you pass it information
 - [X] Create a helper method to have a dropdown of fields
 - [X] Turn this into an engine so that I can include asset pipeline javascript.
 - [X] Get the Email all button to work
-- [ ] Write tests
+- [X] Write tests
+- [ ] Allow filtering or passing a subset of users to send email to.
 - [ ] Schedule repetitive mail outs
 - [ ] Make compatible with tinymce
 

data/lib/the_merger/version.rb

@@ -1,3 +1,3 @@
 module TheMerger
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/the_merger.rb

@@ -10,16 +10,34 @@ module TheMerger
   #
   # Merge the fields into the body and send emails
   #
-  def mail_merge(options={})
-    # For all users
-    model.all.each do |user|
-      
-      # Merge fields for this user into the body
-      body = merge_fields(options[:body].dup, user)
-      
-      # Send the emails
-      TheMerger::Mailer.batch_mail(options[:from], options[:subject], body, user).deliver
+  # Options;
+  #  from
+  #  subject
+  #  body
+  #  group  (optional subset of users)
+  #  single (optional single user)
+  #
+  def mail_merge(opts={})
+
+    # Go through and get the collection to merge & send.
+    if opts[:group]               # Subset
+      results = opts[:group]
+    elsif opts[:single]           # Single
+      results = [opts[:single]]
+    else                          # ALL entries in model
+      results = model.all
     end
+    
+    # Go through all results, merge & send.
+    results.each {|user| merge_and_send(opts[:from], opts[:subject], opts[:body].dup, user)}
+  end
+
+  def merge_and_send(from,subject,body,user)
+    # Merge fields for this user into the body
+    body = merge_fields(body, user)
+    
+    # Send the emails
+    TheMerger::Mailer.batch_mail(from, subject, body, user).deliver
   end
   
   #

data/spec/lib/the_merger_spec.rb

@@ -8,7 +8,48 @@ end
 describe TheMerger do
 
   before do
-    @user = User.create(firstname: "Michael", lastname: "Pope", email: "map7777@gmail.com", age: 99)
+    @user = User.create(firstname: "Michael",
+                        lastname: "Pope",
+                        email: "map7777@gmail.com",
+                        age: 99)
+  end
+
+  describe "#mail_merge" do
+    before do
+      @second_user = User.create(firstname: "John",
+                                 lastname: "Smith",
+                                 email: "john.smith@gmail.com",
+                                 age: 30)  
+      @mailer = double()
+      @mailer.stub(:deliver)
+    end
+
+    context "on model" do
+      it "calls batch twice" do
+        TheMerger::Mailer.should_receive(:batch_mail).twice.and_return(@mailer)
+        mail_merge(from: 'user@example.com', subject: 'test merge', body: 'Hello [firstname]')
+      end
+    end
+
+    context "subset of the model" do
+      it "calls batch once" do
+        TheMerger::Mailer.should_receive(:batch_mail).once.and_return(@mailer)
+        mail_merge(from: 'user@example.com',
+                   subject: 'test merge',
+                   body: 'Hello [firstname]',
+                   group: [@user])
+      end
+    end
+
+    context "email one user" do
+      it "calls batch once" do
+        TheMerger::Mailer.should_receive(:batch_mail).once.and_return(@mailer)
+        mail_merge(from: 'user@example.com',
+                   subject: 'test merge',
+                   body: 'Hello [firstname]',
+                   single: @user)
+      end
+    end
   end
 
   describe "#merge_fields" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_merger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies: []
 description: Mail merge a table of fields into a standard letter
 email:
@@ -53,7 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1055697086999734969
+      hash: -155754027735557007
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1055697086999734969
+      hash: -155754027735557007
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23