effective_email_templates 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef3facb431d4773e654d65d8797e4d616e7fcc463ab3643db556001b0d4b62b9
-  data.tar.gz: be4db3f2818619af838038f33711b8e7f1ace4fcec9a81127bf315ded3edcd3b
+  metadata.gz: f6f761daef6975677ea045c02bec4fe35c12613428d7a471ea96090d9ff4f8ee
+  data.tar.gz: 643bb762e01e5f086d90fe91465dc150033f27e2cd913f3295b02c1d35e0cff0
 SHA512:
-  metadata.gz: 8825ea1ce92eb8d06896eeaa373de617196a087dc438c7c117fd01a550e4743ec58f6ee94db15f3bb74956e0e3a370d9148f4ab5a832a753eabeb14f951c9e41
-  data.tar.gz: 8160cff98ca3378e003e6aba6605140a0adaba6b4412484343699391bfda45fde02d78e7452a4d8076654299baddf31ef218a03cc5e18a4220f3d89f4af0d6ad
+  metadata.gz: d516cd29cdbf67641658d726e3d6ac3c670d25f1a563827516e05f8bb78aeb31c316f3270c4cdf981d74cd5d0efb8f980bb4035b6bdca61738000f4a344b7d20
+  data.tar.gz: 1e10e8b93b994cbbb3a8b715a97d039648655cd2f307fbbdf5cf3caafae73fd4c735ead6a8461e9e5c209a00ddb5dc4dc9d773919192d92a29d1b5a1d3cfe8d1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Code and Effect Inc.
+Copyright 2023 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/mailers/concerns/effective_email_templates_mailer.rb

@@ -18,7 +18,7 @@ module EffectiveEmailTemplatesMailer
     email_template.subject = subject if subject.present?
 
     # Add any _url helpers
-    assigns = route_url_assigns(email_template).merge(assigns)
+    assigns = route_url_assigns(email_template, assigns).merge(assigns)
 
     # Render from the template, possibly with updated body
     rendered = email_template.render(assigns)
@@ -28,8 +28,12 @@ module EffectiveEmailTemplatesMailer
 
   private
 
-  def route_url_assigns(email_template)
-    email_template.template_variables.select { |name| name.ends_with?('_url') }.inject({}) do |h, name|
+  def route_url_assigns(email_template, existing)
+    route_variables = email_template.template_variables
+      .select { |name| name.ends_with?('_url') }
+      .reject { |name| existing.key?(name) || existing.key?(name.to_sym) }
+    
+    route_variables.inject({}) do |h, name|
       h[name] = public_send(name) if respond_to?(name); h
     end
   end

data/app/models/effective/email_template.rb

@@ -1,6 +1,6 @@
 module Effective
   class EmailTemplate < ActiveRecord::Base
-    self.table_name = EffectiveEmailTemplates.email_templates_table_name.to_s
+    self.table_name = (EffectiveEmailTemplates.email_templates_table_name || :email_templates).to_s
 
     attr_accessor :current_user
 

data/config/effective_email_templates.rb

@@ -1,7 +1,4 @@
 EffectiveEmailTemplates.setup do |config|
-  # Configure Database Tables
-  config.email_templates_table_name = :email_templates
-
   # Layout Settings
   # config.layout = { application: 'application', admin: 'admin' }
 

data/db/migrate/{01_create_effective_email_templates.rb.erb → 101_create_effective_email_templates.rb}

@@ -1,6 +1,6 @@
-class CreateEffectiveEmailTemplates < ActiveRecord::Migration[4.2]
-  def self.up
-    create_table <%= @email_templates_table_name %> do |t|
+class CreateEffectiveEmailTemplates < ActiveRecord::Migration[6.0]
+  def change
+    create_table :email_templates do |t|
       t.string    :template_name
 
       t.string    :subject
@@ -13,11 +13,6 @@ class CreateEffectiveEmailTemplates < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-
-  end
-
-  def self.down
-    drop_table <%= @email_templates_table_name %>
   end
 end
 

data/db/seeds.rb

@@ -0,0 +1 @@
+puts "No seeds present"

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.1'.freeze
 end

data/lib/generators/effective_email_templates/install_generator.rb

@@ -32,8 +32,7 @@ module EffectiveEmailTemplates
       end
 
       def create_migration_file
-        @email_templates_table_name = ':' + EffectiveEmailTemplates.email_templates_table_name.to_s
-        migration_template ('../' * 3) + 'db/migrate/01_create_effective_email_templates.rb.erb', 'db/migrate/create_effective_email_templates.rb'
+        migration_template ('../' * 3) + 'db/migrate/101_create_effective_email_templates.rb', 'db/migrate/create_effective_email_templates.rb'
       end
 
       def message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: devise
+  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-byebug
+  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: effective_test_bot
+  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: effective_developer
+  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: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Effective Email Templates provides an admin access to modify email templates
 email:
 - info@codeandeffect.com
@@ -105,7 +189,8 @@ files:
 - config/email_templates_mailer_preview.rb
 - config/routes.rb
 - config/welcome.liquid
-- db/migrate/01_create_effective_email_templates.rb.erb
+- db/migrate/101_create_effective_email_templates.rb
+- db/seeds.rb
 - lib/effective_email_templates.rb
 - lib/effective_email_templates/engine.rb
 - lib/effective_email_templates/importer.rb
@@ -132,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Effective Email Templates provides an admin access to modify email templates