mailtime 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d1034ff118c9f1f13f3585d33f7d6ea7de54484
-  data.tar.gz: 4a14aed6613149b9887928f3bf82c82acd6de04b
+  metadata.gz: 4164639a2246ede181bb3431c3e79d8762d65a26
+  data.tar.gz: 3fc802e69ac88adeeaeb4e47e00a3b090405ee92
 SHA512:
-  metadata.gz: 4c765236c8b6e7871d83c41bc3811649652bea36cb25a31f0c8b8207ad23846cd5e67a7aad19020f1a8a72e33a0ba8d0a4501c2c0fa4f18866e6eb8b1a6b74db
-  data.tar.gz: a9c3adcf5423fda4105fdc225bc63dcc25857d323cad62d3c3281c1fbeeba65744f6a7cd91809f68dd858739f0cba274fd57fdcae1de5c0502eb7ece43a235b9
+  metadata.gz: 4338930085c6a3f4ba5fab74fd05f2d74d06c8a8e0faa73eda55fc241de424282a4696b70c887e093941e66cb5814fd6f8d0730272ec87386ea886e48fea7a35
+  data.tar.gz: 23df378aabf1e7f46023aede7697df32534211ab022b400ef1fccad15a62909c82add99afe9f9147380c2d02bbcc4eeb47eb1028ea55b80479141e66d626f08d

data/Rakefile

@@ -1,9 +1,11 @@
 require 'bundler/gem_tasks'
-task :default => :spec
 
 require 'rake/testtask'
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.pattern = 'test/*_test.rb'
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/test_*.rb"]
 end
+
+task :default => :test

data/lib/mailtime.rb

@@ -18,9 +18,9 @@ module Mailtime
     yield(configuration)
   end
 
-  if defined?(ActiveRecord::Base)
+  if defined?(::ActiveRecord::Base)
     require 'mailtime/acts_as_mailtime_loggable'
-    ActiveRecord::Base.extend Mailtime::ActsAsMailtimeLoggable
+    ::ActiveRecord::Base.extend Mailtime::ActsAsMailtimeLoggable
   end
 
 end
@@ -31,4 +31,5 @@ require 'mailtime/renderers/null'
 require 'mailtime/processor/processor'
 require 'mailtime/railtie'
 require 'mailtime/active_record/models/concerns/mail_log_concern'
-require 'mailtime/active_record/models/concerns/mail_template_concern'
+require 'mailtime/active_record/models/concerns/mail_template_concern'
+require 'mailtime/active_record/models/concerns/renderer_concern'

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

@@ -3,6 +3,8 @@ module Mailtime
   # outlined in mail_template_concern.rb
   module MailLogConcern
 
+    extend ::ActiveSupport::Concern
+
     included do
       self.table_name = 'mailtime_mail_logs'
       belongs_to :loggable, :polymorphic => true

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

@@ -24,7 +24,7 @@ module Mailtime
 
     def mail_layout
       return NullLayout.new unless self[:mail_layout].present?
-
+      self[:mail_layout]
     end
 
     def additional_headers

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

@@ -9,7 +9,7 @@ module Mailtime
       renderers.each do |r|
         return r if r.renders.include? self.extension
       end
-      Mailtime::Renderer::ErbRenderer
+      Mailtime::Renderers::ErbRenderer
     end
 
     # render against the mail

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

@@ -5,7 +5,7 @@ module Mailtime
   class MailLayout < ActiveRecord::Base
 
     include Mailtime::MailLayoutConcern
-    include Mailtime::Renderer
+    include Mailtime::RendererConcern
 
   end
 end

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

@@ -5,7 +5,7 @@ module Mailtime
   class MailTemplate < ActiveRecord::Base
 
     include Mailtime::MailTemplateConcern
-    include Mailtime::Renderer
+    include Mailtime::RendererConcern
 
   end
 end

data/lib/mailtime/acts_as_mailtime_loggable.rb

@@ -4,7 +4,7 @@ module Mailtime
     def acts_as_mailtime_loggable(attr = 'email', opts = {})
       include Mailtime::Loggable
       opts[:fields] ||= [:to]
-      Mailtime.configuration.loggable_lookups << { self.to_s => {:attribute => attr, :fields => opts[:fields]} }
+      Mailtime.loggable_lookups << { self.to_s => {:attribute => attr, :fields => opts[:fields]} }
     end
 
   end

data/lib/mailtime/configuration.rb

@@ -1,5 +1,11 @@
 module Mailtime
 
+  @@loggable_lookups = []
+
+  def self.loggable_lookups
+    @@loggable_lookups
+  end
+
   class Configuration
     attr_accessor :mailers,
                   :render,
@@ -18,7 +24,7 @@ module Mailtime
       @log_fields = [:to]
       @fallback = true
       @reject_scope_keys = ['devise_mapping', 'scope_name']
-      @loggable_lookups = []
+      @loggable_lookups = Mailtime.loggable_lookups
       @yield_keyword = '{{ mailtime_yield }}'
       @valid_formats = %w{html text}
     end
@@ -27,10 +33,6 @@ module Mailtime
       @mailers << klass
     end
 
-    def mailers
-      @mailers
-    end
-
     def loggables
       @loggable_lookups.each_with_object({}) do |k,h|
         key = k.keys.first

data/lib/mailtime/processor/processor.rb

@@ -3,6 +3,7 @@ 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

data/lib/mailtime/railtie.rb

@@ -3,7 +3,7 @@ require 'mailtime'
 
 class Railtie < Rails::Railtie
   initializer "Include your code in the controller" do
-    ActiveSupport.on_load(:action_controller) do
+    ::ActiveSupport.on_load(:action_controller) do
       include Mailtime
     end
   end

data/lib/mailtime/renderers/base_renderer.rb

@@ -1,5 +1,3 @@
-require 'erb'
-
 module Mailtime
   module Renderers
     class BaseRenderer

data/lib/mailtime/renderers/erb_renderer.rb

@@ -1,5 +1,3 @@
-require 'erb'
-
 module Mailtime
   module Renderers
     class ErbRenderer < BaseRenderer

data/lib/mailtime/renderers/null.rb

@@ -33,6 +33,10 @@ module Mailtime
       NullLayout.new
     end
 
+    def renderer
+      Mailtime::Renderers::ErbRenderer
+    end
+
     # doesn't do anything since we already know the mail.
     def render(mail)
       @content

data/lib/mailtime/version.rb

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

data/mailtime.gemspec

@@ -29,8 +29,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'minitest', '~> 4.7.3'
-
+  spec.add_development_dependency "rails", "4.2"
+  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "rubocop", ">= 0.37.0"
   spec.requirements << 'Rails <= 3.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailtime
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Josh Brody
@@ -10,20 +10,90 @@ bindir: exe
 cert_chain: []
 date: 2017-04-07 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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   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-reporters
+  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: mocha
+  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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 0.37.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 0.37.0
 description: 
 email:
 - josh@josh.mn
@@ -87,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Rails <= 3.2
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Manage the mails you send from Rails.