fx_awesome_mails 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 182d15e812f86ce005073951b8a5a32ac647021bbe101bd0dd60def54db69982
-  data.tar.gz: 8e66c5acd82735c5cb52b26997dc3b6fa4a347e56651f8b787d028c3bfcb5d53
+  metadata.gz: bd2b4740a0862d162ca275c62ebaa8796a72570f6f7efa4c990ffdc0c70eb4d2
+  data.tar.gz: 3cbd818cad4ef2c7f46467e50e6eec5578cf333d001215c9caa78f9cbf09ab97
 SHA512:
-  metadata.gz: 16c3566479da7798202aa7097063e99fb8d050c17633ceee5714486a48a3134e269fc33a3fc21283aa9a0704340b74e7b3c6dd217f3dde71e7ea9a74b3d5779c
-  data.tar.gz: 585762552a960b0383c56613a7b2fea161d4613b05f5e369ab8d0e23d5c3ced183ba2edc2a68d7830c799bf8a74e3f1bb8fe167120f5061e2d4c956c36159cae
+  metadata.gz: b164d6adbd4f1a04bc8ce92f1f35a400cf8063d4fb324b2c354c46a1ee93593200611e2bdc4107f1af6ba34daeef973e9820b5aa54109203a83b3f1668837fc5
+  data.tar.gz: 65885c7bccebce3a048bb05a311ed929f03082bbb5c9ffec1ca14e459a702dfc992969e11c568be86fc38cf4c20d06005230ee4b5a51daebce8ebb4e59ccc5ff

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.5'
 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;'>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fx_awesome_mails
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 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