effective_email_templates 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a750f7470cb2821cf09fcda4fada4b4128e43d0a
-  data.tar.gz: 93aeb104da26368d60c81152fb69af94be98186a
+  metadata.gz: bbda63e6020c397791488952b40f7a399cecb631
+  data.tar.gz: 55b24c07d7248e8d3c888cd81203a291a23e3f0e
 SHA512:
-  metadata.gz: 5edcec2f892ae8cbe1e945df57ea0895edae1faf245f0de80dd1eae5126009fc7bdf29ce9bdfd5f10a161942a4187f206c498bd1d67e8b5d90dec17d1bbd786d
-  data.tar.gz: a889e773667891eefca64c1400f8ccb904010e4b3575375e5620904cf421edcb5a2f2d803b14fa71a83cb6dc5cc422793b19484160d67ce08977fe0a6d1427e0
+  metadata.gz: 07aec10a988bb330f44e0f8ee30fe33fda75a8de36234490ab999ccbb70ccf9d45ce0d0c0c1f41e2ca38f3b7b06183680e47d9a6c0014e4debd36779fad12dba
+  data.tar.gz: 8590029f42da810df46197674588f5b9e406bfd77d12601d91f0ca0b4111e754cfe9e0375deb7b3c9e6193201f4c1b624b87170bd5c71ccd5c7c2046947d4c53

data/lib/effective/liquid_mailer.rb

@@ -2,11 +2,14 @@ module Effective
   class LiquidMailer < ::ActionMailer::Base
     def mail(headers = {}, &block)
       # this be dangerous and requires ruby 2.0+
-      mail_method = caller_locations(1,1)[0].label
-      email_template = EffectiveEmailTemplates.get(mail_method)
-      headers = headers.merge(email_template.mail_options)
-      super(headers, &block)
+      mail_method = caller_locations(1, 1)[0].label
+      options = EffectiveEmailTemplates.get(mail_method).mail_options
+
+      if options[:subject].present?
+        options[:subject] = Liquid::Template.parse(options[:subject]).render(@to_liquid) rescue options[:subject]
+      end
+
+      super(headers.merge(options), &block)
     end
   end
 end
-

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -209,9 +209,7 @@ files:
 - lib/effective_email_templates/engine.rb
 - lib/effective_email_templates/liquid_resolver.rb
 - lib/effective_email_templates/template_importer.rb
-- lib/effective_email_templates/template_importer.rb~
 - lib/effective_email_templates/version.rb
-- lib/effective_email_templates/version.rb~
 - lib/generators/effective_email_templates/install_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/effective_email_templates.rb
@@ -277,7 +275,6 @@ files:
 - spec/factories/user.rb
 - spec/factory_spec.rb
 - spec/lib/effective_email_templates/template_importer_spec.rb
-- spec/lib/effective_email_templates/template_importer_spec.rb~
 - spec/mailers/liquid_resolved_mailer_spec.rb
 - spec/models/email_template_spec.rb
 - spec/models/user_spec.rb
@@ -369,7 +366,6 @@ test_files:
 - spec/factories/user.rb
 - spec/factory_spec.rb
 - spec/lib/effective_email_templates/template_importer_spec.rb
-- spec/lib/effective_email_templates/template_importer_spec.rb~
 - spec/mailers/liquid_resolved_mailer_spec.rb
 - spec/models/email_template_spec.rb
 - spec/models/user_spec.rb

data/lib/effective_email_templates/template_importer.rb~

@@ -1,48 +0,0 @@
-module EffectiveEmailTemplates
-  class TemplateImporter
-    def self.invoke(importer = new)
-      importer.invoke
-    end
-
-    def invoke
-      binding.pry
-      Dir[Rails.root.join('app', 'views', '**', '*.liquid')].each do |liquid_template_filepath|
-        slug = File.basename(liquid_template_filepath, '.liquid')
-        binding.pry
-        next if Effective::EmailTemplate.where(slug: slug).present?
-
-        template = Effective::EmailTemplate.new(slug: slug)
-
-        file = File.new(liquid_template_filepath, "r")
-        template = add_template_meta(file, template)
-        template.body = extract_template_body(file)
-        template.save
-        print_errors(template, liquid_template_filepath) unless template.valid?
-      end
-    end
-
-  private
-
-    def add_template_meta(file, template)
-      template.attributes = File.open(file) do |f|
-        attr = YAML::load(f)
-        attr.is_a?(Hash) ? attr : {}
-      end
-      template
-    end
-
-    def extract_template_body file
-      contents = file.read
-      return unless match = contents.match(/(---+(.|\n)+---+)/)
-      contents.gsub(match[1], '').strip
-    end
-
-    def print_errors(template, liquid_template_filepath)
-      puts "ERROR -- There was one or more validation errors while uploading:"
-      puts "  Email Template: #{liquid_template_filepath}"
-      template.errors.each do |attribute, error|
-        puts "  -> #{attribute} #{error}"
-      end
-    end
-  end
-end

data/lib/effective_email_templates/version.rb~

@@ -1,3 +0,0 @@
-module EffectiveEmailTemplates
-  VERSION = '0.3.2'
-end

data/spec/lib/effective_email_templates/template_importer_spec.rb~

@@ -1,43 +0,0 @@
-require 'spec_helper'
-require 'effective_email_templates/template_importer'
-
-describe EffectiveEmailTemplates::TemplateImporter do
-
-  describe 'well formatted template files' do
-    it 'imports templates from view files' do
-      Effective::EmailTemplate.delete_all
-      expect{ EffectiveEmailTemplates::TemplateImporter.invoke }.to change { Effective::EmailTemplate.count }
-    end
-
-    it 'does not import templates if a template already exists in the database' do
-      Effective::EmailTemplate.delete_all
-      expect{ EffectiveEmailTemplates::TemplateImporter.invoke }.to change { Effective::EmailTemplate.count }
-      expect{ EffectiveEmailTemplates::TemplateImporter.invoke }.to_not change { Effective::EmailTemplate.count }
-    end
-
-    it 'does not print errors' do
-      importer = EffectiveEmailTemplates::TemplateImporter.new
-      expect(importer).to_not receive(:print_errors)
-      EffectiveEmailTemplates::TemplateImporter.invoke(importer)
-    end
-  end
-
-  describe 'poorly formatted template files' do
-    let(:filepath) { Rails.root.join('app', 'views', 'user_liquid', 'some_template.liquid') }
-    before do
-      File.open(filepath, 'w') do |f|
-        f.write("--\n---\nbody")
-      end
-    end
-
-    after do
-      File.delete(filepath)
-    end
-
-    it 'prints errors if there is a problem with a template' do
-      importer = EffectiveEmailTemplates::TemplateImporter.new
-      expect(importer).to receive(:print_errors)
-      EffectiveEmailTemplates::TemplateImporter.invoke(importer)
-    end
-  end
-end