fx_awesome_mails 0.5.2 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1502237c027c70437b18cc987a02ccadd120adaeef6a32559f7f065e1514b669
-  data.tar.gz: 592272493ca097c5fc96c2a852436726dadc0cecbda97c654bb8304aa6abdd68
+  metadata.gz: 150486384ec88d98e3e3db07762c6aa9dd5c66ddef2115e762aeed824f80a529
+  data.tar.gz: f7dfb71da172e702144ba4f6e9bc30ef48199ab8f1206b2846f15a0a6b4160ff
 SHA512:
-  metadata.gz: 69679b37d77c70d7fda79cfe384b4ac9756f072480f0f3f1a0a53fe04127e8d1107912d4fc74c4c19876c21ae3641e715e8fddde4211417bb0a536c0f33d93db
-  data.tar.gz: b0c1c294d8562793bd35bd1bb56f2a1eee34d6aa831269954984c4ca316d0a1a5887fcd1e7a2f7f97fa74a54e3526f74897933ab63b815af3602694974e9c1f6
+  metadata.gz: e52480877c2739a99d262f384f5ce2c96c3cd114220752d474f522d94318746cfa2fa65cf2aa4b28831da3588d346c959da38e00ef979d7c8c330ebac83a54c2
+  data.tar.gz: 78f2d6a1f91f4901c6c2bb62e2088afa357480e8a98dd66be692fa7caedb8c80588b6eff511fcc472a99eacfd6d9486712e1eeb25b4c9fb0d7cb3207bb70f68e

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.2'
+  VERSION = '0.5.6'
 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
-    
-    String.include FXAwesomeMails::CoreExtensions::Merging
-    Hash.include   FXAwesomeMails::CoreExtensions::Hash::Merging
+
+    using FXAwesomeMails::Refinements
 
     def preheader(text)
       "<div style='display: none; max-height: 0px; overflow: hidden;'>
@@ -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)}
@@ -244,11 +243,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fx_awesome_mails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.6
 platform: ruby
 authors:
 - Felix Gebhard
@@ -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