effective_email_templates 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e93687531dcc1bdbcabef5d5d4621b10a79c54
-  data.tar.gz: 5ec371fa23130f08297fc0efdae95d29e86a2f5a
+  metadata.gz: 22f145ef5bb62900fbd74958509c12281582c84f
+  data.tar.gz: 6ee09134ecff68909d39c29ff6f6fb4dbdbd3124
 SHA512:
-  metadata.gz: c53d990fd88a40e7be908cab99c3617191ef3b0dc0c195e2232b88248be2001b72b38212ee1ad70f3a35fde2a47e9f27038bca246f61d2837b851632eb69301b
-  data.tar.gz: 9a95f27403b2def66c31dc4c6e53f52072cf3f60f0087f936f445591bf4f3ebc66d2a70d3539fbd80079b64af3ff08f939c54d43a74a43897582572f394a1a33
+  metadata.gz: ac82b99c9b4c8b756ea97fd244683c3e42f3b0e42a47b8a2fcbd48ebd0d44b94d17dd8723dbb8a6e73be355308bb5d2f066265891e814498e69cbb5b3b9cc3ed
+  data.tar.gz: a6a8f151c292a9be331efb8393553a1edd99058e68c410d3bcb039bdd1938e8e52034c23e658c76723a2dcf2d1503197b2b86f932422ecd57f29168c53956832

data/README.md

@@ -44,7 +44,7 @@ This is very similar to creating other emails in Rails.
 
 1. Create a new mailer object (i.e. `/app/mailers/template_mailer.rb`)
     - Mailer objects need to inherit from `Effective::LiquidMailer`
-    
+
 2. Create a method inside the mailer object based on the name of your email (i.e. `def welcome_email`)
 
 3. Create a default email template file (i.e. `/app/views/template_mailer/welcome_email.liquid`)
@@ -158,6 +158,14 @@ rescue_from Effective::AccessDenied do |exception|
 end
 ```
 
+### Permissions
+
+To allow a user to see the admin area, using CanCan:
+
+```ruby
+can :admin, :effective_email_templates
+```
+
 
 ## License
 

data/app/controllers/admin/email_templates_controller.rb

@@ -5,51 +5,52 @@ module Admin
     layout (EffectiveEmailTemplates.layout.kind_of?(Hash) ? EffectiveEmailTemplates.layout[:admin_email_templates] : EffectiveEmailTemplates.layout)
 
     def index
-      EffectiveEmailTemplates.authorized?(self, :index, Effective::EmailTemplate)
-
-      @page_title = 'Manage Email Templates'
-      @datatable = Effective::Datatables::EmailTemplates.new() if defined?(EffectiveDatatables)
+      @datatable = Effective::Datatables::EmailTemplates.new()
       @page_title = 'Email Templates'
+
+      authorize_effective_email_templates!
     end
 
     def new
       @email_template = Effective::EmailTemplate.new
-      EffectiveEmailTemplates.authorized?(self, :new, @email_template)
-
       @page_title = 'New Email Template'
+
+      authorize_effective_email_templates!
     end
 
     def create
       @email_template = Effective::EmailTemplate.new(email_template_params)
-      EffectiveEmailTemplates.authorized?(self, :create, @email_template)
+      @page_title = 'New Email Template'
+
+      authorize_effective_email_templates!
 
       if @email_template.save
         flash[:success] = "Email template created successfully"
         redirect_to effective_email_templates.admin_email_templates_path
       else
         flash.now[:error] = "Could not create email template"
-        @page_title = 'New Email Template'
         render :new
       end
     end
 
     def edit
       @email_template = Effective::EmailTemplate.find(params[:id])
-      EffectiveEmailTemplates.authorized?(self, :edit, @email_template)
-
       @page_title = 'Edit Email Template'
+
+      authorize_effective_email_templates!
     end
 
     def update
       @email_template = Effective::EmailTemplate.find(params[:id])
-      EffectiveEmailTemplates.authorized?(self, :update, @email_template)
+      @page_title = 'Edit Email Template'
+
+      authorize_effective_email_templates!
 
       if @email_template.update(email_template_params)
         flash[:success] = "Email template updated successfully"
         redirect_to effective_email_templates.admin_email_templates_path
       else
         flash.now[:error] = "Could not update email template"
-        @page_title = 'Edit Email Template'
         render :edit
       end
     end
@@ -59,5 +60,11 @@ module Admin
     def email_template_params
       params.require(:effective_email_template).permit([ :from, :cc, :bcc, :subject, :body ])
     end
+
+    def authorize_effective_email_templates!
+      EffectiveEmailTemplates.authorized?(self, :admin, :effective_email_templates)
+      EffectiveEmailTemplates.authorized?(self, action_name.to_sym, @email_template || Effective::EmailTemplate)
+    end
+
   end
 end

data/app/{errors → models}/effective/access_denied.rb

@@ -15,4 +15,3 @@ unless defined?(Effective::AccessDenied)
     end
   end
 end
-

data/app/views/admin/email_templates/edit.html.haml

@@ -1,3 +1,3 @@
-%h1 Edit Email Template
+%h1.effective-admin-heading= @page_title
 
 = render partial: 'form', locals: { email_template: @email_template }

data/app/views/admin/email_templates/index.html.haml

@@ -1,3 +1,3 @@
-%h1 Email Templates
+%h1.effective-admin-heading= @page_title
 
 = render_datatable(@datatable)

data/{lib/generators/templates → config}/effective_email_templates.rb

@@ -45,7 +45,7 @@ EffectiveEmailTemplates.setup do |config|
   #
   # Or disable the check completely:
   # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) } # CanCan gem
+  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
 
 
 end

data/lib/effective_email_templates.rb

@@ -1,8 +1,8 @@
-require "effective_email_templates/engine"
 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 "effective_email_templates/engine"
 
 require "effective/liquid_mailer"
 Effective::LiquidMailer.send(:append_view_path, EffectiveEmailTemplates::LiquidResolver.new)

data/lib/effective_email_templates/engine.rb

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

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/generators/effective_email_templates/install_generator.rb

@@ -3,9 +3,9 @@ module EffectiveEmailTemplates
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      desc "Creates an EffectiveEmailTemplates initializer in your application."
+      desc 'Creates an EffectiveEmailTemplates initializer in your application.'
 
-      source_root File.expand_path("../../templates", __FILE__)
+      source_root File.expand_path('../../templates', __FILE__)
 
       def self.next_migration_number(dirname)
         if not ActiveRecord::Base.timestamped_migrations
@@ -16,16 +16,12 @@ module EffectiveEmailTemplates
       end
 
       def copy_initializer
-        template "effective_email_templates.rb", "config/initializers/effective_email_templates.rb"
+        template ('../' * 3) + 'config/effective_email_templates.rb', 'config/initializers/effective_email_templates.rb'
       end
 
       def create_migration_file
         @email_templates_table_name = ':' + EffectiveEmailTemplates.email_templates_table_name.to_s
-        migration_template '../../../db/migrate/01_create_effective_email_templates.rb.erb', 'db/migrate/create_effective_email_templates.rb'
-      end
-
-      def show_readme
-        readme "README" if behavior == :invoke
+        migration_template ('../' * 3) + 'db/migrate/01_create_effective_email_templates.rb.erb', 'db/migrate/create_effective_email_templates.rb'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: migrant
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -95,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_datatables
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -191,9 +177,9 @@ files:
 - app/assets/javascripts/effective_email_templates.js
 - app/assets/stylesheets/effective_email_templates.css.scss
 - app/controllers/admin/email_templates_controller.rb
-- app/errors/effective/access_denied.rb
 - app/helpers/effective_email_templates_helper.rb
 - app/mailers/effective/email_template_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
@@ -201,6 +187,7 @@ files:
 - 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
+- config/effective_email_templates.rb
 - config/routes.rb
 - db/migrate/01_create_effective_email_templates.rb.erb
 - lib/effective/liquid_mailer.rb
@@ -211,8 +198,6 @@ files:
 - lib/effective_email_templates/template_importer.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
 - lib/tasks/effective_email_templates/import_default_views.rake
 - spec/controllers/admin/email_templates_controller_spec.rb
 - spec/dummy/README.rdoc
@@ -290,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Effective Email Templates provides an admin access to modify email templates

data/lib/generators/templates/README

@@ -1 +0,0 @@
-Thanks for using EffectiveEmailTemplates