mailtime 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002fb9cd610aa3981cf339df70530af08af43225
-  data.tar.gz: 63b2c8ba97369f4332dcf7304a44ec17176ab157
+  metadata.gz: a026e26ef8e6cf4a4bfea11a0fd01c016783e258
+  data.tar.gz: 4d12f9c970dad51e543342106807fd97f4ef9cbc
 SHA512:
-  metadata.gz: ec3cc6edb99157a6f6b0a91f510e65277b40b58b8a9c1d68136d1363f7f9fbd575ea6b41dcf524f41c214bc3bccd4e2daa2ed3185b2aa8e44daf79dfc754fa9e
-  data.tar.gz: d06eef854c7a18f7cf11195deab491d569f523f997b8fc5a69ce4fb602eb0db2280d04b9504e662d91f218ed908258b675772714f32d5c8013465223f2492d2f
+  metadata.gz: fbe09d0c3771f07f0a2dece8954c65aaf669fb74ddf711353f00de79e30f7d53db1d1100db521484e13ddab6cc9e078008d4905ebf519484ae79870b5e0c8d6a
+  data.tar.gz: c842cad376e1e0972b918d64511b36c38f5bca17f4e9726a236e1f26ad141f13a2203873b64469a566771f34ba3103b2764a55fa566936ebced827229a4ccc26

data/.gitignore

@@ -8,3 +8,5 @@
 /spec/reports/
 /tmp/
 .DS_Store
+/test/tmp/
+/tmp/

data/README.md

@@ -43,7 +43,7 @@ Need to customize? Sure.
 
 ```Ruby
 class User < ActiveRecord::Base
-  acts_as_mailtime_loggable :email_address, :fields => [:to, :cc, :bcc]
+  acts_as_mailtime_loggable :email_address, :fields => [:to, :cc, :bcc] 
 ```
 
 will tell `Mailtime::MailLog` to find an instance variable of class `User` where attribute `email_address` matches an `ActionMailer#mail`'s `#to`, `#cc`, or `#bcc` attribute.
@@ -109,12 +109,15 @@ Has a `name`, `content`, `format`, and `extension`. `format` should be one of `M
 
 ## Todo
 
-* Tests
+* Tests. Like, way better tests.
+* Attachments
+* Support MySQL (uses jsonb as datatypes for storing things right now)
 
 ## Maybe todo
 
 * Dump for production?
 * Versioning for templates?
+* A hell of a lot better rake import task.
 
 ## Contributing
 

data/Rakefile

@@ -5,7 +5,9 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
+load 'lib/tasks/mailtime.rake'
+
 task :default => :test

data/lib/mailtime/action_mailer/base.rb

@@ -39,19 +39,12 @@ module Mailtime
         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)
+        self.message.instance_variable_set(:@mailtime_templates, find_mailtime_templates)
+        self.message.class.send(:attr_accessor, :mailtime_templates)
       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
+      def find_mailtime_templates
+        Mailtime::MailTemplateCollection.new(self)
       end
 
     end

data/lib/mailtime/active_record/models/mail_template.rb

@@ -8,4 +8,28 @@ module Mailtime
     include Mailtime::RendererConcern
 
   end
+
+  class MailTemplateCollection
+
+    attr_reader :templates
+    def initialize(mail)
+      @mail = mail
+      @templates = Mailtime::MailTemplate.includes(:mail_layout).
+          where(:klass => mail.class.to_s, :action => mail.action_name)
+    end
+
+    def html
+      _template = @templates.where(:format => 'html').first
+      return _template if _template
+      Mailtime.configuration.fallback ? nil : NullHTMLTemplate.new(@mail)
+    end
+
+    def text
+      _template = @templates.where(:format => 'text').first
+      return _template if _template
+      Mailtime.configuration.fallback ? nil : NullTextTemplate.new(@mail)
+    end
+    alias_method :txt, :text
+
+  end
 end

data/lib/mailtime/configuration.rb

@@ -44,6 +44,7 @@ module Mailtime
       @loggable_lookups ||= []
     end
 
+    # does nothing on purpose.
     def self.loggable_lookups=(val)
       @loggable_lookups
     end

data/lib/mailtime/processor/mail_log_service.rb

@@ -27,6 +27,7 @@ module Mailtime
       if var.class.to_s == @loggable_class
         @loggable = var
       end
+      return false
     end
 
     def attribute_is_loggable?(var)

data/lib/mailtime/processor/processor.rb

@@ -3,11 +3,15 @@ require 'mailtime/renderers/mail_renderer'
 require 'mailtime/renderers/base_renderer'
 require 'mailtime/renderers/erb_renderer'
 require 'mailtime/processor/mail_log_service'
-require 'mailtime/processor/processor'
 
 module Mailtime
   class Processor
 
+    CONTENT_TYPES = {
+        :html => 'text/html',
+        :text => 'text/plain'
+    }
+
     def initialize(mail)
       @mail = mail
     end
@@ -19,6 +23,7 @@ module Mailtime
     protected
 
     def process_mail
+      remove_parts
       render_mail
       log_mail
       @mail
@@ -26,18 +31,27 @@ module Mailtime
 
     private
 
-    def log_mail
-      return unless Mailtime.configuration.log
-      log_for_recipients
+    def remove_part(format)
+      index = @mail.parts.index { |mail_part| mail_part.content_type.index(Mailtime::Processor::CONTENT_TYPES[format])}
+      @mail.parts.delete_at(index)
+    end
+
+    def remove_parts
+
     end
 
     def render_mail
       return @mail unless Mailtime.configuration.render
       renderer = Mailtime::Renderers::MailRenderer.new(@mail)
-      @mail.body = renderer.render
+      apply_parts(renderer)
       @mail
     end
 
+    def log_mail
+      return unless Mailtime.configuration.log
+      log_for_recipients
+    end
+
     def log_for_recipients
       Mailtime.configuration.loggables.each do |loggable, options|
         svc = MailLogService.new(@mail, loggable, options)
@@ -45,5 +59,26 @@ module Mailtime
       end
     end
 
+    def apply_parts(renderer)
+      [:text, :html].each do |format|
+        apply_part(renderer, format)
+      end
+    end
+
+    def apply_part(renderer, format)
+      binding.pry
+      remove_part(format) if mail_has_template?(format)
+      part = Mail::Part.new do
+        content_type "#{CONTENT_TYPES[format]}; charset=UTF-8"
+        body renderer.execute(format)
+      end
+      mthd = "#{format}_part=".to_sym
+      @mail.send(mthd, part)
+    end
+
+    def mail_has_template?(format)
+      !!!@mail.mailtime_templates.send(format).nil?
+    end
+
   end
 end

data/lib/mailtime/railtie.rb

@@ -9,26 +9,6 @@ class Railtie < Rails::Railtie
   end
 
   rake_tasks do
-    namespace :mailtime do
-      desc 'Create a bunch of MailTemplate(s) based on existing mailers'
-      task :sync_mailers => :environment do
-        Dir.glob(::Rails.root.join("app/mailers/**/*_mailer.rb")).each { |m| require m }
-        mailers = ObjectSpace.each_object(Class).select { |klass| klass < ::ActionMailer::Base }
-        mailers.each do |mailer|
-          methods = mailer.public_instance_methods(false)
-          methods.each do |m|
-            formats = Dir.glob(Rails.root.join("app/views/#{mailer.to_s.underscore}/#{m}.*"))
-            formats.each do |f|
-              Mailtime::MailTemplate.create(:klass => mailer.to_s,
-                                  :action => m,
-                                  :content => File.read(f),
-                                  :format => f.scan(%r{\.(\w{3,4})\.}).to_a.first.first,
-                                  :extension => File.extname(f)[1 .. -1]
-              )
-            end
-          end
-        end
-      end
-    end
+
   end
 end

data/lib/mailtime/renderers/base_renderer.rb

@@ -2,6 +2,7 @@ module Mailtime
   module Renderers
     class BaseRenderer
 
+      attr_reader :mail, :content
       def initialize(mail, content)
         @mail = mail
         @content = content

data/lib/mailtime/renderers/mail_renderer.rb

@@ -4,36 +4,27 @@ module Mailtime
 
       def initialize(mail)
         @mail = mail
-        @template = @mail.mailtime_template
-        @layout = @mail.mailtime_layout
       end
 
-      def render
-        render_and_merge
-      end
-
-      def self.renders
-        []
+      def execute(format)
+        render(format)
       end
 
       protected
 
-      # find the template. If one doesn't exist, and we want to fallback,
-      # pretend like we have a template with a NullTemplate to make Sandi proud
-      def find_template
-        _template = Mailtime::MailTemplate.find_by(:klass => @mail.mailer_klass, :action => @mail.mailer_action)
-        if _template.nil?
-          _template = Mailtime::NullTemplate.new(@mail)
+      def render(format)
+        template = @mail.mailtime_templates.send(format)
+        layout = template.try(:mail_layout)
+        if template.nil?
+          part = @mail.parts.detect { |part| part.content_type.index(Mailtime::Processor::CONTENT_TYPES[format]) }
+          if part.nil?
+            raise TemplateNotFound, "Existing template not found for format #{format}"
+          end
+          return part.body.raw_source
+        else
+          return layout.render(@mail).gsub(Mailtime.configuration.yield_keyword, template.render(@mail))
         end
-        _template
-      end
-
-      def find_layout
-        @template.mailtime_mail_layout
-      end
 
-      def render_and_merge
-        @layout.render(@mail).gsub(Mailtime.configuration.yield_keyword, @template.render(@mail))
       end
 
     end

data/lib/mailtime/renderers/null.rb

@@ -1,48 +1,2 @@
-# Just null objects
-
-module Mailtime
-  class NullLayout
-
-    attr_reader :content, :id
-    def initialize
-      @id = nil
-      @content = "#{Mailtime.configuration.yield_keyword}"
-    end
-
-    def self.renders
-      ['erb']
-    end
-
-    def renderer
-      Mailtime::Renderers::ErbRenderer
-    end
-
-    def render(mail)
-      renderer.new(mail, @content).render
-    end
-
-  end
-
-  class NullTemplate
-
-    attr_reader :content, :id
-    def initialize(mail)
-      @id = nil
-      @content = mail.body.raw_source
-    end
-
-    def mail_layout
-      NullLayout.new
-    end
-
-    def renderer
-      Mailtime::Renderers::ErbRenderer
-    end
-
-    # doesn't do anything since we already know the mail.
-    def render(mail)
-      @content
-    end
-
-  end
-end
+require 'mailtime/renderers/null_layout'
+require 'mailtime/renderers/null_template'

data/lib/mailtime/renderers/null_layout.rb

@@ -0,0 +1,51 @@
+module Mailtime
+  class NullLayout
+
+    attr_reader :content, :id, :format
+    def initialize
+      @id = nil
+      @content = "#{Mailtime.configuration.yield_keyword}"
+    end
+
+    def self.renders
+      ['erb']
+    end
+
+    def renderer
+      Mailtime::Renderers::ErbRenderer
+    end
+
+    def render(mail)
+      renderer.new(mail, @content).render
+    end
+
+  end
+
+  class NullHTMLLayout < NullLayout
+
+    def format
+      :html
+    end
+
+  end
+
+  class NullTextLayout < NullLayout
+
+    def format
+      :text
+    end
+
+  end
+
+  class NullLayoutCollection
+
+    def html
+      NullHTMLLayout.new
+    end
+
+    def text
+      NullTextLayout.new
+    end
+
+  end
+end

data/lib/mailtime/renderers/null_template.rb

@@ -0,0 +1,64 @@
+module Mailtime
+  class NullTemplate
+
+    attr_reader :content, :id
+    def initialize(mail)
+      @id = nil
+      @content = mail.body.raw_source
+    end
+
+    def mail_layout
+      NullLayout.new
+    end
+
+    def renderer
+      Mailtime::Renderers::ErbRenderer
+    end
+
+    # doesn't do anything since we already know the mail.
+    def render(mail)
+      @content
+    end
+
+  end
+
+  class NullHTMLTemplate < NullTemplate
+
+    def format
+      :html
+    end
+
+    def mail_layout
+      NullHTMLLayout.new
+    end
+
+  end
+
+  class NullTextTemplate < NullTemplate
+
+    def format
+      :text
+    end
+
+    def mail_layout
+      NullTextLayout.new
+    end
+
+  end
+
+  class NullTemplateCollection
+
+    def initialize(mail)
+      @mail = mail
+    end
+
+    def html
+      NullHTMLTemplate.new(@mail)
+    end
+
+    def text
+      NullTextTemplate.new(@mail)
+    end
+
+  end
+end

data/lib/mailtime/version.rb

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

data/lib/tasks/mailtime.rake

@@ -0,0 +1,22 @@
+# for the love of god, don't use this.
+namespace :mailtime do
+  desc 'Create a bunch of MailTemplate(s) based on existing mailers'
+  task :sync_mailers => :environment do
+    Dir.glob(::Rails.root.join("app/mailers/**/*_mailer.rb")).each { |m| require m }
+    mailers = ObjectSpace.each_object(Class).select { |klass| klass < ::ActionMailer::Base }
+    mailers.each do |mailer|
+      methods = mailer.public_instance_methods(false)
+      methods.each do |m|
+        formats = Dir.glob(Rails.root.join("app/views/#{mailer.to_s.underscore}/#{m}.*"))
+        formats.each do |f|
+          Mailtime::MailTemplate.create(:klass => mailer.to_s,
+                                        :action => m,
+                                        :content => File.read(f),
+                                        :format => f.scan(%r{\.(\w{3,4})\.}).to_a.first.first,
+                                        :extension => File.extname(f)[1 .. -1]
+          )
+        end
+      end
+    end
+  end
+end

data/mailtime.gemspec

@@ -29,8 +29,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rails", "4.2"
+  spec.add_development_dependency "rails", ">= 4.1"
   spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "mocha"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mailtime
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Josh Brody
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +161,10 @@ files:
 - lib/mailtime/renderers/erb_renderer.rb
 - lib/mailtime/renderers/mail_renderer.rb
 - lib/mailtime/renderers/null.rb
+- lib/mailtime/renderers/null_layout.rb
+- lib/mailtime/renderers/null_template.rb
 - lib/mailtime/version.rb
+- lib/tasks/mailtime.rake
 - mailtime.gemspec
 homepage: https://github.com/joshmn/mailtime
 licenses: