mailtime 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4164639a2246ede181bb3431c3e79d8762d65a26
-  data.tar.gz: 3fc802e69ac88adeeaeb4e47e00a3b090405ee92
+  metadata.gz: 002fb9cd610aa3981cf339df70530af08af43225
+  data.tar.gz: 63b2c8ba97369f4332dcf7304a44ec17176ab157
 SHA512:
-  metadata.gz: 4338930085c6a3f4ba5fab74fd05f2d74d06c8a8e0faa73eda55fc241de424282a4696b70c887e093941e66cb5814fd6f8d0730272ec87386ea886e48fea7a35
-  data.tar.gz: 23df378aabf1e7f46023aede7697df32534211ab022b400ef1fccad15a62909c82add99afe9f9147380c2d02bbcc4eeb47eb1028ea55b80479141e66d626f08d
+  metadata.gz: ec3cc6edb99157a6f6b0a91f510e65277b40b58b8a9c1d68136d1363f7f9fbd575ea6b41dcf524f41c214bc3bccd4e2daa2ed3185b2aa8e44daf79dfc754fa9e
+  data.tar.gz: d06eef854c7a18f7cf11195deab491d569f523f997b8fc5a69ce4fb602eb0db2280d04b9504e662d91f218ed908258b675772714f32d5c8013465223f2492d2f

data/lib/mailtime/action_mailer/base.rb

@@ -17,28 +17,43 @@ module Mailtime
 
       private
 
+      # inject some stuff.
+      # to avoid a mostly useless service object, add the mailtime_template and mailtime_layout
       def inject_metadata
         mailer_klass = self.class.to_s
         mailer_action = self.action_name
         action_variables  = self.instance_variables_map
 
         self.message.instance_variable_set(:@mailer_klass, mailer_klass)
-        self.message.instance_variable_set(:@mailer_action, mailer_action)
-        self.message.instance_variable_set(:@action_variables, action_variables)
-        self.message.instance_variable_set(:@template_path, self.headers[:template_path] || mailer_klass)
-        self.message.instance_variable_set(:@template_name, self.headers[:template_name] || mailer_action)
-        self.message.instance_variable_set(:@mailtime_template, nil)
-        self.message.instance_variable_set(:@mailtime_layout, nil)
-
         self.message.class.send(:attr_reader, :mailer_klass)
+
+        self.message.instance_variable_set(:@mailer_action, mailer_action)
         self.message.class.send(:attr_reader, :mailer_action)
+
+        self.message.instance_variable_set(:@action_variables, action_variables)
         self.message.class.send(:attr_reader, :action_variables)
+
+        self.message.instance_variable_set(:@template_path, self.headers[:template_path] || mailer_klass)
         self.message.class.send(:attr_reader, :template_path)
+
+        self.message.instance_variable_set(:@template_name, self.headers[:template_name] || mailer_action)
         self.message.class.send(:attr_reader, :template_name)
+
+        self.message.instance_variable_set(:@mailtime_template, find_mailtime_template)
         self.message.class.send(:attr_accessor, :mailtime_template)
+
+        self.message.instance_variable_set(:@mailtime_layout, find_mailtime_template.mailtime_mail_layout)
         self.message.class.send(:attr_accessor, :mailtime_layout)
       end
 
+      def find_mailtime_template
+        _template = Mailtime::MailTemplate.find_by(:klass => self.class.to_s, :action => self.action_name)
+        if _template.nil?
+          _template = Mailtime::NullTemplate.new(self)
+        end
+        _template
+      end
+
     end
   end
 end

data/lib/mailtime/active_record/models/concerns/mail_layout_concern.rb

@@ -9,7 +9,7 @@ module Mailtime
       self.table_name = 'mailtime_mail_layouts'
       has_many :mail_templates, :class_name => 'Mailtime::MailTemplate'
 
-      validates_inclusion_of :format, :in => -> { Mailtime.configuration.valid_formats }
+      validates_presence_of :format, :in => -> { Mailtime.configuration.valid_formats }
 
     end
 

data/lib/mailtime/active_record/models/concerns/mail_template_concern.rb

@@ -8,9 +8,9 @@ module Mailtime
     included do
       self.table_name = 'mailtime_mail_templates'
 
-      belongs_to :mail_layout, :class_name => 'Mailtime::MailLayout'
-      validates_inclusion_of :klass, :in => -> { mailers }
-      validates_inclusion_of :format, :in => -> { Mailtime.configuration.valid_formats }
+      belongs_to :mail_layout, :class_name => 'Mailtime::MailLayout', :foreign_key => :mailtime_mail_layout_id
+      validates_presence_of :klass, :in => -> { mailers }
+      validates_presence_of :format, :in => -> { Mailtime.configuration.valid_formats }
       validates_uniqueness_of :action, :scope => [:klass, :format]
 
       def self.mailers
@@ -22,9 +22,8 @@ module Mailtime
       end
     end
 
-    def mail_layout
-      return NullLayout.new unless self[:mail_layout].present?
-      self[:mail_layout]
+    def mailtime_mail_layout
+      self.mail_layout.present? ? self.mail_layout : NullLayout.new
     end
 
     def additional_headers

data/lib/mailtime/processor/mail_log_service.rb

@@ -42,7 +42,7 @@ module Mailtime
       @fields.each do |field|
         ::Mailtime::MailLog.create(
             :loggable => @loggable,
-            :mailtime_mail_template_id => @template.try(:id),
+            :mailtime_mail_template_id => @mail.mailtime_template.try(:id),
             :action => @mail.mailer_action,
             :klass => @mail.mailer_klass,
             :headers => extract_headers,

data/lib/mailtime/processor/processor.rb

@@ -19,8 +19,8 @@ module Mailtime
     protected
 
     def process_mail
-      log_mail
       render_mail
+      log_mail
       @mail
     end
 

data/lib/mailtime/renderers/mail_renderer.rb

@@ -4,8 +4,8 @@ module Mailtime
 
       def initialize(mail)
         @mail = mail
-        @template = find_template
-        @layout = find_layout
+        @template = @mail.mailtime_template
+        @layout = @mail.mailtime_layout
       end
 
       def render
@@ -29,7 +29,7 @@ module Mailtime
       end
 
       def find_layout
-        @template.mail_layout
+        @template.mailtime_mail_layout
       end
 
       def render_and_merge

data/lib/mailtime/renderers/null.rb

@@ -3,8 +3,9 @@
 module Mailtime
   class NullLayout
 
-    attr_reader :content
+    attr_reader :content, :id
     def initialize
+      @id = nil
       @content = "#{Mailtime.configuration.yield_keyword}"
     end
 
@@ -24,8 +25,9 @@ module Mailtime
 
   class NullTemplate
 
-    attr_reader :content
+    attr_reader :content, :id
     def initialize(mail)
+      @id = nil
       @content = mail.body.raw_source
     end
 

data/lib/mailtime/version.rb

@@ -1,3 +1,3 @@
 module Mailtime
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailtime
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Josh Brody