newsletterable 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f95bb82765df54a2e85c6c077c3af290d220e067
-  data.tar.gz: 9682498d5289288a4d249d0df647ccfb39b4a5f4
+  metadata.gz: e7e4f7dccee06dce24833a79461f263562e720cf
+  data.tar.gz: 620d432bc50177574b71872f2fd22948444847e0
 SHA512:
-  metadata.gz: 91a1c0a07d682237b565ac3631c3933168ab7eba31934acf55ce4adebc5d5c68cb67eea7aa7e1b5a1de9ce25e642b42121ae76bec327e5c3a69afa6280bbe1f2
-  data.tar.gz: 18704758d89087d9b40166d76274205955e1f93e66135ed91ec82fa50ff053491dec8a067690cb34a33c6b3547c5e2c27d9cb1e4a92fa0e9594df792570c14d7
+  metadata.gz: bcf01b8937c9c15cfab7cea31f19578db270b17d297e9c3fa24b99a22e9f02f5150d97f8ff8c4e95840373ef4a8f99ce662c504e9dc495e8ee9ecf8b8e9fa37f
+  data.tar.gz: 60cc9ac1afb3546b2b4b7465e0b82be72ecee3fa874aef3a57276f96aa38688dafc81132ed24fa7f035d0fc269542b106be1b884f55cb3edc96da5f97f9f152f

data/lib/newsletterable.rb

@@ -35,12 +35,30 @@ module Newsletterable
 	def defaults
 		{
 			worker: Newsletterable::Worker,
-			list_resolver: default_list_resolver
+			list_resolver: default_list_resolver,
+			old_email_getter: -> (subscriber) {
+				if subscriber.respond_to?(:old_email)
+					subscriber.old_email
+				elsif subscriber.respond_to?(:email_was)
+					subscriber.email_was
+				else
+					raise ConfigurationError, <<-TEXT, __FILE__, __LINE__ + 1
+						Unable to retreive old email for update. Perhaps consider
+						implementing 'old_email_getter' in your newsletterable initializer.
+
+						e.g.
+						config.old_email_getter = -> (user) do
+							# Get the updated email address from your model
+							user.email_before_update
+						end
+					TEXT
+				end
+			}
 		}
 	end
 
 	def default_list_resolver
-		proc do |subscriber, list_name, lists|
+		-> (subscriber, list_name, lists) do
 			result = case lists
 			when String, Array
 				lists

data/lib/newsletterable/configuration.rb

@@ -1,7 +1,7 @@
 module Newsletterable
 	class Configuration
 		attr_accessor :api_key, :default_lists, :subscriptions_model, :worker,
-			:list_resolver, :orm_adapter
+			:list_resolver, :orm_adapter, :old_email_getter
 
 		def initialize(attrs = {})
 			attrs.each do |k, v|

data/lib/newsletterable/subscriber.rb

@@ -39,7 +39,7 @@ module Newsletterable
 		end
 
 		def update_subscription(list_name)
-			old_email = email_was
+			old_email = Newsletterable.configuration.old_email_getter.call(self)
 
 			yield
 
@@ -73,7 +73,7 @@ module Newsletterable
 				self.__newsletterable_options[list_name] = options.merge(field: field)
 
 				after_save     -> { manage_subscription(list_name) }, if: :"#{field}_changed?"
-				around_update  -> { update_subscription(list_name) }, if: -> { send(:"#{field}?") && email_changed? }
+				around_update  -> (&block) { update_subscription(list_name, &block) }, if: -> { send(:"#{field}?") && email_changed? }
 				unless options[:unsubscribe_on_destroy]
 					before_destroy -> { remove_subscription(list_name) }, if: :"#{field}?"
 				end

data/lib/newsletterable/version.rb

@@ -1,3 +1,3 @@
 module Newsletterable
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newsletterable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stan Bondi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel