ahoy_email 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c93fae59edb3ef7d69664769d7706673c09955ca
-  data.tar.gz: d4fcf110e9b0d31f27df464426c5b98ecd8c68a5
+  metadata.gz: fe2130c231eb69814fa0ad0f3afd38560b7186e9
+  data.tar.gz: 83cd45ecac4cd1345c49c0e798c23cfcc4eb646d
 SHA512:
-  metadata.gz: 3c3be760d8cd4b4bbbb4d7f7c82124f0243b3234a0019a9bd041241cb0ca04c2880ed539e9f0868f248c2c1d6c45cc4cf06845e97c563b26b8d19ca6ebb91a28
-  data.tar.gz: e76a54879f082d10651fed3e82c3dcb969eb1fd7ca3bcca9b7ab46214e73152a244ce598ecd5b71165ace8b1867bc4baa65577537a1e998db2458c58df325025
+  metadata.gz: 310069adf7575599950544584a1452ea43557862cb0e692191d5ea4b9132b9681681fa8dd62d87a75d1072d5e6ba92ee0848ac7b8183d5100335d355b3fce102
+  data.tar.gz: 6304688a168126a1d6af7d6a92a17cc830488f2109ade62bf092022895c22f1314365cec25e53ccd556a9134f1bb1c534bac8fb998d7eb0d804a25fb4b1d9c1f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1
+
+- Added `only` and `except` options
+
 ## 0.2.0
 
 - Enable tracking when track is called by default

data/README.md

@@ -116,9 +116,20 @@ Use `track utm_params: false` to skip tagging, or skip specific links with:
 
 ## Customize
 
+### Tracking
+
+Skip tracking of attributes by removing them from your model.  You can safely remove:
+
+- to
+- mailer
+- subject
+- content
+
+### Configuration
+
 There are 3 places to set options. Here’s the order of precedence.
 
-### Action
+#### Action
 
 ``` ruby
 class UserMailer < ActionMailer::Base
@@ -130,7 +141,7 @@ class UserMailer < ActionMailer::Base
 end
 ```
 
-### Mailer
+#### Mailer
 
 ```ruby
 class UserMailer < ActionMailer::Base
@@ -138,7 +149,7 @@ class UserMailer < ActionMailer::Base
 end
 ```
 
-### Global
+#### Global
 
 ```ruby
 AhoyEmail.track open: false
@@ -182,6 +193,13 @@ Disable tracking for an email
 track message: false
 ```
 
+Or specific actions
+
+```ruby
+track only: [:welcome_email]
+track except: [:welcome_email]
+```
+
 Or by default
 
 ```ruby

data/lib/ahoy_email/mailer.rb

@@ -4,6 +4,7 @@ module AhoyEmail
     def self.included(base)
       base.extend ClassMethods
       base.class_eval do
+        attr_accessor :ahoy_options
         class_attribute :ahoy_options
         self.ahoy_options = {}
         alias_method_chain :mail, :ahoy
@@ -11,26 +12,18 @@ module AhoyEmail
     end
 
     module ClassMethods
-      def track(options)
+      def track(options = {})
         self.ahoy_options = ahoy_options.merge(message: true).merge(options)
       end
     end
 
-    def track(options)
-      @ahoy_options = (@ahoy_options || {}).merge(message: true).merge(options)
+    def track(options = {})
+      self.ahoy_options = (ahoy_options || {}).merge(message: true).merge(options)
     end
 
     def mail_with_ahoy(headers = {}, &block)
       message = mail_without_ahoy(headers, &block)
-
-      options = AhoyEmail.options.merge(self.class.ahoy_options).merge(@ahoy_options || {})
-      options.each do |k, v|
-        if v.respond_to?(:call)
-          options[k] = v.call(message, self)
-        end
-      end
-      AhoyEmail::Processor.new(message, options).process
-
+      AhoyEmail::Processor.new(message, self).process
       message
     end
 

data/lib/ahoy_email/processor.rb

@@ -1,14 +1,15 @@
 module AhoyEmail
   class Processor
-    attr_reader :message, :options, :ahoy_message
+    attr_reader :message, :mailer, :ahoy_message
 
-    def initialize(message, options = {})
+    def initialize(message, mailer = nil)
       @message = message
-      @options = options
+      @mailer = mailer
     end
 
     def process
-      if options[:message]
+      action_name = mailer.action_name.to_sym
+      if options[:message] and (!options[:only] or options[:only].include?(action_name)) and !options[:except].to_a.include?(action_name)
         @ahoy_message = AhoyEmail.message_model.new
         ahoy_message.token = generate_token
         ahoy_message.to = message.to.join(", ") if ahoy_message.respond_to?(:to=)
@@ -43,6 +44,21 @@ module AhoyEmail
 
     protected
 
+    def options
+      @options ||= begin
+        options = AhoyEmail.options.merge(mailer.class.ahoy_options)
+        if mailer.ahoy_options
+          options = options.except(:only, :except).merge(mailer.ahoy_options)
+        end
+        options.each do |k, v|
+          if v.respond_to?(:call)
+            options[k] = v.call(message, mailer)
+          end
+        end
+        options
+      end
+    end
+
     def generate_token
       SecureRandom.urlsafe_base64(32).gsub(/[\-_]/, "").first(32)
     end

data/lib/ahoy_email/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails