Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ERB Template and Generator Fix #42

Merged
merged 5 commits into from
Oct 28, 2016
Merged

ERB Template and Generator Fix #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c44dd8
use literal tag delimiters for erb template
Oct 28, 2016
d102d5d
rework install generator to take boolean options for templating syste…
Oct 28, 2016
b81eba7
version bump
Oct 28, 2016
37b90c4
switch to guard clause
Oct 28, 2016
70e786c
typo fix
Oct 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,16 @@ Run the following command to set up the required styles and mailer layout:
rails g inky:install
```

(You can specify the generated mailer layout filename like so: `rails g inky:install some_name` and also your prefered
markup language like: `rails g inky:install mailer_layout slim`)
You can specify the layout name and templating language with the following options:

```
Usage:
rails generate inky:install [layout_name] [options]

Options:
[--haml], [--no-haml] # Generate layout in Haml
[--slim], [--no-slim] # Generate layout in Slim
```

Rename your email templates to use the `.inky` file extension. Note that you'll still be able to use your default
template engine within the `.inky` templates:
Expand Down
16 changes: 12 additions & 4 deletions lib/generators/inky/install_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ class InstallGenerator < ::Rails::Generators::Base
desc 'Install Foundation for Emails'
source_root File.join(File.dirname(__FILE__), 'templates')
argument :layout_name, type: :string, default: 'mailer', banner: 'layout_name'
argument :extension, type: :string, default: 'erb', banner: 'extension'

def preserve_original_mailer_layout
return unless layout_name == 'mailer'
class_option :haml, desc: "Generate layout in Haml", type: :boolean
class_option :slim, desc: "Generate layout in Slim", type: :boolean

original_mailer = File.join(layouts_base_dir, "mailer.html.#{extension}")
def preserve_original_mailer_layout
return unless layout_name == 'mailer' && extension == 'erb'
original_mailer = File.join(layouts_base_dir, "mailer.html.erb")
rename_filename = File.join(layouts_base_dir, "old_mailer_#{Time.now.to_i}.html.erb")
File.rename(original_mailer, rename_filename) if File.exist? original_mailer
end
Expand All @@ -33,6 +34,13 @@ def stylesheets_base_dir
def layouts_base_dir
File.join('app', 'views', 'layouts')
end

def extension
%w(haml slim).each do |ext|
return ext if options.send(ext)
end
'erb'
end
end
end
end
4 changes: 2 additions & 2 deletions lib/generators/inky/templates/mailer_layout.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width" />

<%= stylesheet_link_tag "foundation_emails" %>
<%%= stylesheet_link_tag "foundation_emails" %>
</head>

<body>
<table class="body" data-made-with-foundation>
<tr>
<td class="center" align="center" valign="top">
<center>
<%= yield %>
<%%= yield %>
</center>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion lib/inky/rails/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Inky
module Rails
VERSION = "1.3.7.1".freeze
VERSION = "1.3.7.2".freeze
end
NODE_VERSION, GEM_VERSION = Rails::VERSION.rpartition('.').map(&:freeze)
end