chimpmunk 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8884ac7a8faa723ee19fbdf68db6d79af9d3d85c
-  data.tar.gz: afd92fa0f0357bb0dd1ca7acd03339601c1fb7a2
+  metadata.gz: 004f6a5e1bdcf871337d5ef463b9ad8bd702f1e5
+  data.tar.gz: 539373de26ba8c9284daadeaff2e8070cc35c222
 SHA512:
-  metadata.gz: 104b3026b64cc6c8410d6decdea1d3ecb35932f80b3eb4f5f2985244fb652e723739f573619a5431c4753c03e4141aac5b6d6c63d22ed27414700c9891e41182
-  data.tar.gz: 545bd5a95acf1d83822865a2104764b8a978f77f13e4e973bb63f1def020bf05c1afcd1de4e1945b81b77b45cdca042d1afc3c628b9e096e66d1bc56a49563a8
+  metadata.gz: 058969bcf2fa0f4858d91674be89cdf3ce955e818662e3cbef740e0470ac47889e6873fd52b89c98040307fa742d3950cf178bf1ee4c4efffd0f3807c85c7606
+  data.tar.gz: 40566223ce13ecb645da2b93540750ce5213203f0833f5e963f4e9f853bba9eb99ad732bf80f120c8d7641b0cdac34d6f76307e4705c52be53a3455a9e9dcd29

data/db/migrate/1_chimpmunk_migration.rb

@@ -27,7 +27,7 @@ class ChimpmunkMigration < ActiveRecord::Migration
       t.integer :emails_sent
       t.integer :clicked
       t.integer :opened
-      t.string :status
+      t.string :status, default: 'draft'
       t.integer :hard_bounces
       t.integer :soft_bounces
       t.integer :unsubscribes

data/lib/chimpmunk/email_campaign.rb

@@ -204,7 +204,8 @@ module Chimpmunk
     # send a mailchimp campaign
     def send_campaign
       response = Chimpmunk.mailchimp.campaigns.send({cid: self.mailchimp_campaign_id})
-      response['errors'].nil?
+      self.skip_update_callbacks
+      response['errors'].nil? && send.update_attribute(:status, 'sent')
     end
 
     ##
@@ -212,16 +213,18 @@ module Chimpmunk
     def schedule_campaign
       response = Chimpmunk.mailchimp.campaigns.schedule({
         cid: self.mailchimp_campaign_id,
-        schedule_time: self.send_date.to_time.to_s.gsub(' UTC', '')
+        schedule_time: self.send_date.strftime("%Y-%m-%d %H:%M:%S")
       })
-      response['errors'].nil? && self.update_attribute(:scheduled, true)
+      self.skip_update_callbacks
+      response['errors'].nil? && self.update_attribute(:status, 'scheduled')
     end
 
     ##
     # un-schedule email campaign that has been scheduled
     def unschedule_campaign
       response = Chimpmunk.mailchimp.campaigns.unschedule({cid: self.mailchimp_campaign_id})
-      response['errors'].nil? && self.update_attribute(:scheduled, false)
+      self.skip_update_callbacks
+      response['errors'].nil? && self.update_attribute(:status, 'un-scheduled')
     end
 
     ##

data/lib/chimpmunk/email_subscriber.rb

@@ -24,7 +24,11 @@ module Chimpmunk
     def create_mailchimp_subscriber
       Chimpmunk.mailchimp.lists.subscribe({
         id: self.email_list.mailchimp_id,
-        email: { email: self.email }
+        email: { email: self.email },
+        merge_vars: {
+          fname: self.first_name,
+          lname: self.last_name
+        }
       })
     end
 

data/lib/chimpmunk/version.rb

@@ -1,3 +1,3 @@
 module Chimpmunk
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/rails_admin/chimpmunk_custom_actions.rb

@@ -113,7 +113,7 @@ module RailsAdmin
             # Would rather have this method be new instead of edit
             @new_object = @object.duplicate_campaign
             if @new_object.save
-              flash[:notice] = "Campaign was duplicated.  Please edit the content now."
+              flash[:alert] = "Campaign was duplicated.  Please edit the content now."
               redirect_to rails_admin.edit_path("email_campaign", @new_object)
             else
               flash[:error] = "Campaign could not be duplicated."
@@ -144,7 +144,7 @@ module RailsAdmin
         register_instance_option :controller do
           Proc.new do
             if @object.send_campaign
-              flash[:notice] = "Campaign was successfully sent."
+              flash[:alert] = "Campaign was successfully sent."
               redirect_to rails_admin.index_path("chimpmunk~email_campaign")
             else
               flash[:error] = "Campaign could not be sent."
@@ -175,7 +175,7 @@ module RailsAdmin
         register_instance_option :controller do
           Proc.new do
             if @object.schedule_campaign
-              flash[:notice] = "Campaign was successfully scheduled."
+              flash[:alert] = "Campaign was successfully scheduled."
               redirect_to rails_admin.index_path("chimpmunk~email_campaign")
             else
               flash[:error] = "Campaign could not be scheduled."
@@ -206,7 +206,7 @@ module RailsAdmin
         register_instance_option :controller do
           Proc.new do
             if @object.unschedule_campaign
-              flash[:notice] = "Campaign was successfully un-scheduled."
+              flash[:alert] = "Campaign was successfully un-scheduled."
               redirect_to rails_admin.index_path("chimpmunk~email_campaign")
             else
               flash[:error] = "Campaign could not be un-scheduled."

data/spec/chimpmunk/email_campaign_spec.rb

@@ -70,14 +70,6 @@ describe Chimpmunk::EmailCampaign do
         new_template = Chimpmunk::EmailTemplate.create(name: 'new template')
         @email_campaign.update(email_template_id: new_template.id)
       end
-
-      it "should not call 'update_content' on update if the template id didn't change" do
-        @email_campaign.save
-        @email_campaign.skip_update_callbacks = false
-
-        expect(@email_campaign).to_not receive(:update_content)
-        @email_campaign.update(subject: 'new subject')
-      end
     end
 
     describe 'destroy' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chimpmunk
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Nick Franken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord