effective_email_templates 0.5.1 → 1.0.0

data/config/routes.rb

@@ -1,11 +1,9 @@
-Rails.application.routes.draw do
-  mount EffectiveEmailTemplates::Engine => '/', :as => 'effective_email_templates'
-end
-
 EffectiveEmailTemplates::Engine.routes.draw do
-  if defined?(EffectiveDatatables)
-    namespace :admin do
-      resources :email_templates, only: [:index, :edit, :update]
-    end
+  namespace :admin do
+    resources :email_templates
   end
 end
+
+Rails.application.routes.draw do
+  mount EffectiveEmailTemplates::Engine => '/', as: 'effective_email_templates'
+end

data/db/migrate/01_create_effective_email_templates.rb.erb

@@ -1,16 +1,22 @@
 class CreateEffectiveEmailTemplates < ActiveRecord::Migration[4.2]
   def self.up
     create_table <%= @email_templates_table_name %> do |t|
-      t.string :subject
-      t.string :from
-      t.string :bcc
-      t.string :cc
-      t.string :slug,     :null => false
-      t.text :body,       :null => false
-      t.text :template,   :null => false
+      t.string    :subject
+      t.string    :from
+      t.string    :bcc
+      t.string    :cc
+
+      t.string    :content_type
+      t.text      :body
+
+      t.string    :template_name
+      t.text      :template_body
+      t.text      :template_subject
+      t.text      :template_variables
+
+      t.timestamps
     end
 
-    add_index <%= @email_templates_table_name %>, :slug
   end
 
   def self.down

data/lib/effective_email_templates.rb

@@ -1,33 +1,37 @@
-require "effective_email_templates/liquid_resolver"
-require "effective_email_templates/email_view_template"
-require "effective_email_templates/template_importer"
-require "effective_email_templates/version"
+require "liquid"
 require "effective_email_templates/engine"
-
-require "effective/liquid_mailer"
-Effective::LiquidMailer.send(:append_view_path, EffectiveEmailTemplates::LiquidResolver.new)
+require "effective_email_templates/version"
 
 module EffectiveEmailTemplates
 
   mattr_accessor :email_templates_table_name
   mattr_accessor :authorization_method
-  mattr_accessor :simple_form_options
   mattr_accessor :layout
+  mattr_accessor :mailer
 
   def self.setup
     yield self
   end
 
   def self.authorized?(controller, action, resource)
-    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
-      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
+    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
+
+    return !!authorization_method unless authorization_method.respond_to?(:call)
+    controller = controller.controller if controller.respond_to?(:controller)
+
+    begin
+      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
+    rescue *@_exceptions
+      false
     end
-    true
   end
 
-  def self.get(slug)
-    Effective::EmailTemplate.find_by_slug(slug) || Effective::EmailTemplate.new(slug: slug)
+  def self.authorize!(controller, action, resource)
+    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
 
-end
+  def self.permitted_params
+    [:from, :bcc, :cc, :subject, :body, :content_type]
+  end
 
+end

data/lib/effective_email_templates/engine.rb

@@ -3,7 +3,7 @@ module EffectiveEmailTemplates
     engine_name 'effective_email_templates'
 
     # Set up our default configuration options.
-    initializer "effective_email_templates.defaults", :before => :load_config_initializers do |app|
+    initializer 'effective_email_templates.defaults', before: :load_config_initializers do |app|
       eval File.read("#{config.root}/config/effective_email_templates.rb")
     end
 

data/lib/effective_email_templates/importer.rb

@@ -0,0 +1,55 @@
+module EffectiveEmailTemplates
+  class Importer
+    def self.import
+      new().execute(overwrite: false)
+    end
+
+    def self.overwrite
+      new().execute(overwrite: true)
+    end
+
+    def execute(overwrite:)
+      Dir[Rails.root.join('app', 'views', '**', '*.liquid')].each do |filepath|
+        name = File.basename(filepath, '.liquid')
+        email_template = Effective::EmailTemplate.find_or_initialize_by(template_name: name)
+
+        if email_template.persisted? && !overwrite
+          puts "SKIPPED #{filename(filepath)}"; next
+        end
+
+        save(email_template, filepath)
+      end
+    end
+
+    private
+
+    def save(email_template, filepath)
+      file = File.new(filepath, 'r')
+
+      attributes = begin
+        content = YAML.load(file)
+        content.kind_of?(Hash) ? content : {}
+      end
+
+      body = File.open(file) do |f|
+        content = f.read
+        match = content.match(/(---+(.|\n)+---+)/)
+        content.gsub(match[1], '').strip if match
+      end
+
+      email_template.assign_attributes(attributes)
+      email_template.assign_attributes(body: body)
+
+      if email_template.save
+        puts "SUCCESS #{filename(filepath)}"
+      else
+        puts "ERROR #{filename(filepath)}: #{email_template.errors.full_messages.to_sentence}"
+      end
+    end
+
+    def filename(filepath)
+      filepath.sub(Rails.root.to_s + '/app/', '')
+    end
+
+  end
+end

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '0.5.1'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/generators/effective_email_templates/install_generator.rb

@@ -8,7 +8,7 @@ module EffectiveEmailTemplates
       source_root File.expand_path('../../templates', __FILE__)
 
       def self.next_migration_number(dirname)
-        if not ActiveRecord::Base.timestamped_migrations
+        unless ActiveRecord::Base.timestamped_migrations
           Time.new.utc.strftime("%Y%m%d%H%M%S")
         else
           "%.3d" % (current_migration_number(dirname) + 1)

data/lib/tasks/effective_email_templates_tasks.rake

@@ -0,0 +1,19 @@
+# rake effective_email_templates:import
+# rake effective_email_templates:overwrite
+
+namespace :effective_email_templates do
+  desc 'Import email templates from the filesystem to the database. Skips existing.'
+  task import: :environment do
+    require 'effective_email_templates/importer'
+    EffectiveEmailTemplates::Importer.import()
+  end
+
+  desc 'Overwrite email templates from the filesystem to the database. Overwrites existing.'
+  task overwrite: :environment do
+    puts 'WARNING: this task will overwrite existing email templates. Proceed? (y/n)'
+    (puts 'Aborted'; exit) unless STDIN.gets.chomp.downcase == 'y'
+
+    require 'effective_email_templates/importer'
+    EffectiveEmailTemplates::Importer.overwrite()
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Code and Effect
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,27 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: liquid
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: effective_bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,15 +72,29 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-description: Uses liquid templates
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: effective_resources
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Effective Email Templates provides an admin access to modify email templates
 email:
 - info@codeandeffect.com
 executables: []
@@ -95,89 +103,25 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
-- app/assets/javascripts/effective_email_templates.js
-- app/assets/stylesheets/effective_email_templates.css.scss
 - app/controllers/admin/email_templates_controller.rb
 - app/datatables/effective_email_templates_datatable.rb
-- app/helpers/effective_email_templates_helper.rb
-- app/mailers/effective/email_template_mailer.rb
+- app/mailers/effective/email_templates_mailer.rb
 - app/models/effective/access_denied.rb
-- app/models/effective/datatables/email_templates.rb
 - app/models/effective/email_template.rb
 - app/views/admin/email_templates/_actions.html.haml
 - app/views/admin/email_templates/_form.html.haml
 - app/views/admin/email_templates/edit.html.haml
 - app/views/admin/email_templates/index.html.haml
-- app/views/effective/email_template_mailer/templated_email.html.haml
+- app/views/layouts/effective_email_templates_mailer_layout.html.haml
 - config/effective_email_templates.rb
 - config/routes.rb
 - db/migrate/01_create_effective_email_templates.rb.erb
-- lib/effective/liquid_mailer.rb
 - lib/effective_email_templates.rb
-- lib/effective_email_templates/email_view_template.rb
 - lib/effective_email_templates/engine.rb
-- lib/effective_email_templates/liquid_resolver.rb
-- lib/effective_email_templates/template_importer.rb
+- lib/effective_email_templates/importer.rb
 - lib/effective_email_templates/version.rb
 - lib/generators/effective_email_templates/install_generator.rb
-- lib/tasks/effective_email_templates/import_default_views.rake
-- spec/controllers/admin/email_templates_controller_spec.rb
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/welcome_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/mailers/liquid_resolved_mailer.rb
-- spec/dummy/app/mailers/user_liquid_mailer.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/user_liquid/after_create_user.liquid
-- spec/dummy/app/views/welcome/index.html.haml
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/devise.rb
-- spec/dummy/config/initializers/effective_email_templates.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/devise.en.yml
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/db/migrate/20141126222940_devise_create_users.rb
-- spec/dummy/db/migrate/20141126222941_create_effective_email_templates.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/effective_email_templates_spec.rb
-- spec/factories/email_template.rb
-- spec/factories/user.rb
-- spec/factory_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
-- spec/sanity_spec.rb
-- spec/spec_helper.rb
+- lib/tasks/effective_email_templates_tasks.rake
 homepage: https://github.com/code-and-effect/effective_email_templates
 licenses:
 - MIT
@@ -201,60 +145,4 @@ rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Effective Email Templates provides an admin access to modify email templates
-test_files:
-- spec/spec_helper.rb
-- spec/sanity_spec.rb
-- spec/dummy/app/mailers/user_liquid_mailer.rb
-- spec/dummy/app/mailers/liquid_resolved_mailer.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/welcome_controller.rb
-- spec/dummy/app/views/welcome/index.html.haml
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/user_liquid/after_create_user.liquid
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/locales/devise.en.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/devise.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/effective_email_templates.rb
-- spec/dummy/config.ru
-- spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/404.html
-- spec/dummy/db/schema.rb
-- spec/dummy/db/migrate/20141126222940_devise_create_users.rb
-- spec/dummy/db/migrate/20141126222941_create_effective_email_templates.rb
-- spec/dummy/README.rdoc
-- spec/factory_spec.rb
-- spec/mailers/liquid_resolved_mailer_spec.rb
-- spec/models/email_template_spec.rb
-- spec/models/user_spec.rb
-- spec/factories/email_template.rb
-- spec/factories/user.rb
-- spec/lib/effective_email_templates/template_importer_spec.rb
-- spec/effective_email_templates_spec.rb
-- spec/controllers/admin/email_templates_controller_spec.rb
+test_files: []

data/Rakefile

@@ -1,23 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-# Our tasks
-load 'lib/tasks/effective_email_templates/import_default_views.rake'
-
-# Testing tasks
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
-
-task :default => :spec