email_prefixer 1.1.0 → 1.2.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b61b05c800103a57cec9350aaa65927affc4d587
-  data.tar.gz: ce1f60d57950924b048d6f17d3919dcf5f461b95
+  metadata.gz: 0b59bd2b47776df5e37c07e9d81f38a2557ddb04
+  data.tar.gz: 8ea68d728900174530551ea886787eba0bfb5d87
 SHA512:
-  metadata.gz: 4145cf9ded7b88ade8a6467f7616c88116c74af43055aa9ff732008def8aa1339a8dd74d59da279526c906f8b7fbd84d0a02ec0b9ae89023c3a705a4ae708234
-  data.tar.gz: c6a2266d03a164ecbac1f405c553a6043efbd2f62fae69da4430162a7931a4b5b29f0ca02aa8809224516c3aeb740a3aeeaa741ff4bf3ee8767a4274861aa32f
+  metadata.gz: 86f4e57fc693f860c8d402a6011a38b24b0af52635a79ef2f1275b7a87f1652cce5754fd9d1408cf80df690eb792974b71ecbfce079b4e1e0f9151198b76a52a
+  data.tar.gz: 7699c6eb41d15f9f2b554af6e632f85762363899dfd397c71b7f0d61f7e62b22e7b66f2b391d82a70cafe3ba65636f05dc80267b86f802d442b5280a24365ffa

data/README.md

@@ -63,6 +63,20 @@ EmailPrefixer.configure do |config|
 end
 ```
 
+#### builder - Override the prefix format
+Want to override the default format for the email prefix? Assign a custom
+`proc` to the `builder` setting like so:
+
+Example:
+```ruby
+# config/initializers/email_prefixer.rb
+EmailPrefixer.configure do |config|
+  config.builder = lambda do
+    '**MyEmailPrefix** '
+  end
+end
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/wireframe/email_prefixer/fork )

data/email_prefixer.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rails', '>= 4.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'pry'

data/lib/email_prefixer.rb

@@ -1,12 +1,13 @@
 require 'email_prefixer/version'
 require 'email_prefixer/configuration'
 require 'email_prefixer/interceptor'
-require 'email_prefixer/railtie'
+require 'email_prefixer/railtie' if defined?(Rails)
 
 module EmailPrefixer
   class << self
     def configure
       yield configuration
+      configuration
     end
 
     def configuration

data/lib/email_prefixer/configuration.rb

@@ -1,5 +1,12 @@
 module EmailPrefixer
   class Configuration
-    attr_accessor :application_name, :stage_name
+    DEFAULT_BUILDER = lambda do
+      stage_name = EmailPrefixer.configuration.stage_name
+      prefixes = []
+      prefixes << EmailPrefixer.configuration.application_name
+      prefixes << stage_name.upcase unless stage_name == 'production'
+      "[#{prefixes.join(' ')}] "
+    end
+    attr_accessor :application_name, :stage_name, :builder
   end
 end

data/lib/email_prefixer/interceptor.rb

@@ -1,24 +1,15 @@
 module EmailPrefixer
   class Interceptor
-    extend Forwardable
-    def_delegators :@configuration, :application_name, :stage_name
+    attr_reader :configuration
 
-    def initialize
-      @configuration = EmailPrefixer.configuration
+    def initialize(configuration)
+      @configuration = configuration
     end
 
     def delivering_email(mail)
-      mail.subject.prepend(subject_prefix)
+      prefix = configuration.builder.call
+      mail.subject.prepend(prefix)
     end
     alias_method :previewing_email, :delivering_email
-
-    private
-
-    def subject_prefix
-      prefixes = []
-      prefixes << application_name
-      prefixes << stage_name.upcase unless stage_name == 'production'
-      "[#{prefixes.join(' ')}] "
-    end
   end
 end

data/lib/email_prefixer/railtie.rb

@@ -1,13 +1,14 @@
 module EmailPrefixer
   class Railtie < ::Rails::Railtie
-    initializer 'email_prefixer.configure_default_application_name' do |app|
-      interceptor = EmailPrefixer::Interceptor.new
-      ActionMailer::Base.register_preview_interceptor(interceptor)
-      ActionMailer::Base.register_interceptor(interceptor)
-      EmailPrefixer.configure do |config|
+    initializer 'email_prefixer.configure_defaults' do |app|
+      config = EmailPrefixer.configure do |config|
         config.application_name ||= app.class.parent_name
         config.stage_name ||= Rails.env
+        config.builder ||= EmailPrefixer::Configuration::DEFAULT_BUILDER
       end
+      interceptor = EmailPrefixer::Interceptor.new(config)
+      ActionMailer::Base.register_preview_interceptor(interceptor)
+      ActionMailer::Base.register_interceptor(interceptor)
     end
   end
 end

data/lib/email_prefixer/version.rb

@@ -1,3 +1,3 @@
 module EmailPrefixer
-  VERSION = '1.1.0'
+  VERSION = '1.2.0.pre.1'
 end

data/spec/lib/email_prefixer/configuration_spec.rb

@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+RSpec.describe EmailPrefixer::Configuration do
+  before do
+    EmailPrefixer.configuration.application_name = 'MyApp'
+  end
+
+  describe EmailPrefixer::Configuration::DEFAULT_BUILDER do
+    describe '#call' do
+      subject { EmailPrefixer::Configuration::DEFAULT_BUILDER.call }
+      context 'when stage_name == production' do
+        before do
+          EmailPrefixer.configuration.stage_name = 'production'
+        end
+        it { is_expected.to eq '[MyApp] ' }
+      end
+      context 'when stage_name != production' do
+        before do
+          EmailPrefixer.configuration.stage_name = 'staging'
+        end
+        it { is_expected.to eq '[MyApp STAGING] ' }
+      end
+    end
+  end
+end

data/spec/lib/email_prefixer/interceptor_spec.rb

@@ -3,41 +3,15 @@ require 'rails_helper'
 RSpec.describe EmailPrefixer::Interceptor do
   describe '#delivering_email' do
     subject(:email) { ExampleMailer.simple_mail }
-    context 'when application_name is configured' do
+    context 'when application_name and stage_name is configured' do
       before do
-        email.deliver_now
-      end
-      it 'adds prefix to delivered mail subject' do
-        expect(email.subject).to eq '[CustomApp TEST] Here is the Subject'
-      end
-    end
-
-    context 'when stage_name is configured' do
-      before do
-        @original_stage_name = EmailPrefixer.configuration.stage_name
+        EmailPrefixer.configuration.application_name = 'CustomApp'
         EmailPrefixer.configuration.stage_name = 'staging'
         email.deliver_now
       end
-      after do
-        EmailPrefixer.configuration.stage_name = @original_stage_name
-      end
-      it 'adds custom stage name to subject' do
+      it 'adds prefix to mail subject' do
         expect(email.subject).to eq '[CustomApp STAGING] Here is the Subject'
       end
     end
-
-    context 'when stage_name == production' do
-      before do
-        @original_stage_name = EmailPrefixer.configuration.stage_name
-        EmailPrefixer.configuration.stage_name = 'production'
-        email.deliver_now
-      end
-      after do
-        EmailPrefixer.configuration.stage_name = @original_stage_name
-      end
-      it 'does not add the stage_name to the subject' do
-        expect(email.subject).to eq '[CustomApp] Here is the Subject'
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_prefixer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.pre.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,30 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,6 @@ files:
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/email_prefixer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -172,6 +171,7 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/lib/email_prefixer/configuration_spec.rb
 - spec/lib/email_prefixer/interceptor_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
@@ -190,12 +190,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Automatically add email prefix to outgoing emails
@@ -229,7 +229,6 @@ test_files:
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/email_prefixer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -245,6 +244,7 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/lib/email_prefixer/configuration_spec.rb
 - spec/lib/email_prefixer/interceptor_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb

data/spec/dummy/config/initializers/email_prefixer.rb

@@ -1,4 +0,0 @@
-# override the default application name
-EmailPrefixer.configure do |config|
-  config.application_name = 'CustomApp'
-end