premailer-rails 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13055f85c556422022c71564c81f5816ecffd482e4514c1481212fab2c942eb7
-  data.tar.gz: 8b9093f66f195ac826382329877be7c9b863650c5bcb0c057bae0cc073b8978d
+  metadata.gz: d1ade699bd19b081f52953b727ac7d58019325a8724ebcb49f95158eb832b10d
+  data.tar.gz: 380a46fefaa3d09f491975b45d47590af610d72965ce7c6190b94aeb78a57a6d
 SHA512:
-  metadata.gz: a861465e80d026c7e221b09f0c395be4d4fb26fa3662a233de5ba8295c41f0861b79958f873830fa4bd6333bd21798298155f8cadf1cf7861f08f5348ee3f901
-  data.tar.gz: f4cd1b29b3b1a4ee43fe83971b35b6a43896298ab3c1fec8d4fc91e2fc0d1290b353bba0096e2ae45376e394f6ad00142cf3dda7447a72259c7639c01fbd4231
+  metadata.gz: 374b301926c5084c16ee45c169715d5d53f413f398791e4c20ec3b50b52d8f065dbda20fb55c702bee153051c6480432577c1f5f33f0fe94d431a42bd07b7b7b
+  data.tar.gz: 2567fb6f0ab9323a6f05e292349b7a9e03d65991a5477c0584baa488dd01247469bf123e96669721f0e6326b1b3cb6b3f571dc0a6da8a428a92845d832241d51

data/.github/workflows/test.yml

@@ -0,0 +1,64 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches:
+      - "*"
+  # Enable triggering CI runs manually.
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.7'
+          - '3.1'
+        action_mailer_version:
+          - 5
+          - 6
+          - 7
+        propshaft:
+          - false
+          - true
+        experimental:
+          - false
+        exclude:
+          - ruby: '3.1'
+            action_mailer_version: 5
+          - action_mailer_version: 5
+            propshaft: true
+          - action_mailer_version: 6
+            propshaft: true
+        include:
+          - ruby: head
+            action_mailer_version: head
+            propshaft: false
+            experimental: true
+          - ruby: head
+            action_mailer_version: head
+            propshaft: true
+            experimental: true
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set env vars
+        run: |
+          echo "ACTION_MAILER_VERSION=${{ matrix.action_mailer_version }}" >> $GITHUB_ENV
+          echo "PROPSHAFT=${{ matrix.propshaft }}" >> $GITHUB_ENV
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.12.0
+
+- Lazily load actionmailer (@c960657, #260)
+- HTTP request for CSS files now have an `Accept: text/css` header (@ElMassimo, #261)
+- Added support for [Propshaft](https://github.com/rails/propshaft) (@Intrepidd, #277)
+
 ## v1.11.1
 
 - Check if `Rails.application` is defined (@pabloh, #250)

data/Gemfile

@@ -1,24 +1,24 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-rails_version = ENV.fetch('ACTION_MAILER_VERSION', '5')
+rails_version = ENV.fetch('ACTION_MAILER_VERSION', '7')
 
-if rails_version == 'master'
-  git 'git://github.com/rails/rails.git' do
-    gem 'rails'
+if rails_version == 'head'
+  gem 'rails', github: 'rails/rails'
+  if ENV['PROPSHAFT'] == 'true'
+    gem 'propshaft', github: 'rails/propshaft'
+  else
+    gem 'sprockets-rails', github: 'rails/sprockets-rails'
   end
-  gem 'sprockets-rails', github: 'rails/sprockets-rails'
-  gem 'arel', github: 'rails/arel'
 else
   gem 'rails', "~> #{rails_version}"
+  if ENV['PROPSHAFT'] == 'true'
+    gem 'propshaft'
+  else
+    gem 'sprockets-rails' if rails_version >= '7'
+  end
 end
 
 gem 'byebug'
-
-platforms :rbx do
-  gem 'rubysl'
-  gem 'racc'
-end
-
-gem 'tins', '< 1.7' if RUBY_VERSION.split('.').first.to_i < 2

data/README.md

@@ -4,9 +4,7 @@ CSS styled emails without the hassle.
 
 [![Build Status][build-image]][build-link]
 [![Gem Version][gem-image]][gem-link]
-[![Dependency Status][deps-image]][deps-link]
 [![Code Climate][gpa-image]][gpa-link]
-[![Coverage Status][cov-image]][cov-link]
 
 ## Introduction
 
@@ -152,6 +150,14 @@ Premailer::Rails::Hook.perform(mail)
 
 This will modify the email in place, useful e.g. in tests.
 
+## Supported Rails Versions
+
+This gem is tested on Rails versions 5 through 7.
+
+For Rails 7, it support both the classical Sprockets asset pipeline as well as the new [Propshaft](https://github.com/rails/propshaft) gem.
+
+If you're looking to integrate with Webpacker, check out [these instructions](https://github.com/fphilipe/premailer-rails/issues/232#issuecomment-839819705).
+
 ## Small Print
 
 ### Author
@@ -162,21 +168,17 @@ Philipe Fatio ([@fphilipe][fphilipe twitter])
 
 premailer-rails is released under the MIT license. See the [license file].
 
-[build-image]: https://travis-ci.org/fphilipe/premailer-rails.svg
-[build-link]:  https://travis-ci.org/fphilipe/premailer-rails
+[build-image]: https://github.com/fphilipe/premailer-rails/actions/workflows/test.yml/badge.svg
+[build-link]:  https://github.com/fphilipe/premailer-rails/actions/workflows/test.yml
 [gem-image]:   https://badge.fury.io/rb/premailer-rails.svg
 [gem-link]:    https://rubygems.org/gems/premailer-rails
-[deps-image]:  https://gemnasium.com/fphilipe/premailer-rails.svg
-[deps-link]:   https://gemnasium.com/fphilipe/premailer-rails
 [gpa-image]:   https://codeclimate.com/github/fphilipe/premailer-rails.svg
 [gpa-link]:    https://codeclimate.com/github/fphilipe/premailer-rails
-[cov-image]:   https://coveralls.io/repos/fphilipe/premailer-rails/badge.svg
-[cov-link]:    https://coveralls.io/r/fphilipe/premailer-rails
 [tip-image]:   https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.svg
 [tip-link]:    https://www.gittip.com/fphilipe/
 
 [premailer]:    https://github.com/premailer/premailer
-[actionmailer]: https://github.com/rails/rails/tree/master/actionmailer
+[actionmailer]: https://github.com/rails/rails/tree/main/actionmailer
 [nokogiri]:     https://github.com/sparklemotion/nokogiri
 
 [premailer documentation]: https://www.rubydoc.info/gems/premailer/Premailer:initialize

data/VERSION

@@ -1 +1 @@
-1.11.1
+1.12.0

data/examples/rails5/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.2', '>= 5.2.8.1'
+gem 'premailer-rails', path: '../..'

data/{example → examples/rails5}/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

data/{example → examples/rails5}/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/{example → examples/rails5}/config/application.rb

@@ -1,12 +1,15 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
 require 'sprockets/railtie'
 
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
 module Example
   class Application < Rails::Application
+    config.load_defaults 5.2
   end
 end

data/examples/rails5/config/boot.rb

@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/{example → examples/rails5}/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/{example → examples/rails5}/config.ru

@@ -1,4 +1,5 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative 'config/environment'
+
 run Rails.application

data/examples/rails6/.gitignore

@@ -0,0 +1,16 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/examples/rails6/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.1.7'
+gem 'webrick' if RUBY_VERSION >= '3'
+gem 'premailer-rails', path: '../..'

data/examples/rails6/README.md

@@ -0,0 +1,10 @@
+# Example Rails App
+
+To run this app, run:
+
+```shell
+bundle
+bundle exec rails s
+```
+
+Then point your browser at [http://localhost:3000/](http://localhost:3000/).

data/examples/rails6/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks

data/examples/rails6/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link email.css

data/examples/rails6/app/assets/stylesheets/email.css

@@ -0,0 +1,32 @@
+body {
+  background: #efefef;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+p {
+  line-height: 1.4;
+}
+
+.wrap {
+  max-width: 40em;
+  margin: 0 auto;
+  padding: 1em;
+  background: white;
+}
+
+.greeting {
+  text-align: center;
+  font-weight: bold;
+  font-size: 110%;
+}
+
+.footer {
+  font-size: 90%;
+  color: #666;
+}
+
+a {
+  color: green;
+  text-decoration: none;
+  border-bottom: 2px solid green;
+}

data/examples/rails6/app/mailers/example_mailer.rb

@@ -0,0 +1,7 @@
+class ExampleMailer < ActionMailer::Base
+  default from: "from@example.com"
+
+  def test_message
+    mail to: 'to@example.org', subject: 'Test Message'
+  end
+end

data/examples/rails6/app/views/example_mailer/test_message.html.erb

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8'>
+    <%= stylesheet_link_tag :email %>
+  </head>
+  <body>
+    <div class='wrap'>
+      <p class='greeting'>Hi, John Doe</p>
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+      </p>
+      <div class='footer'>
+        To unsubscribe, <a href='http://www.google.com/'>click here</a>.
+      </div>
+    </div>
+  </body>
+</html>

data/examples/rails6/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"

data/examples/rails6/config/application.rb

@@ -0,0 +1,15 @@
+require_relative 'boot'
+
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'sprockets/railtie'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module Example
+  class Application < Rails::Application
+    config.load_defaults 6.1
+  end
+end

data/examples/rails6/config/boot.rb

@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/examples/rails6/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require_relative 'application'
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/examples/rails6/config/environments/development.rb

@@ -0,0 +1,9 @@
+Rails.application.configure do
+  config.cache_classes = false
+  config.eager_load = false
+  config.consider_all_requests_local = true
+  config.action_controller.perform_caching = false
+  config.assets.debug = true
+  config.assets.digest = true
+  config.assets.raise_runtime_errors = true
+end

data/examples/rails6/config/environments/production.rb

@@ -0,0 +1,9 @@
+Rails.application.configure do
+  config.cache_classes = true
+  config.eager_load = true
+  config.consider_all_requests_local = false
+  config.action_controller.perform_caching = true
+  config.assets.compile = false
+  config.assets.digest = true
+  config.log_level = :info
+end

data/examples/rails6/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  root to: redirect('rails/mailers/example_mailer/test_message')
+end

data/examples/rails6/config.ru

@@ -0,0 +1,6 @@
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application
+Rails.application.load_server

data/examples/rails6/test/mailers/previews/example_mailer_preview.rb

@@ -0,0 +1,5 @@
+class ExampleMailerPreview < ActionMailer::Preview
+  def test_message
+    ExampleMailer.test_message
+  end
+end

data/examples/rails7-propshaft/.gitignore

@@ -0,0 +1,16 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/examples/rails7-propshaft/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.0.4'
+gem 'propshaft'
+gem 'webrick' if RUBY_VERSION >= '3'
+gem 'premailer-rails', path: '../..'

data/examples/rails7-propshaft/README.md

@@ -0,0 +1,10 @@
+# Example Rails App
+
+To run this app, run:
+
+```shell
+bundle
+bundle exec rails s
+```
+
+Then point your browser at [http://localhost:3000/](http://localhost:3000/).

data/examples/rails7-propshaft/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks

data/examples/rails7-propshaft/app/assets/stylesheets/email.css

@@ -0,0 +1,32 @@
+body {
+  background: #efefef;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+p {
+  line-height: 1.4;
+}
+
+.wrap {
+  max-width: 40em;
+  margin: 0 auto;
+  padding: 1em;
+  background: white;
+}
+
+.greeting {
+  text-align: center;
+  font-weight: bold;
+  font-size: 110%;
+}
+
+.footer {
+  font-size: 90%;
+  color: #666;
+}
+
+a {
+  color: green;
+  text-decoration: none;
+  border-bottom: 2px solid green;
+}

data/examples/rails7-propshaft/app/mailers/example_mailer.rb

@@ -0,0 +1,7 @@
+class ExampleMailer < ActionMailer::Base
+  default from: "from@example.com"
+
+  def test_message
+    mail to: 'to@example.org', subject: 'Test Message'
+  end
+end

data/examples/rails7-propshaft/app/views/example_mailer/test_message.html.erb

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8'>
+    <%= stylesheet_link_tag :email %>
+  </head>
+  <body>
+    <div class='wrap'>
+      <p class='greeting'>Hi, John Doe</p>
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+      </p>
+      <div class='footer'>
+        To unsubscribe, <a href='http://www.google.com/'>click here</a>.
+      </div>
+    </div>
+  </body>
+</html>

data/examples/rails7-propshaft/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"

data/examples/rails7-propshaft/config/application.rb

@@ -0,0 +1,14 @@
+require_relative 'boot'
+
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module Example
+  class Application < Rails::Application
+    config.load_defaults 7.0
+  end
+end

data/examples/rails7-propshaft/config/boot.rb

@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/examples/rails7-propshaft/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require_relative 'application'
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/examples/rails7-propshaft/config/environments/development.rb

@@ -0,0 +1,9 @@
+Rails.application.configure do
+  config.cache_classes = false
+  config.eager_load = false
+  config.consider_all_requests_local = true
+  config.action_controller.perform_caching = false
+  config.assets.debug = true
+  config.assets.digest = true
+  config.assets.raise_runtime_errors = true
+end

data/examples/rails7-propshaft/config/environments/production.rb

@@ -0,0 +1,9 @@
+Rails.application.configure do
+  config.cache_classes = true
+  config.eager_load = true
+  config.consider_all_requests_local = false
+  config.action_controller.perform_caching = true
+  config.assets.compile = false
+  config.assets.digest = true
+  config.log_level = :info
+end

data/examples/rails7-propshaft/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  root to: redirect('rails/mailers/example_mailer/test_message')
+end

data/examples/rails7-propshaft/config.ru

@@ -0,0 +1,6 @@
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application
+Rails.application.load_server

data/examples/rails7-propshaft/test/mailers/previews/example_mailer_preview.rb

@@ -0,0 +1,5 @@
+class ExampleMailerPreview < ActionMailer::Preview
+  def test_message
+    ExampleMailer.test_message
+  end
+end