devise_campaignable 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a7a24f8cd973480789f970ba22350b78757432
-  data.tar.gz: ed115510d3be3239206b6aa0bb541fd31e6374c1
+  metadata.gz: b891f9af5294938099bb81b548b4bf083d0d4391
+  data.tar.gz: 1dc8cc8327eb474c83095f6911af9964e87f4eba
 SHA512:
-  metadata.gz: 3da5b3a6e930f9723e2a62ab4dbc45e67b8f4f16fd5460b6365a87d90d890f6785a8fbc3b9ff14973cf06bf113fdea38463a10b4776caa54d9e403710480f9f8
-  data.tar.gz: 70d51c5ba5f574011aebce55bfda71235e4e5cc42e7698f608c0d44d22a0f953eb04493c87376e96743b1e80bb264d699b22691bcaf4b077f32e006ab4503281
+  metadata.gz: e6c6a17ad66f69d46b826f18c7a88c8574134b6dbe682ddcab48d65861724551d6607ab97685bb0ae134b94ac52387c77f6fc741dbe3ecedea64deb2d05b87e3
+  data.tar.gz: 31f37646466a573a64079dfa9e6a1aa91f308f48bb3ca6a16e9c3feece096fd9e18a86d96ce1e8a0b5655116b9d08003f1abff231b3da27491f38359bcf9002f

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.1.5
+  - 2.2.0
+  - rbx-2
+script: bundle exec rspec .

data/README.md

@@ -1,6 +1,6 @@
 # DeviseCampaignable
 
-[![Gem Version](https://badge.fury.io/rb/devise_campaignable.svg)](http://badge.fury.io/rb/devise_campaignable)
+[![Build Status](https://travis-ci.org/sorry-app/devise_campaignable.svg?branch=master)](https://travis-ci.org/sorry-app/devise_campaignable) [![Gem Version](https://badge.fury.io/rb/devise_campaignable.svg)](http://badge.fury.io/rb/devise_campaignable)
 
 Have your users automatically added to and removed from your favourite mail campaign tool. Currently supports [MailChimp](http://mailchimp.com/).
 

data/devise_campaignable.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-
+  spec.add_development_dependency "activemodel"
+  
   spec.add_runtime_dependency "devise", ">= 3.2.0"
   spec.add_runtime_dependency "gibbon", "~> 2.0"
 end

data/lib/devise_campaignable/adapters/mailchimp.rb

@@ -29,6 +29,9 @@ module Devise
             def unsubscribe(email)
 	            # Logic for mailchimp unsubscription.
 	            api.lists(@campaignable_list_id).members(subscriber_hash(email)).update(body: { status: "unsubscribed" })
+            rescue Gibbon::MailChimpError => e
+              raise unless e.status_code == 404
+              Rails.logger.warn "unsubscribe: User #{self.email} not found!"
             end
 
             # Subscribe all users as a batch.

data/lib/devise_campaignable/model.rb

@@ -20,11 +20,11 @@ module Devise
         # Add the callbacks to the user model.
         included do
             # Callback to subscribe the user whenever the record is created
-            after_create :subscribe
+            after_create :subscribe, if: :campaignable_user?
             # Callback to see if the subscription for this users needs updating.
-            after_update :update_subscription
+            after_update :update_subscription, if: :campaignable_user?
             # Callback to unsubscribe the user when they are destroyed.
-            after_destroy :unsubscribe
+            after_destroy :unsubscribe, if: :campaignable_user?
         end
 
         # Method to subscibe the user to the configrued mailing list.
@@ -45,6 +45,11 @@ module Devise
             # Ask the list manager to unsubscribe this devise models email.
             self.class.list_manager.unsubscribe(self.email)
         end
+        
+        # Returns true if it's a valid email for subscribing
+        def self.valid_campaign_email?(email)
+            email.present? && /\@example\.(com|net|org|edu)$/ !~ email
+        end
 
         private
 
@@ -62,6 +67,10 @@ module Devise
                 # Compact to the hash to remove any empty data.
                 additional_fields.compact
             end
+            
+            def campaignable_user?
+                Campaignable.valid_campaign_email? self.email
+            end
 
         module ClassMethods
 
@@ -83,7 +92,7 @@ module Devise
             # Subscribe all users as a batch.
             def subscribe_all
                 # Get an array of all the email addresses accociated with this devise class.
-                emails = all.map(&:email)
+                emails = all.map(&:email).select {|e| Devise::Models::Campaignable.valid_campaign_email? e}
 
                 # Ask the list managed to subscibe all of these emails.
                 list_manager.batch_subscribe(emails)
@@ -92,12 +101,12 @@ module Devise
             # Unsubscribe all users as a batch.
             def unsubscribe_all
                 # Get an array of all the email addresses accociated with this devise class.
-                emails = all.map(&:email)
+                emails = all.map(&:email).select {|e| Devise::Models::Campaignable.valid_campaign_email? e}
 
                 # Ask the list managed to subscibe all of these emails.
                 list_manager.batch_unsubscribe(emails)                
             end
-
+            
             # Set the configuration variables for the modeule.
             Devise::Models.config(self, :campaignable_api_key, :campaignable_list_id, :campaignable_vendor, :campaignable_additional_fields)
         end

data/lib/devise_campaignable/version.rb

@@ -1,3 +1,3 @@
 module DeviseCampaignable
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_campaignable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert Rawlins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +105,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md