brightbytes-sendgrid 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDA1YWNiMmIxY2JhOTU0NmQxYzcyM2QyZGQ1Y2EyOTU1YmM0MWU3ZA==
+    YmQzOGZiYmI2YWUyMmMzNzA0NzljZTg2YzJjYzBkZTA3NGMxZTBmYg==
   data.tar.gz: !binary |-
-    ZGQzNzAzZjA4ZWFlN2ZjMDUwZWU0YmZiOTAyOTUzOTkyOWY2OWRjNA==
+    ZDAxMDI0MjQ1Y2YxYzE5MDQ4YmFjNTJmYzY4MTY0MTEwMzlmYTdkMg==
 SHA512:
   metadata.gz: !binary |-
-    NWNmMjlkNzJjMDc4YTI2ZDVkYzI4MDAwYTg5ZTI0ZjZhYjVlYTM3NDQyNGMx
-    YzdhMjA1MDU2MzlhOGM3ZDk4NWExNThjOWM0ZTk3ZTEwZDYxZWU3NDAzYWM0
-    ZjIyNTM2NzFlZTM0ODIyZGIxZWMyZDQxZjUyNmFkYzc5Mjk2ZDY=
+    OTU3ZDY0OWU0NzY2NDRkYTE5YjU5NTVmY2ZlNTNlN2IyYmIzNmNmMDk2M2Uy
+    NDQ2ZmJiNTMyMDcxZmZjZGNlYTFkNGNkZmJhZGU5Mzg4Mjk3ODcwOGE3ZTVl
+    MTg0MTA5ZDQxMTMyYmZkZDI1ZTQyYWEzODMxOGE1MWUyZjIxZTE=
   data.tar.gz: !binary |-
-    ZDFiM2RlMWU3YmY0ZGNlYzAyZTUxMGZhYzQ0NzkyZTc5Mzg2ZTVmOWNiM2Ji
-    OTFkNzQ4MzZiNzBhMWY0NDgyMWJiZWRjYzI5NzMwZWZiZDRiY2Y5MmY3YTkw
-    ZTYxMDY1N2QxOTE2NjQyODVhMWYyZDFmNjVkNTE4MTUzMDI4YWE=
+    NzdlOTc4MDFhN2U5M2M0YWZmMGQ4YWJjNDUzOWEwYTUyODI2YjAyZDc5MjFj
+    YzdiODIyNmI4ZTJjMmQwMDBhNGNkNDE0OGY1MTllYTg3YWE3NGMzNDU4NzQ0
+    YTdlYjM0MmFjZDg0ZjJjY2U1OTk3OTY1MzVlZjhkMWEyNjQwYzc=

data/README.md

@@ -94,11 +94,10 @@ So, to make this feature work, you have to:
         
 3. Put {{unsubscribe_html}} or {{unsubscribe_text}} or {{unsubcribe_url}} placeholder somewhere in your email body. You can adjust how html and text version are built:
 
-        config.unsubcribe_html_message "Click here to"
-        config.unsubcribe_link_text "unsubcribe"
-        # will produce "Click here to <a href="url">unsubscribe</a>"
-        config.unsubcribe_text_message "Go there to unsubscribe:"
-        # will produce "Go there to unsubscribe: url"
+        config.html_link "Click <a href="%s">here to unsubscribe</a>"
+        # will produce "Click <a href="URL">here to unsubscribe</a>"
+        config.text_link "Go there to unsubscribe: %s"
+        # will produce "Go there to unsubscribe: URL"
 
 ##Contributors
 

data/lib/brightbytes/sendgrid/config.rb

@@ -5,7 +5,7 @@ module Brightbytes
     class Config
       include Singleton
       
-      attr_accessor :dummy_recipient
+      attr_accessor :dummy_recipient, :subst_pattern
 
       # Sendgrid default settings storage
       
@@ -17,13 +17,14 @@ module Brightbytes
 
       # Unsubscribe default settings storage
 
-      class UnsubscribeConfig < Struct.new(:categories, :url, :html_message, :link_text, :text_message); end
+      class UnsubscribeConfig < Struct.new(:categories, :url, :html_link, :text_link); end
       
       def unsubscribe
         @unsubscribe ||= UnsubscribeConfig.new(
-          [], nil, 
-          "If you would like to unsubscribe and stop receiving these emails", "click here",
-          "If you would like to unsubscribe and stop receiving these emails click here:"
+          [],
+          nil, 
+          'If you would like to unsubscribe and stop receiving these emails <a href="%s" rel="nofollow">click here</a>.',
+          'If you would like to unsubscribe and stop receiving these emails click here: %s'
         )
       end
 
@@ -31,7 +32,7 @@ module Brightbytes
         unsubscribe.categories = categories.flatten.map(&:to_sym)
       end
 
-      [:url, :html_message, :link_text, :text_message].each do |meth|
+      [:url, :html_link, :text_link].each do |meth|
         class_eval <<-DEF
           def unsubscribe_#{meth}(value)
             unsubscribe.#{meth} = value

data/lib/brightbytes/sendgrid/smtp_api_header.rb

@@ -3,6 +3,7 @@ require 'json'
 module Brightbytes
   module Sendgrid
     class SmtpApiHeader
+      include SubstPattern
       
       DELEGATE_METHODS = [
         :substitute,
@@ -43,9 +44,7 @@ module Brightbytes
         :utm_term,
         :utm_content
       ]
-      
-      SUBST_PATTERN = '{{\1}}'
-      
+            
       attr_reader :data
             
       def initialize(default_data = nil)
@@ -122,15 +121,11 @@ module Brightbytes
       end
       
       private
-                
-      def key_to_tag(key)
-        key.is_a?(Symbol) ? key.to_s.sub(/(.*)/, SUBST_PATTERN) : key.to_s
-      end
-      
+                      
       def init_array_key(key)
         @data[key] = [] unless @data[key].instance_of?(Array)
       end
-        
+      
     end
   end
 end

data/lib/brightbytes/sendgrid/subst_pattern.rb

@@ -0,0 +1,20 @@
+module Brightbytes
+  module Sendgrid
+    module SubstPattern
+      extend ActiveSupport::Concern
+      
+      DEFAULT_PATTERN = '{{\1}}'
+      
+      private
+      
+      def key_to_tag(key)
+        key.is_a?(Symbol) ? key.to_s.sub(/(.*)/, subst_pattern) : key.to_s
+      end
+                  
+      def subst_pattern
+        Brightbytes::Sendgrid.config.subst_pattern || DEFAULT_PATTERN
+      end
+      
+    end
+  end
+end

data/lib/brightbytes/sendgrid/unsubscribe.rb

@@ -4,6 +4,7 @@
 module Brightbytes
   module Sendgrid
     class Unsubscribe
+      include SubstPattern
       
       class << self
       
@@ -23,11 +24,11 @@ module Brightbytes
       def add_links
         return unless feature_active?
         if categories.present?
-          sendgrid.section :unsubscribe_html_section, "#{unsubscribe.html_message} <a href=\"{{unsubscribe_url}}\" rel=\"nofollow\">#{unsubscribe.link_text}</a>"
-          sendgrid.section :unsubscribe_text_section, "#{unsubscribe.text_message} {{unsubscribe_url}}"
+          sendgrid.section :unsubscribe_html_section, unsubscribe.html_link % key_to_tag(:unsubscribe_url)
+          sendgrid.section :unsubscribe_text_section, unsubscribe.text_link % key_to_tag(:unsubscribe_url)
           emails.each do |email|
-            sendgrid.add_substitute :unsubscribe_html, "{{unsubscribe_html_section}}"
-            sendgrid.add_substitute :unsubscribe_text, "{{unsubscribe_text_section}}"
+            sendgrid.add_substitute :unsubscribe_html, key_to_tag(:unsubscribe_html_section)
+            sendgrid.add_substitute :unsubscribe_text, key_to_tag(:unsubscribe_text_section)
             sendgrid.add_substitute :unsubscribe_url,  unsubscribe_url(email)
           end
         else
@@ -42,7 +43,7 @@ module Brightbytes
       def unsubscribe
         Brightbytes::Sendgrid.config.unsubscribe
       end
-      
+            
       def feature_active?
         unsubscribe.categories.present? || unsubscribe.url.present?
       end

data/lib/brightbytes/sendgrid/version.rb

@@ -1,5 +1,5 @@
 module Brightbytes
   module Sendgrid
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/brightbytes/sendgrid.rb

@@ -1,5 +1,6 @@
 require 'active_support'
 require 'active_support/core_ext'
+require 'brightbytes/sendgrid/subst_pattern'
 require 'brightbytes/sendgrid/smtp_api_header'
 require 'brightbytes/sendgrid/config'
 require 'brightbytes/sendgrid/unsubscribe'

data/spec/brightbytes/sendgrid_mailer_spec.rb

@@ -62,7 +62,7 @@ describe SendgridMailer do
     before(:each) { sendgrid_config_setup }
   
     it 'unsubscribe html section should be set' do
-      header.should include('"{{unsubscribe_html_section}}": "If you would like to unsubscribe and stop receiving these emails <a href=\"{{unsubscribe_url}}\" rel=\"nofollow\">click here</a>"')
+      header.should include('"{{unsubscribe_html_section}}": "If you would like to unsubscribe and stop receiving these emails <a href=\"{{unsubscribe_url}}\" rel=\"nofollow\">click here</a>."')
     end
 
     it 'unsubscribe text section should be set' do

data/spec/brightbytes/standard_mailer_spec.rb

@@ -36,7 +36,7 @@ describe StandardMailer do
     before(:each) { sendgrid_config_setup }
 
     it 'unsubscribe html section should be set' do
-      header.should include('"{{unsubscribe_html_section}}": "If you would like to unsubscribe and stop receiving these emails <a href=\"{{unsubscribe_url}}\" rel=\"nofollow\">click here</a>"')
+      header.should include('"{{unsubscribe_html_section}}": "If you would like to unsubscribe and stop receiving these emails <a href=\"{{unsubscribe_url}}\" rel=\"nofollow\">click here</a>."')
     end
 
     it 'unsubscribe text section should be set' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbytes-sendgrid
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Brightbytes Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/brightbytes/sendgrid.rb
 - lib/brightbytes/sendgrid/config.rb
 - lib/brightbytes/sendgrid/smtp_api_header.rb
+- lib/brightbytes/sendgrid/subst_pattern.rb
 - lib/brightbytes/sendgrid/unsubscribe.rb
 - lib/brightbytes/sendgrid/version.rb
 - spec/brightbytes/sendgrid/smtp_api_header_spec.rb