inky-rb 1.3.7.5 → 1.3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7f7e3344abd0ff825ff02d118f014a8676c4e150753e6e9096ccdadef07eac8
-  data.tar.gz: 3c43d307498731879e123ce50baebe9b71e0c203274a495d4ba158ffd0f6c510
+  metadata.gz: 48af980ab18545c232dc3fd4f4ee2ebedbfeca066aabe1faa4c3455c2aa4c152
+  data.tar.gz: f0b985c040dea524b0004cc90edb81ce8f4920e135d9def3253896a38b75099c
 SHA512:
-  metadata.gz: 940a14e38d002673c933da78a80aef9b68adb2a77bf4a243f8cdb134e50a9342e3606c2005792c0411cff79fffa269a711dcf639aad51036481f066630291b24
-  data.tar.gz: f9b791e61f0f3a4f78a34460f3128dc127c5d067c94e09508f70d8310c6a9af5e8558e81b39fd6b2d7a3202ab54a9f9dbd54510aa81aa7198b58fa8e15e48941
+  metadata.gz: 3de872ab2036bd2ffcfb7c6c13aa8a58aee0b208e89da68281547e60a61acc8eaaf7b7f587d08d9672b6c84ad18219e61d7c227a71d47b3a6396c59ebb9dd840
+  data.tar.gz: f278877cc37ddf979b7f68fb35d3f333881095203eb40a95b330e217c28cc9708ba658a5466fcb2b171ace3ffd83b60270ec64b781d6a9b6ccdd64a37d728223

data/lib/inky.rb

@@ -21,7 +21,7 @@ module Inky
         spacer: 'spacer',
         wrapper: 'wrapper',
         menu_item: 'item'
-      }.merge(options[:components] || {})
+      }.merge(::Inky.configuration.components).merge(options[:components] || {})
 
       self.component_lookup = components.invert
 

data/lib/inky/component_factory.rb

@@ -126,7 +126,7 @@ module Inky
 
     def _transform_spacer(component, _inner)
       classes = _combine_classes(component, 'spacer')
-      build_table = ->(size, extra) { %{<table class="#{classes} #{extra}"><tbody><tr><td height="#{size}px" 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;">&#xA0;</td></tr></tbody></table>} }
       size = component.attr('size')
       size_sm = component.attr('size-sm')
       size_lg = component.attr('size-lg')

data/lib/inky/configuration.rb

@@ -7,6 +7,8 @@ module Inky
   # Set Inky's configuration
   # @param config [Inky::Configuration]
   def self.configuration=(config)
+    raise TypeError, "Not an Inky::Configuration" unless config.is_a?(Configuration)
+
     @configuration = config
   end
 
@@ -23,11 +25,30 @@ module Inky
   end
 
   class Configuration
-    attr_accessor :template_engine, :column_count
+    attr_reader :template_engine, :column_count, :components
 
     def initialize
       @template_engine = :erb
       @column_count = 12
+      @components = {}
+    end
+
+    def template_engine=(value)
+      raise TypeError, "#{value.inspect} (#{value.class}) does not respond to 'to_sym'" unless value.respond_to?(:to_sym)
+
+      @template_engine = value.to_sym
+    end
+
+    def components=(value)
+      raise TypeError, "#{value.inspect} (#{value.class}) does not respond to 'to_hash'" unless value.respond_to?(:to_hash)
+
+      @components = value.to_hash
+    end
+
+    def column_count=(value)
+      raise TypeError, "#{value.inspect} (#{value.class}) does not respond to 'to_int'" unless value.respond_to?(:to_int)
+
+      @column_count = value.to_int
     end
   end
 end

data/lib/inky/rails/version.rb

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

data/spec/components_spec.rb

@@ -259,7 +259,7 @@ RSpec.describe "Spacer" do
       <table class="spacer">
         <tbody>
           <tr>
-            <td height="10px" style="font-size:10px;line-height:10px;">&#xA0;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&#xA0;</td>
           </tr>
         </tbody>
       </table>
@@ -274,7 +274,7 @@ RSpec.describe "Spacer" do
       <table class="spacer hide-for-large">
         <tbody>
           <tr>
-            <td height="10px" style="font-size:10px;line-height:10px;">&#xA0;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&#xA0;</td>
           </tr>
         </tbody>
       </table>
@@ -289,7 +289,7 @@ RSpec.describe "Spacer" do
       <table class="spacer show-for-large">
         <tbody>
           <tr>
-            <td height="20px" style="font-size:20px;line-height:20px;">&#xA0;</td>
+            <td height="20" style="font-size:20px;line-height:20px;">&#xA0;</td>
           </tr>
         </tbody>
       </table>
@@ -304,14 +304,14 @@ RSpec.describe "Spacer" do
         <table class="spacer hide-for-large">
           <tbody>
             <tr>
-              <td height="10px" style="font-size:10px;line-height:10px;">&#xA0;</td>
+              <td height="10" style="font-size:10px;line-height:10px;">&#xA0;</td>
             </tr>
           </tbody>
         </table>
         <table class="spacer show-for-large">
           <tbody>
             <tr>
-              <td height="20px" style="font-size:20px;line-height:20px;">&#xA0;</td>
+              <td height="20" style="font-size:20px;line-height:20px;">&#xA0;</td>
             </tr>
           </tbody>
         </table>
@@ -326,7 +326,7 @@ RSpec.describe "Spacer" do
       <table class="spacer bgcolor">
         <tbody>
           <tr>
-            <td height="10px" style="font-size:10px;line-height:10px;">&#xA0;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&#xA0;</td>
           </tr>
         </tbody>
       </table>

data/spec/configuration_spec.rb

@@ -1,44 +1,114 @@
 require 'spec_helper'
 
-RSpec.describe "Configuration" do
-  around do |spec|
-    Inky.configure do |config|
-      old = config.template_engine
-      spec.run
-      config.template_engine = old
+RSpec.describe "Inky.configuration" do
+  it "returns an Inky::Configuration object" do
+    expect(Inky.configuration).to be_an_instance_of Inky::Configuration
+  end
+
+  describe "=" do
+    it "accepts an Inky::Configuration" do
+      current_config = Inky.configuration
+      config = Inky::Configuration.new
+
+      expect { Inky.configuration = config }.to_not raise_error
+      expect(Inky.configuration).to_not eq(current_config)
+      expect(Inky.configuration).to eq(config)
+
+      expect { Inky.configuration = {} }.to raise_error(TypeError, "Not an Inky::Configuration")
+      expect(Inky.configuration).to eq(config)
+
+      expect { Inky.configuration = current_config }.to_not raise_error
+      expect(Inky.configuration).to eq(current_config)
     end
   end
 
-  it "default value is :erb" do
-    Inky::Configuration.new.template_engine = :erb
+  describe "&block" do
+    it "yields the current configuration" do
+      current_config = Inky.configuration
+      new_config = Inky::Configuration.new
+
+      Inky.configuration = new_config
+
+      Inky.configuration do |config|
+        expect(config).to be_an_instance_of Inky::Configuration
+        expect(config).to_not eq(current_config)
+        expect(config).to eq(new_config)
+      end
+
+      Inky.configuration = current_config
+    end
+  end
+end
+
+RSpec.describe "Configuration" do
+  describe "#template_engine" do
+    it "default value is :erb" do
+      expect(Inky::Configuration.new.template_engine).to eq(:erb)
+    end
   end
 
-  describe "#configuration=" do
-    it "can set template_engine" do
+  describe "#template_engine=" do
+    it "sets/updates the template_engine" do
       config = Inky::Configuration.new
       config.template_engine = :haml
       expect(config.template_engine).to eq(:haml)
     end
 
-    it "can set column_count" do
+    it "accepts symbols" do
       config = Inky::Configuration.new
-      config.column_count = 4
-      expect(config.column_count).to eq(4)
+      value = []
+      expect { config.template_engine = value }.to raise_error(TypeError, "#{value.inspect} (#{value.class}) does not respond to 'to_sym'")
+      expect(config.template_engine).to eq(:erb)
     end
   end
 
-  describe "#configuration=" do
-    before do
-      Inky.configure do |config|
-        config.template_engine = :haml
-      end
+  describe "#column_count" do
+    it "default value is 12" do
+      expect(Inky::Configuration.new.column_count).to eq(12)
     end
+  end
 
-    it "returns :haml as configured template_engine" do
-      template_engine = Inky.configuration.template_engine
+  describe "#column_count=" do
+    it "sets/updates the column_count" do
+      config = Inky::Configuration.new
+      config.column_count = 24
+      expect(config.column_count).to eq(24)
+    end
 
-      expect(template_engine).to be_a(Symbol)
-      expect(template_engine).to eq(:haml)
+    it "accepts integers" do
+      config = Inky::Configuration.new
+      value = :haml
+      expect { config.column_count = value }.to raise_error(TypeError, "#{value.inspect} (#{value.class}) does not respond to 'to_int'")
+      expect(config.column_count).to eq(12)
+    end
+  end
+
+  describe "#components" do
+    it "defaults to an empty hash" do
+      config = Inky::Configuration.new
+      expect(config.components).to eq({})
+    end
+  end
+
+  describe "#components=" do
+    it "can set overriden component tags" do
+      config = Inky::Configuration.new
+      config.components = { button: 'inky-button' }
+      expect(config.components).to eq(button: 'inky-button')
+    end
+
+    it "will not set an invalid components override" do
+      config = Inky::Configuration.new
+      [
+        nil,
+        1,
+        "{}",
+        false,
+        true
+      ].each do |value|
+        expect { config.components = value }.to raise_error(TypeError, "#{value.inspect} (#{value.class}) does not respond to 'to_hash'")
+        expect(config.components).to eq({})
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -17,6 +17,9 @@ def reformat_html(html)
       classes = $1.split(' ').sort.join(' ')
       %{class="#{classes}"}
     end
+    .gsub(/<td height=".+?px"/) do |m|                # Tweak out px until https://github.com/zurb/inky/pull/106 resolved
+      m.gsub('px', '')
+    end
 end
 
 def expect_same_html(input, expected)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inky-rb
 version: !ruby/object:Gem::Version
-  version: 1.3.7.5
+  version: 1.3.8.0
 platform: ruby
 authors:
 - ZURB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2020-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation_emails
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Inky is an HTML-based templating language that converts simple HTML into