fx_awesome_mails 0.5.4 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 182d15e812f86ce005073951b8a5a32ac647021bbe101bd0dd60def54db69982
-  data.tar.gz: 8e66c5acd82735c5cb52b26997dc3b6fa4a347e56651f8b787d028c3bfcb5d53
+  metadata.gz: 69502109d0dfdc232e7a275be5c63898821f38161cf52ef9920d7d32f7e2eab4
+  data.tar.gz: e51f020211f9d25a61b5a13dff94f2d427a7fb225cff0d92dde0403e1f6cdbd9
 SHA512:
-  metadata.gz: 16c3566479da7798202aa7097063e99fb8d050c17633ceee5714486a48a3134e269fc33a3fc21283aa9a0704340b74e7b3c6dd217f3dde71e7ea9a74b3d5779c
-  data.tar.gz: 585762552a960b0383c56613a7b2fea161d4613b05f5e369ab8d0e23d5c3ced183ba2edc2a68d7830c799bf8a74e3f1bb8fe167120f5061e2d4c956c36159cae
+  metadata.gz: a3b168d06977bab1952007ba7049b849ce5de7786ed300355b7a6cb9389534e55c05ef660eb66b2ac799d13da1e325de9521f834ef835668763fc133f4745670
+  data.tar.gz: 0dd3e613ad591dd73565f4db39189d4a9512f3f4db488acb379a4e3fa7d41e09a645a1a063d9801705b1c3b026c9b232b2c3d3d8d87f02a3614508463dad0148

data/lib/fx_awesome_mails/refinements.rb

@@ -0,0 +1,35 @@
+module FXAwesomeMails
+  module Refinements
+    refine String do
+      def to_css_hash
+        Hash[split(';').map { _1.split(':').map(&:strip) }]
+      end
+  
+      def merge_css_options(second, key)
+        return self&.strip if second.blank?
+        return second&.strip if self.blank?
+        
+        case key
+        when :style
+          return self.strip.to_css_hash.deep_merge_v2(second.strip.to_css_hash).map {|k,v| [k,v].join(':') }.join(';')
+        when :class
+          self.strip.split(' ').union(second.strip.split(' ')).join(' ')
+        else
+          return ""
+        end
+      end
+    end
+  
+    refine Hash do
+      def deep_merge_v2(second)
+        merger = proc { |_, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+        merge(second.to_h, &merger)
+      end
+    
+      def merge_email_options(second)
+        merger = proc { |k, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : [:style, :class].include?(k) ? v1.merge_css_options(v2, k) : v2}
+        merge(second.to_h, &merger)
+      end 
+    end
+  end
+end

data/lib/fx_awesome_mails/version.rb

@@ -1,3 +1,3 @@
 module FXAwesomeMails
-  VERSION = '0.5.4'
+  VERSION = '0.5.8'
 end

data/lib/fx_awesome_mails/view_helpers.rb

@@ -1,9 +1,8 @@
-require 'fx_awesome_mails/core_extensions'
+require 'fx_awesome_mails/refinements'
 module FXAwesomeMails
   module EmailHelpers
 
-    Hash.include FXAwesomeMails::CoreExtensions::Hash::Merging
-    String.include FXAwesomeMails::CoreExtensions::String::Merging
+    using FXAwesomeMails::Refinements
 
     def preheader(text)
       "<div style='display: none; max-height: 0px; overflow: hidden;'>
@@ -130,12 +129,12 @@ module FXAwesomeMails
       delegate :capture, :content_tag, :link_to, :link_to_if, :link_to_if_true, :image_tag, :to => :parent
 
       def horizontal(height = '20', **options)
-        options = {valign: 'top', class: '',style: ""}.merge_email_options(options)
+        options = {valign: 'top', class: '',style: "text-align:left;font-size:1px;line-height:1px"}.merge_email_options(options)
         content_tag('th', '&nbsp;'.html_safe, height: height, valign: "#{options[:valign]}", style: "#{options[:style]}", class: "#{options[:class]} horizontal-gutter", bgcolor: "#{options[:style].to_s.to_css_hash["background-color"]}")
       end
 
       def vertical(width = '20', **options)
-        options = {valign: 'top', class: '',style: ""}.merge_email_options(options)
+        options = {valign: 'top', class: '',style: "text-align:left;font-size:1px;line-height:1px"}.merge_email_options(options)
         content_tag('th', '&nbsp;'.html_safe, width: width, valign: "#{options[:valign]}", style: "#{options[:style]}", class: "#{options[:class]} vertical-gutter", bgcolor: "#{options[:style].to_s.to_css_hash["background-color"]}")
       end
     end
@@ -164,7 +163,7 @@ module FXAwesomeMails
 
       def email_image_tag(source: nil, **options, &block)
         options = {alt: '', link_url: nil, width: 130, height: 50, valign: 'top', align: 'left', class: '', style: "background-color: #FFFFFF;outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; display: block; border: none" }.merge_email_options(options)
-        html = "<th valign='#{options[:avlign]}' style='text-align:left' class='#{options[:class]} mobile-display-table-footer-group image-container' bgcolor='#{options[:style].to_s.to_css_hash["background-color"]}' align='#{options[:align]}'>"
+        html = "<th valign='#{options[:valign]}' style='text-align:left' class='#{options[:class]} mobile-display-table-footer-group image-container' bgcolor='#{options[:style].to_s.to_css_hash["background-color"]}' align='#{options[:align]}'>"
         html << link_to_if_true(options[:link_url].present?, options[:link_url], target: '_blank') do
           image_tag(source, style: options[:style], width: "#{options[:width]}", height: "#{options[:height]}", alt: "#{options[:alt]}")
         end
@@ -184,7 +183,7 @@ module FXAwesomeMails
 
       def self.vertical_grid(_capture_helper, **options, &block)
         options = { valign: 'top', style: "text-align: left" }.merge_email_options(options)
-        _capture_helper.content_tag('th', valign: "#{options[:valign]}", style: "#{options[:style]}", class: "text-container #{options[:class]}") do
+        _capture_helper.content_tag('th', valign: "#{options[:valign]}", style: "#{options[:style]}", class: "vertical-grid #{options[:class]}") do
           "<table cellpadding='0' cellspacing='0' border='0' width='100%' style='min-width:100%' role='presentation'>
             <tbody>
               #{_capture_helper.capture(VerticalGrid.new(_capture_helper), &block)}
@@ -229,7 +228,8 @@ module FXAwesomeMails
       delegate :capture, :content_tag, :link_to, :link_to_if, :link_to_if_true, :image_tag, :to => :parent
 
       def self.horizontal_grid(_capture_helper, **options, &block)
-        "<th valign='top' style='text-align:left' class='horizontal-grid'>
+        options = { valign: 'top', style: "text-align: left" }.merge_email_options(options)
+        "<th valign='#{options[:valign]}' style='#{options[:style]}' class='#{options[:class]} horizontal-grid'>
           <table cellpadding='0' cellspacing='0' border='0' width='100%' style='min-width:100%' role='presentation'>
             <tbody>
               <tr>
@@ -244,11 +244,8 @@ module FXAwesomeMails
         "#{Gutter.new(parent).vertical(...)}".html_safe
       end
 
-      def text(text = nil, **options, &block)
-        options = { valign: 'top', style: "mso-line-height-rule: exactly; text-align: left; font-family: Arial, sans-serif; font-size: 15px; line-height: 18px; font-weight: normal; color: #999999" }.merge_email_options(options)
-        content_tag('th', valign: "#{options[:valign]}", style: "#{options[:style]}", class: "text-container #{options[:class]}") do
-          block_given? ? capture(&block) : text 
-        end
+      def text(...)
+        "#{Text.new(parent).text(...)}".html_safe
       end
 
       def image(...)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fx_awesome_mails
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.8
 platform: ruby
 authors:
 - Felix Gebhard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,8 +40,8 @@ files:
 - README.md
 - Rakefile
 - lib/fx_awesome_mails.rb
-- lib/fx_awesome_mails/core_extensions.rb
 - lib/fx_awesome_mails/railtie.rb
+- lib/fx_awesome_mails/refinements.rb
 - lib/fx_awesome_mails/version.rb
 - lib/fx_awesome_mails/view_helpers.rb
 - lib/tasks/fx_awesome_mails_tasks.rake

data/lib/fx_awesome_mails/core_extensions.rb

@@ -1,39 +0,0 @@
-module FXAwesomeMails
-  module CoreExtensions
-    module Hash
-      module Merging
-        def deep_merge_v2(second)
-          merger = proc { |_, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
-          merge(second.to_h, &merger)
-        end
-      
-        def merge_email_options(second)
-          merger = proc { |k, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : [:style, :class].include?(k) ? v1.merge_css_options(v2, k) : v2}
-          merge(second.to_h, &merger)
-        end
-      end
-    end
-
-    module String
-      module Merging
-        def merge_css_options(second, key)
-          return self&.strip if second.blank?
-          return second&.strip if self.blank?
-          
-          case key
-          when :style
-            return self.strip.to_css_hash.deep_merge_v2(second.strip.to_css_hash).map {|k,v| [k,v].join(':') }.join(';')
-          when :class
-            self.strip.split(' ').union(second.strip.split(' ')).join(' ')
-          else
-            return ""
-          end
-        end
-        
-        def to_css_hash
-          Hash[self.split(';').map { _1.split(':').map(&:strip) }]
-        end
-      end
-    end
-  end
-end