maily 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e254d6048356a08a30e2175e4bc1809c9cccc7
-  data.tar.gz: 799e7de87f596fe17ed4981f8025ee1156639e4f
+  metadata.gz: 06aac472a02c56536bdeddfaef8de5c3b273f645
+  data.tar.gz: 7beb443286274be5d2a5dccc1c987d9ea4ccf08c
 SHA512:
-  metadata.gz: 1c870ea516edd08cfb71cb46519784009e0945b905ff6e85fdb559468042bffae144bf7c8227e9555cb4415164481f6b3c3d76f22124a7bc61905db3ad91236f
-  data.tar.gz: 17dd9afc7e7b4024bb1789771c07a0946e32d8a70b150560b1ec365c31b4cb46661bcb3a87d11ce10e595bbfd814e9dfd5f4f8de01d12c97d2a34d04bd2d7560
+  metadata.gz: 4e3b8549a478516f18455592986e6d7ddf850035db3f6a7afb1c5f5dc44974ed47a79c3abb0686749d5026747b33c45adfea1fc61619392e4973fcd81b9d42da
+  data.tar.gz: d4129159e44325534a217e7083f212c8951c7e965d6ed44aefb7d8235fe5d46c10b49506d8a2197ff8138556d55b70845dd828789cffbb72876b95a628545d00

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.8.0]
+
+- Inherited emails support (#28)
+- `Maily.available_locales` defaults to Rails
+available_locales `config.i18n.available_locales` (#27)
+
 ## [0.7.2]
 
 - Definitive fix for newer apps using `webpacker` and without `sass-rails` (#22)
@@ -85,6 +91,7 @@ All notable changes to this project will be documented in this file.
 
 - First real usable release :tada:
 
+[0.8.0]: https://github.com/markets/maily/compare/v0.7.2...v0.8.0
 [0.7.2]: https://github.com/markets/maily/compare/v0.7.1...v0.7.2
 [0.7.1]: https://github.com/markets/maily/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/markets/maily/compare/v0.6.3...v0.7.0

data/README.md

@@ -66,7 +66,7 @@ Maily.setup do |config|
   # Allow deliveries
   # config.allow_delivery = Rails.env.production? ? false : true
 
-  # I18n.available_locales by default
+  # Your application available_locales (or I18n.available_locales) by default
   # config.available_locales = [:en, :es, :pt, :fr]
 
   # Run maily under different controller ('ActionController::Base' by default)

data/app/assets/stylesheets/maily/application.scss

@@ -48,12 +48,12 @@ header.header, footer.footer {
   position: fixed;
   left: 0;
   z-index: 99;
-  padding: .5em 1em;
   width: 100%;
   background-color: rgba(255,255,255, .95);
 }
 
 header.header {
+  padding: 1em;
   top: 0;
   box-shadow: 0 .0625em .3125em rgba(0,0,0, .15);
 
@@ -63,13 +63,14 @@ header.header {
     margin-left: 10px;
 
     img, span {
-      vertical-align: middle;
+      vertical-align: text-bottom;
     }
   }
 }
 
 /* Footer */
 footer.footer {
+  padding: 0 1em;
   bottom: 0;
   box-shadow: 0 -.0625em .3125em rgba(0,0,0, .15);
   font-family: "Helvetica Neue", Helvetica, sans-serif;
@@ -181,6 +182,7 @@ footer.footer {
       border: none;
       border-top: solid 1px $grey;
       border-radius: 2px;
+      min-height: 100px;
     }
   }
 

data/app/views/maily/shared/_header.html.erb

@@ -1,6 +1,6 @@
 <header class="header">
   <a href="<%= root_path %>" class="logo_link">
-    <%= image_tag 'maily/logo.png', align: 'center', width: 45 %>
+    <%= image_tag 'maily/logo.png', align: 'center', width: 40 %>
     <span>Maily</span>
   </a>
 </header>

data/lib/generators/templates/initializer.rb

@@ -8,7 +8,7 @@ Maily.setup do |config|
   # Allow deliveries
   # config.allow_delivery = Rails.env.production? ? false : true
 
-  # I18n.available_locales by default
+  # Your application available_locales (or I18n.available_locales) by default
   # config.available_locales = [:en, :es, :pt, :fr]
 
   # Run maily under different controller ('ActionController::Base' by default)

data/lib/maily.rb

@@ -13,7 +13,7 @@ module Maily
       self.enabled            = Rails.env.production? ? false : true
       self.allow_edition      = Rails.env.production? ? false : true
       self.allow_delivery     = Rails.env.production? ? false : true
-      self.available_locales  = I18n.available_locales
+      self.available_locales  = Rails.application.config.i18n.available_locales || I18n.available_locales
       self.base_controller    = 'ActionController::Base'
       self.http_authorization = nil
       self.hooks_path         = "lib/maily_hooks.rb"

data/lib/maily/generator.rb

@@ -7,14 +7,20 @@ module Maily
       hooks    = []
 
       Maily::Mailer.list.each do |mailer|
-        hooks << "\nMaily.hooks_for('#{mailer.name.classify}') do |mailer|"
+        _hooks = []
+
         mailer.emails_list.each do |email|
           if email.require_hook?
             fixtures << email.required_arguments
-            hooks << "  mailer.register_hook(:#{email.name}, #{email.required_arguments.join(', ')})"
+            _hooks << "  mailer.register_hook(:#{email.name}, #{email.required_arguments.join(', ')})"
           end
         end
-        hooks << "end"
+
+        if _hooks.present?
+          hooks << "\nMaily.hooks_for('#{mailer.name.classify}') do |mailer|"
+          hooks << _hooks
+          hooks << "end"
+        end
       end
 
       fixtures = fixtures.flatten.uniq.map { |f| "#{f.to_s} = ''" }.join("\n")

data/lib/maily/mailer.rb

@@ -40,7 +40,7 @@ module Maily
     end
 
     def register_hook(email_name, *args)
-      email = find_email(email_name)
+      email = find_email(email_name) || add_email(email_name)
       email && email.register_hook(args)
     end
 
@@ -55,9 +55,14 @@ module Maily
     def parse_emails
       _emails = klass.send(:public_instance_methods, false)
 
-      _emails.map(&:to_s).each do |email|
-        self.emails[email] = Maily::Email.new(email, self)
+      _emails.each do |email|
+        add_email(email)
       end
     end
+
+    def add_email(email_name)
+      email = Maily::Email.new(email_name.to_s, self)
+      self.emails[email.name] = email
+    end
   end
 end

data/lib/maily/version.rb

@@ -1,3 +1,3 @@
 module Maily
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/spec/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,7 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'foo@foo.com', to: 'bar@bar.com'
+
+  def generic_welcome
+    mail
+  end
+end

data/spec/dummy/app/mailers/notifier.rb

@@ -1,6 +1,4 @@
-class Notifier < ActionMailer::Base
-  default from: 'foo@foo.com', to: 'bar@bar.com'
-
+class Notifier < ApplicationMailer
   def welcome
     mail
   end

data/spec/dummy/app/views/notifier/generic_welcome.html.erb

@@ -0,0 +1 @@
+<h1>Generic Welcome</h1>

data/spec/dummy/config/application.rb

@@ -22,6 +22,7 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+    config.i18n.available_locales = [:en, :es, :pt, :fr]
   end
 end
 

data/spec/dummy/lib/maily_hooks.rb

@@ -4,6 +4,7 @@ Maily.hooks_for('Notifier') do |mailer|
   mailer.register_hook(:invitation, email)
   mailer.register_hook(:recommendation, template_path: 'notifications', description: 'description')
   mailer.register_hook(:custom_template_name, template_name: 'invitation')
+  mailer.register_hook(:generic_welcome)
 
   mailer.hide_email(:hidden)
 end

data/spec/mailer_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe Maily::Mailer do
+  let(:mailer) { Maily::Mailer.find('notifier') }
+
   it "should load mailers" do
-    expect(Maily::Mailer.all.keys).to eq(['notifier'])
+    expect(Maily::Mailer.all.keys).to eq(['application_mailer', 'notifier'])
   end
 
   it "should build emails" do
-    mailer = Maily::Mailer.find('notifier')
-
-    expect(mailer.emails.size).to eq(6)
+    expect(mailer.emails.size).to eq(7)
   end
 
   it "should find mailers by name" do
@@ -16,14 +16,14 @@ describe Maily::Mailer do
   end
 
   it "should find emails by name" do
-    mailer = Maily::Mailer.find('notifier')
-
     expect(mailer.find_email('welcome').name).to eq('welcome')
   end
 
-  it "allows to hide email" do
-    mailer = Maily::Mailer.find('notifier')
+  it "allow to add inherited emails via a hook" do
+    expect(mailer.find_email('generic_welcome').name).to eq('generic_welcome')
+  end
 
+  it "allows to hide email" do
     expect(mailer.find_email('hidden')).to be nil
   end
 
@@ -35,8 +35,6 @@ describe Maily::Mailer do
   end
 
   it "#emails_list returns an array with all emails" do
-    mailer = Maily::Mailer.find('notifier')
-
     expect(mailer.emails_list).to be_an_instance_of(Array)
     expect(mailer.emails_list.sample).to be_an_instance_of(Maily::Email)
   end

data/spec/maily_spec.rb

@@ -7,7 +7,7 @@ describe Maily do
     expect(Maily.enabled).to be true
     expect(Maily.allow_edition).to be true
     expect(Maily.allow_delivery).to be true
-    expect(Maily.available_locales).to eq(I18n.available_locales)
+    expect(Maily.available_locales).to eq([:en, :es, :pt, :fr])
     expect(Maily.base_controller).to eq('ActionController::Base')
     expect(Maily.http_authorization).to be nil
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maily
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - markets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,11 +139,13 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/notifications/recommendation.html.erb
+- spec/dummy/app/views/notifier/generic_welcome.html.erb
 - spec/dummy/app/views/notifier/invitation.html.erb
 - spec/dummy/app/views/notifier/multipart.html.erb
 - spec/dummy/app/views/notifier/multipart.text.erb
@@ -214,11 +216,13 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/notifications/recommendation.html.erb
+- spec/dummy/app/views/notifier/generic_welcome.html.erb
 - spec/dummy/app/views/notifier/invitation.html.erb
 - spec/dummy/app/views/notifier/multipart.html.erb
 - spec/dummy/app/views/notifier/multipart.text.erb