inky-rb 1.3.8.0 → 1.4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48af980ab18545c232dc3fd4f4ee2ebedbfeca066aabe1faa4c3455c2aa4c152
-  data.tar.gz: f0b985c040dea524b0004cc90edb81ce8f4920e135d9def3253896a38b75099c
+  metadata.gz: 8deedcc1e292b8b0f12de420af6d3493444416da805707ce7dd1e992b3a5768b
+  data.tar.gz: 6859292e358b42009d900b468fbe2c6cb748631f021c9264c5ce441b2b69a8bb
 SHA512:
-  metadata.gz: 3de872ab2036bd2ffcfb7c6c13aa8a58aee0b208e89da68281547e60a61acc8eaaf7b7f587d08d9672b6c84ad18219e61d7c227a71d47b3a6396c59ebb9dd840
-  data.tar.gz: f278877cc37ddf979b7f68fb35d3f333881095203eb40a95b330e217c28cc9708ba658a5466fcb2b171ace3ffd83b60270ec64b781d6a9b6ccdd64a37d728223
+  metadata.gz: cc424f30789ff30c806b9c059350c35908f464ab0cf5afd4a8dfd6157a349b56714fa192aae54846a005527709f1bea71076c0caec557988290a1d16c5448bf3
+  data.tar.gz: 55880e2d1d5ea9ff137b0f851c52c4ba82e89e43697c63cdd6e77df05ef036df522c0715e662c25e5659589efb7e6c883428e8b93979d2f24fa659348a51ff56

data/inky.gemspec

@@ -5,11 +5,11 @@ require 'inky/rails/version'
 Gem::Specification.new do |s|
   s.name        = 'inky-rb'
   s.version     = Inky::Rails::VERSION
-  s.summary     = 'Inky is an HTML-based templating language that converts simple HTML into complex, responsive email-ready HTML. Designed for Foundation for Emails, a responsive email framework from ZURB.  '
-  s.description = 'Inky is an HTML-based templating language that converts simple HTML into complex, responsive email-ready HTML. Designed for Foundation for Emails, a responsive email framework from ZURB.  '
-  s.authors     = ["ZURB"]
-  s.email       = ['foundation@zurb.com']
-  s.homepage    = 'https://github.com/zurb/inky-rb'
+  s.summary     = 'Inky is an HTML-based templating language that converts simple HTML into complex, responsive email-ready HTML. Designed for Foundation for Emails'
+  s.description = 'Inky is an HTML-based templating language that converts simple HTML into complex, responsive email-ready HTML. Designed for Foundation for Emails'
+  s.authors     = ["Foundation"]
+  s.email       = ['contact@get.foundation']
+  s.homepage    = 'https://github.com/foundation/inky-rb'
   s.licenses    = ['MIT']
 
   s.files         = `git ls-files -z`.split("\x0")

data/lib/inky/component_factory.rb

@@ -45,21 +45,22 @@ module Inky
 
     def _transform_button(component, inner)
       expand = _has_class(component, 'expand')
+      attributes = _pass_through_attributes(component)
       if component.attr('href')
         target = _target_attribute(component)
         extra = ' align="center" class="float-center"' if expand
-        inner = %{<a href="#{component.attr('href')}"#{target}#{extra}>#{inner}</a>}
+        inner = %{<a #{attributes}href="#{component.attr('href')}"#{target}#{extra}>#{inner}</a>}
       end
       inner = "<center>#{inner}</center>" if expand
 
       classes = _combine_classes(component, 'button')
       expander = '<td class="expander"></td>' if expand
-      %{<table class="#{classes}"><tr><td><table><tr><td>#{inner}</td></tr></table></td>#{expander}</tr></table>}
+      %{<table class="#{classes}"><tbody><tr><td><table><tbody><tr><td>#{inner}</td></tr></tbody></table></td>#{expander}</tr></tbody></table>}
     end
 
     def _transform_menu(component, inner)
       attributes = _combine_attributes(component, 'menu')
-      %{<table #{attributes}><tr><td><table><tr>#{inner}</tr></table></td></tr></table>}
+      %{<table #{attributes}><tbody><tr><td><table><tbody><tr>#{inner}</tr></tbody></table></td></tr></tbody></table>}
     end
 
     def _transform_menu_item(component, inner)
@@ -96,12 +97,12 @@ module Inky
       subrows = component.elements.css(".row").to_a.concat(component.elements.css("row").to_a)
       expander = %{<th class="expander"></th>} if large_size.to_i == column_count && subrows.empty?
 
-      %{<#{INTERIM_TH_TAG} class="#{classes}" #{_pass_through_attributes(component)}><table><tr><th>#{inner}</th>#{expander}</tr></table></#{INTERIM_TH_TAG}>}
+      %{<#{INTERIM_TH_TAG} class="#{classes}" #{_pass_through_attributes(component)}><table><tbody><tr><th>#{inner}</th>#{expander}</tr></tbody></table></#{INTERIM_TH_TAG}>}
     end
 
     def _transform_block_grid(component, inner)
       classes = _combine_classes(component, "block-grid up-#{component.attr('up')}")
-      %{<table class="#{classes}"><tr>#{inner}</tr></table>}
+      %{<table class="#{classes}"><tbody><tr>#{inner}</tr></tbody></table>}
     end
 
     def _transform_center(component, _inner)
@@ -121,12 +122,12 @@ module Inky
     def _transform_callout(component, inner)
       classes = _combine_classes(component, 'callout-inner')
       attributes = _pass_through_attributes(component)
-      %{<table #{attributes}class="callout"><tr><th class="#{classes}">#{inner}</th><th class="expander"></th></tr></table>}
+      %{<table #{attributes}class="callout"><tbody><tr><th class="#{classes}">#{inner}</th><th class="expander"></th></tr></tbody></table>}
     end
 
     def _transform_spacer(component, _inner)
       classes = _combine_classes(component, 'spacer')
-      build_table = ->(size, extra) { %{<table class="#{classes} #{extra}"><tbody><tr><td height="#{size}" style="font-size:#{size}px;line-height:#{size}px;">&#xA0;</td></tr></tbody></table>} }
+      build_table = ->(size, extra) { %{<table class="#{classes} #{extra}"><tbody><tr><td height="#{size}" style="font-size:#{size}px;line-height:#{size}px;">&nbsp;</td></tr></tbody></table>} }
       size = component.attr('size')
       size_sm = component.attr('size-sm')
       size_lg = component.attr('size-lg')
@@ -140,9 +141,15 @@ module Inky
       end
     end
 
+    def _transform_h_line(component, _inner)
+      classes = _combine_classes(component, 'h-line')
+      attributes = _pass_through_attributes(component)
+      %{<table #{attributes}class="#{classes}"><tr><th>&nbsp;</th></tr></table>}
+    end
+
     def _transform_wrapper(component, inner)
       attributes = _combine_attributes(component, 'wrapper')
-      %{<table #{attributes} align="center"><tr><td class="wrapper-inner">#{inner}</td></tr></table>}
+      %{<table #{attributes} align="center"><tbody><tr><td class="wrapper-inner">#{inner}</td></tr></tbody></table>}
     end
   end
 end

data/lib/inky/rails/version.rb

@@ -1,6 +1,6 @@
 module Inky
   module Rails
-    VERSION = '1.3.8.0'.freeze
+    VERSION = '1.4.2.1'.freeze
   end
   NODE_VERSION, GEM_VERSION = Rails::VERSION.rpartition('.').map(&:freeze)
 end

data/lib/inky.rb

@@ -20,7 +20,8 @@ module Inky
         callout: 'callout',
         spacer: 'spacer',
         wrapper: 'wrapper',
-        menu_item: 'item'
+        menu_item: 'item',
+        h_line: 'h-line',
       }.merge(::Inky.configuration.components).merge(options[:components] || {})
 
       self.component_lookup = components.invert
@@ -31,6 +32,9 @@ module Inky
     end
 
     def release_the_kraken(html_string)
+      # Force conversion to string. (required for Rails 7.1+)
+      html_string = html_string.to_s
+
       if html_string.encoding.name == "ASCII-8BIT"
         html_string.force_encoding('utf-8') # transform_doc barfs if encoding is ASCII-8bit
       end
@@ -41,6 +45,7 @@ module Inky
       transform_doc(html)
       string = html.to_html
       string.gsub!(INTERIM_TH_TAG_REGEX, 'th')
+      string.gsub!(' ', ' ') # Convert non-breaking spaces to explicit   entity
       Inky::Core.re_inject_raws(string, raws)
     end
 

data/spec/cases/button/with_extra_attr.inky

@@ -0,0 +1,3 @@
+<button foo="bar">
+  A label
+</button>

data/spec/cases/button/with_link.inky

@@ -1,3 +1,3 @@
-<button href="http://example.com" class="some classes" foo="bar">
+<button href="http://example.com" class="some classes">
 	A label
 </button>

data/spec/cases/button/with_link_and_extra_attr.inky

@@ -0,0 +1,3 @@
+<button href="http://example.com" foo="bar">
+	A label
+</button>

data/spec/cases/h_line/basic.inky

@@ -0,0 +1 @@
+<h-line/>

data/spec/cases/h_line/multiple.inky

@@ -0,0 +1,8 @@
+<!-- pending https://github.com/foundation/inky/issues/137 --->
+Hello
+<h-line/>
+World
+<h-line foo="bar"/>
+Bye
+<h-line class="x" foo="bar"/>
+Zzz

data/spec/cases/h_line/with_attr.inky

@@ -0,0 +1,2 @@
+<!-- pending https://github.com/foundation/inky/issues/137 --->
+<h-line foo="bar"/>

data/spec/cases/spacer/with_attr.inky

@@ -0,0 +1,6 @@
+<!-- pending https://github.com/foundation/inky/issues/135 --->
+<div>
+  Stuff on top
+  <spacer foo="bar"/>
+  Stuff on bottom
+</div>

data/spec/cases/spacer/with_size.inky

@@ -1,5 +1,5 @@
 <div>
   Stuff on top
-  <spacer class="some classes" foo="bar" size="42"/>
+  <spacer class="some classes" size="42"/>
   Stuff on bottom
 </div>

data/spec/cases/spacer/with_size_lg.inky

@@ -1,4 +1,4 @@
 <div>
   Stuff on top
-  <spacer class="some classes" foo="bar" size-lg="666"/>
+  <spacer class="some classes" size-lg="666"/>
 <p>Stuff on bottom</p>

data/spec/cases/spacer/with_size_sm.inky

@@ -1,5 +1,5 @@
 <div>
   Stuff on top
-  <spacer class="some classes" foo="bar" size-sm="42"></spacer>
+  <spacer class="some classes" size-sm="42"></spacer>
   Stuff on bottom
 </div>

data/spec/cases/spacer/with_size_sm_and_lg.inky

@@ -1,5 +1,5 @@
 <div>
   Stuff on top
-  <spacer class="some classes" foo="bar" size-sm="42" size-lg="666"/>
+  <spacer class="some classes" size-sm="42" size-lg="666"/>
   Stuff on bottom
 </div>

data/spec/cases/spacer/with_sizes_and_attr.inky

@@ -0,0 +1,6 @@
+<!-- pending https://github.com/foundation/inky/issues/135 --->
+<div>
+  Stuff on top
+  <spacer class="some classes" foo="bar" size-sm="42" size-lg="666"/>
+  Stuff on bottom
+</div>

data/spec/components_spec.rb

@@ -31,19 +31,19 @@ RSpec.describe "Center" do
 
     expected = <<-HTML
       <center>
-        <table class="float-center menu " align="center">
+        <table class="float-center menu " align="center"><tbody>
           <tr>
             <td>
-              <table>
+              <table><tbody>
                 <tr>
                   <th class="float-center menu-item">
                     <a href="#"></a>
                   </th>
                 </tr>
-              </table>
+              </tbody></table>
             </td>
           </tr>
-        </table>
+        </tbody></table>
       </center>
     HTML
 
@@ -55,17 +55,17 @@ RSpec.describe "Button" do
   it "creates a simple button" do
     input = '<button href="http://zurb.com">Button</button>'
     expected = <<-HTML
-      <table class="button">
+      <table class="button"><tbody>
         <tr>
           <td>
-            <table>
+            <table><tbody>
               <tr>
                 <td><a href="http://zurb.com">Button</a></td>
               </tr>
-            </table>
+            </tbody></table>
           </td>
         </tr>
-      </table>
+      </tbody></table>
     HTML
     compare(input, expected)
   end
@@ -73,17 +73,17 @@ RSpec.describe "Button" do
   it 'creates a button with target="_blank" attribute' do
     input = '<button href="http://zurb.com" target="_blank">Button</button>'
     expected = <<-HTML
-      <table class="button">
+      <table class="button"><tbody>
         <tr>
           <td>
-            <table>
+            <table><tbody>
               <tr>
                 <td><a href="http://zurb.com" target="_blank">Button</a></td>
               </tr>
-            </table>
+            </tbody></table>
           </td>
         </tr>
-      </table>
+      </tbody></table>
     HTML
     compare(input, expected)
   end
@@ -91,17 +91,17 @@ RSpec.describe "Button" do
   it 'creates a button with classes' do
     input = '<button class="small alert" href="http://zurb.com">Button</button>'
     expected = <<-HTML
-      <table class="button small alert">
+      <table class="button small alert"><tbody>
         <tr>
           <td>
-            <table>
+            <table><tbody>
               <tr>
                 <td><a href="http://zurb.com">Button</a></td>
               </tr>
-            </table>
+            </tbody></table>
           </td>
         </tr>
-      </table>
+      </tbody></table>
     HTML
 
     compare(input, expected)
@@ -110,20 +110,20 @@ RSpec.describe "Button" do
   it 'creates a correct expanded button' do
     input = '<button class="expand" href="http://zurb.com">Button</button>'
     expected = <<-HTML
-      <table class="button expand">
+      <table class="button expand"><tbody>
         <tr>
           <td>
-            <table>
+            <table><tbody>
               <tr>
                 <td>
                   <center><a href="http://zurb.com" align="center" class="float-center">Button</a></center>
                 </td>
               </tr>
-            </table>
+            </tbody></table>
           </td>
           <td class="expander"></td>
         </tr>
-      </table>
+      </tbody></table>
     HTML
 
     compare(input, expected)
@@ -138,17 +138,17 @@ RSpec.describe "Menu" do
       </menu>
     INKY
     expected = <<-HTML
-      <table class="menu">
+      <table class="menu"><tbody>
         <tr>
           <td>
-            <table>
+            <table><tbody>
               <tr>
                 <th class="menu-item"><a href="http://zurb.com">Item</a></th>
               </tr>
-            </table>
+            </tbody></table>
           </td>
         </tr>
-      </table>
+      </tbody></table>
     HTML
 
     compare(input, expected)
@@ -161,17 +161,17 @@ RSpec.describe "Menu" do
       </menu>
     INKY
     expected = <<-HTML
-      <table class="menu">
+      <table class="menu"><tbody>
         <tr>
           <td>
-            <table>
+            <table><tbody>
               <tr>
                 <th class="menu-item"><a href="http://zurb.com" target="_blank">Item</a></th>
               </tr>
-            </table>
+            </tbody></table>
           </td>
         </tr>
-      </table>
+      </tbody></table>
     HTML
 
     compare(input, expected)
@@ -183,16 +183,16 @@ RSpec.describe "Menu" do
       </menu>
     INKY
     expected = <<-HTML
-      <table class="menu vertical">
+      <table class="menu vertical"><tbody>
         <tr>
           <td>
-            <table>
+            <table><tbody>
               <tr>
               </tr>
-            </table>
+            </tbody></table>
           </td>
         </tr>
-      </table>
+      </tbody></table>
     HTML
 
     compare(input, expected)
@@ -205,17 +205,17 @@ RSpec.describe "Menu" do
       </menu>
     INKY
     expected = <<-HTML
-      <table class="menu">
+      <table class="menu"><tbody>
         <tr>
           <td>
-            <table>
+            <table><tbody>
               <tr>
                 <th class="menu-item"><a href="http://zurb.com">Item 1</a></th>
               </tr>
-            </table>
+            </tbody></table>
           </td>
         </tr>
-      </table>
+      </tbody></table>
     HTML
 
     compare(input, expected)
@@ -226,12 +226,12 @@ RSpec.describe "Callout" do
   it "creates a callout with correct syntax" do
     input = '<callout>Callout</callout>'
     expected = <<-HTML
-      <table class="callout">
+      <table class="callout"><tbody>
         <tr>
           <th class="callout-inner">Callout</th>
           <th class="expander"></th>
         </tr>
-      </table>
+      </tbody></table>
     HTML
 
     compare(input, expected)
@@ -240,12 +240,12 @@ RSpec.describe "Callout" do
   it "copies classes to the final HTML" do
     input = '<callout class="primary">Callout</callout>'
     expected = <<-HTML
-      <table class="callout">
+      <table class="callout"><tbody>
         <tr>
           <th class="callout-inner primary">Callout</th>
           <th class="expander"></th>
         </tr>
-      </table>
+      </tbody></table>
     HTML
 
     compare(input, expected)
@@ -259,7 +259,7 @@ RSpec.describe "Spacer" do
       <table class="spacer">
         <tbody>
           <tr>
-            <td height="10" style="font-size:10px;line-height:10px;">&#xA0;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -274,7 +274,7 @@ RSpec.describe "Spacer" do
       <table class="spacer hide-for-large">
         <tbody>
           <tr>
-            <td height="10" style="font-size:10px;line-height:10px;">&#xA0;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -289,7 +289,7 @@ RSpec.describe "Spacer" do
       <table class="spacer show-for-large">
         <tbody>
           <tr>
-            <td height="20" style="font-size:20px;line-height:20px;">&#xA0;</td>
+            <td height="20" style="font-size:20px;line-height:20px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -304,14 +304,14 @@ RSpec.describe "Spacer" do
         <table class="spacer hide-for-large">
           <tbody>
             <tr>
-              <td height="10" style="font-size:10px;line-height:10px;">&#xA0;</td>
+              <td height="10" style="font-size:10px;line-height:10px;">&nbsp;</td>
             </tr>
           </tbody>
         </table>
         <table class="spacer show-for-large">
           <tbody>
             <tr>
-              <td height="20" style="font-size:20px;line-height:20px;">&#xA0;</td>
+              <td height="20" style="font-size:20px;line-height:20px;">&nbsp;</td>
             </tr>
           </tbody>
         </table>
@@ -326,7 +326,7 @@ RSpec.describe "Spacer" do
       <table class="spacer bgcolor">
         <tbody>
           <tr>
-            <td height="10" style="font-size:10px;line-height:10px;">&#xA0;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -340,11 +340,11 @@ RSpec.describe "Wrapper" do
   it 'creates a wrapper that you can attach classes to' do
     input = '<wrapper class="header"></wrapper>'
     expected = <<-HTML
-      <table class="wrapper header" align="center">
+      <table class="wrapper header" align="center"><tbody>
         <tr>
           <td class="wrapper-inner"></td>
         </tr>
-      </table>
+      </tbody></table>
     HTML
 
     compare(input, expected)