activemail 1.2.2 → 2.0.0

data/lib/generators/activemail/templates/mailer_layout.html.inky-slim

@@ -8,8 +8,6 @@ html lang=I18n.locale xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-
     meta name="supported-color-schemes" content="light dark"
     | <!--[if mso]><noscript><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch></o:OfficeDocumentSettings></xml></noscript><![endif]-->
     = activemail_inline_styles
-    / Fallback for when activemail_inline_styles cannot read the compiled asset.
-    = stylesheet_link_tag "activemail/activemail", media: "all"
   body style="margin:0;padding:0;word-spacing:normal;"
     div role="article" aria-roledescription="email" lang=I18n.locale style="width:100%;"
       container

data/lib/tasks/activemail.rake

@@ -20,15 +20,14 @@ namespace :activemail do
     task render_all: :environment do
       require 'activemail/quality/render_all'
 
-      config = ActiveMail::Quality.config
-      output_root = defined?(Rails) && Rails.respond_to?(:root) ? Rails.root.join(config.output_dir) : Pathname(config.output_dir)
-      result = ActiveMail::Quality::RenderAll.new(output_root: output_root, config: config).call
-      puts "Rendered #{result.rendered} email(s) into #{output_root}"
+      root = defined?(Rails) && Rails.respond_to?(:root) && Rails.root ? Rails.root : Pathname.pwd
+      result = ActiveMail::Quality::RenderAll.new(root: root, config: ActiveMail::Quality.config).call
+      puts "Rendered #{result.rendered} email(s) into #{result.output_root}"
       # A green run on zero previews would silently verify nothing — make it visible.
       warn '[activemail] WARNING: no mailer previews were discovered — nothing was checked.' if result.discovered.zero?
       result.render_failures.each { |key, error| puts "  render failed: #{key}: #{error}" }
       result.guard_failures.each do |key, violations|
-        puts "  guard failed: #{key}", violations.map { |v| "    - [#{v.rule}] #{v.message}" }.join("\n")
+        puts "  guard failed: #{key}", violations.map { |v| "    - #{v}" }.join("\n")
       end
       abort "\n#{result.broken_required.size} required preview(s) failed: #{result.broken_required.join(', ')}" if result.broken_required.any?
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemail
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Advitam
@@ -16,6 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -23,6 +26,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: premailer
   requirement: !ruby/object:Gem::Requirement
@@ -30,6 +36,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.21'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -37,20 +46,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.21'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.10600
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.10600
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: |
   ActiveMail is a plug & play gem for sending beautiful emails, written entirely in Ruby.
   It turns simple, semantic tags into responsive, bulletproof email markup and ships with
@@ -63,6 +81,7 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- UPGRADING.md
 - app/assets/stylesheets/activemail/_activemail_tokens.scss.erb
 - app/assets/stylesheets/activemail/_components.scss
 - app/assets/stylesheets/activemail/_dark.scss
@@ -75,9 +94,15 @@ files:
 - app/views/layouts/activemail/_head.html.inky-erb
 - app/views/layouts/activemail/mailer.html.inky-erb
 - lib/activemail.rb
+- lib/activemail/asset_pipeline.rb
+- lib/activemail/asset_pipeline/base.rb
+- lib/activemail/asset_pipeline/null.rb
+- lib/activemail/asset_pipeline/propshaft.rb
+- lib/activemail/asset_pipeline/sprockets.rb
 - lib/activemail/components/base.rb
 - lib/activemail/components/block_grid.rb
 - lib/activemail/components/button.rb
+- lib/activemail/components/button_renderer.rb
 - lib/activemail/components/callout.rb
 - lib/activemail/components/center.rb
 - lib/activemail/components/columns.rb
@@ -85,32 +110,38 @@ files:
 - lib/activemail/components/cta.rb
 - lib/activemail/components/h_line.rb
 - lib/activemail/components/info_box.rb
-- lib/activemail/components/inky.rb
 - lib/activemail/components/menu.rb
 - lib/activemail/components/menu_item.rb
 - lib/activemail/components/row.rb
 - lib/activemail/components/spacer.rb
+- lib/activemail/components/table_component.rb
 - lib/activemail/components/wrapper.rb
 - lib/activemail/configuration.rb
+- lib/activemail/errors.rb
+- lib/activemail/inliner.rb
 - lib/activemail/inliner/base.rb
-- lib/activemail/inliner/interceptor.rb
 - lib/activemail/inliner/null.rb
 - lib/activemail/inliner/premailer.rb
 - lib/activemail/inliner/roadie.rb
 - lib/activemail/libxml.rb
 - lib/activemail/parse_error_reporter.rb
+- lib/activemail/pipeline.rb
 - lib/activemail/quality.rb
+- lib/activemail/quality/builtin_rules.rb
 - lib/activemail/quality/configuration.rb
 - lib/activemail/quality/guard.rb
 - lib/activemail/quality/minitest.rb
+- lib/activemail/quality/output_dir.rb
 - lib/activemail/quality/preview_renderer.rb
 - lib/activemail/quality/render_all.rb
 - lib/activemail/quality/rspec.rb
-- lib/activemail/rails/compiled_stylesheet.rb
+- lib/activemail/quality/rule.rb
 - lib/activemail/rails/engine.rb
+- lib/activemail/rails/rendering.rb
 - lib/activemail/rails/template_handler.rb
 - lib/activemail/tokens.rb
 - lib/activemail/tokens/button_style.rb
+- lib/activemail/tokens/defaults.rb
 - lib/activemail/tokens/scss_serializer.rb
 - lib/activemail/version.rb
 - lib/generators/activemail/component_generator.rb
@@ -145,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Plug & play gem to send modern emails, entirely in Ruby, with dark mode and
   more out of the box.

data/lib/activemail/components/inky.rb

@@ -1,18 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require_relative 'base'
-
-module ActiveMail
-  module Components
-    # Renders a bare <tr>, useful inside hand-written tables.
-    class Inky < Base
-      extend T::Sig
-
-      sig { override.params(_node: Nokogiri::XML::Node, inner: String).returns(String) }
-      def transform(_node, inner)
-        %(<tr>#{inner}</tr>)
-      end
-    end
-  end
-end

data/lib/activemail/inliner/interceptor.rb

@@ -1,51 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require 'sorbet-runtime'
-
-module ActiveMail
-  module Inliner
-    class Interceptor
-      class << self
-        extend T::Sig
-
-        sig { params(message: T.untyped).void }
-        def delivering_email(message)
-          config = ActiveMail.configuration
-          # Runtime check: an engine initializer runs before the host's, so a
-          # boot-time flag read would always see the default.
-          return unless config.register_inline_interceptor
-
-          inliner = config.resolved_inliner
-          return if inliner.noop?
-
-          html_parts(message).each do |part|
-            part.body = inliner.inline(part.body.to_s)
-          rescue StandardError => e
-            # Surface which inliner failed; do not swallow (a silently non-inlined
-            # mail is worse). Ruby sets e as #cause, preserving the original backtrace.
-            raise ActiveMail::Inliner::Error, "[#{inliner.class}] CSS inlining failed: #{e.message}"
-          end
-        end
-
-        private
-
-        # The html part(s) to inline: a single text/html message, or every text/html
-        # part of a multipart message. Attachments are never inlined.
-        sig { params(message: T.untyped).returns(T::Array[T.untyped]) }
-        def html_parts(message)
-          return message.all_parts.select { |part| html_body_part?(part) } if message.multipart?
-
-          html_body_part?(message) ? [message] : []
-        end
-
-        sig { params(part: T.untyped).returns(T::Boolean) }
-        def html_body_part?(part)
-          return false unless part.respond_to?(:mime_type) && part.mime_type == 'text/html'
-
-          !(part.respond_to?(:attachment?) && part.attachment?)
-        end
-      end
-    end
-  end
-end

data/lib/activemail/rails/compiled_stylesheet.rb

@@ -1,62 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require 'sorbet-runtime'
-
-module ActiveMail
-  # Reads a compiled CSS asset's bytes (Sprockets or Propshaft, by duck-type) — the
-  # bytes, not a digest URL, are what the Premailer adapter needs to inline.
-  module CompiledStylesheet
-    class << self
-      extend T::Sig
-
-      # '' (not nil) on a miss: callers embed the result verbatim, and a missing
-      # asset must degrade to an empty <style>, never interpolate "nil" into HTML.
-      sig { params(logical_path: String).returns(String) }
-      def read(logical_path)
-        sprockets_source(logical_path) || propshaft_source(logical_path) || ''
-      end
-
-      private
-
-      # Sprockets: config.assets.compile (dev) resolves logical paths in-memory;
-      # precompiled (prod) resolves through the manifest. #find_asset covers both.
-      sig { params(logical_path: String).returns(T.nilable(String)) }
-      def sprockets_source(logical_path)
-        assets = rails_assets_environment
-        return unless assets.respond_to?(:find_asset)
-
-        asset = assets.find_asset(logical_path)
-        asset&.source&.to_s
-      end
-
-      # Propshaft: the load_path resolves a logical path to a compiled file on disk.
-      sig { params(logical_path: String).returns(T.nilable(String)) }
-      def propshaft_source(logical_path)
-        assets = rails_assets
-        load_path = assets.respond_to?(:load_path) ? assets.load_path : nil
-        return unless load_path.respond_to?(:find)
-
-        asset = load_path.find(logical_path)
-        asset&.path && File.exist?(asset.path) ? File.read(asset.path) : nil
-      end
-
-      # config.assets.environment is the Sprockets::Environment; absent under Propshaft.
-      sig { returns(T.untyped) }
-      def rails_assets_environment
-        assets = rails_assets
-        assets.respond_to?(:environment) ? assets.environment : nil
-      end
-
-      sig { returns(T.untyped) }
-      def rails_assets
-        return unless Object.const_defined?(:Rails)
-
-        rails = Object.const_get(:Rails)
-        app = rails.respond_to?(:application) ? rails.application : nil
-        config = app&.config
-        config.respond_to?(:assets) ? config.assets : nil
-      end
-    end
-  end
-end