inky-rb 1.3.6.1 → 1.3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74de32d25371bce184fdc11c8bd97d240e91d6e8
-  data.tar.gz: 35d2d7fb902610d3cbe0ff3c1a7e259b65811483
+  metadata.gz: a70d84a75f2e9381d149d54dfb5fe9e965ad0dcb
+  data.tar.gz: dfb5d7fa5a16a9a332f6f0dcd31652b445a7df69
 SHA512:
-  metadata.gz: a32921470b7797e53caa988ccef060bd6e4970980484d91af51e62dc447235893ba78933167c8788413fe9aacb7cd155532093e58a82787da3fa4938b66e9be8
-  data.tar.gz: 3e9f7ff46e9d6c722633a54e6f008eb6b4ad8ad58ba9c3be3aa96afdda52a4503caa9f604670fd6be53443e41c5a4d69fdec10a313202628d7ab4735f4dfafdc
+  metadata.gz: 53b0a6662556687a5d52d498fe47963cf7e2f53cbdc3d60e54f48a4dfbff95c55eb615401827f21f5cfd37d5f8c8cad3a710d45d218ba05eb012d56394e1d70a
+  data.tar.gz: c2729bf8cddad5ed77eda40b3fd9d866b6bce67e6ef4480b0b5ddf9955758ebb58a9eb451242e9f87091b67b74ad834f805aa6145e1a3c1e5a7e0d82daf61491

data/.rubocop.yml

@@ -0,0 +1,150 @@
+# Relaxed.Ruby.Style
+
+Style/Alias:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylealias
+
+Style/BeginBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylebeginblock
+
+Style/BlockDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
+
+Style/Documentation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledocumentation
+
+Style/DotPosition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledotposition
+
+Style/DoubleNegation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
+
+Style/EndBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleendblock
+
+Style/FormatString:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleformatstring
+
+Style/IfUnlessModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
+
+Style/Lambda:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylelambda
+
+Style/ModuleFunction:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemodulefunction
+
+Style/MultilineBlockChain:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
+
+Style/NegatedIf:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
+
+Style/NegatedWhile:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
+
+Style/ParallelAssignment:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
+
+Style/PerlBackrefs:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleperlbackrefs
+
+Style/Semicolon:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
+
+Style/SignalException:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesignalexception
+
+Style/SingleLineBlockParams:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelineblockparams
+
+Style/SingleLineMethods:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
+
+Style/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
+
+Style/SpecialGlobalVars:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespecialglobalvars
+
+Style/StringLiterals:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylestringliterals
+
+Style/TrailingCommaInLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
+
+Style/WhileUntilModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
+
+Lint/AssignmentInCondition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+# inky-rb gem specifics
+Lint/HandleExceptions:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/inky.rb'

data/Gemfile.lock

@@ -1,14 +1,20 @@
 PATH
   remote: .
   specs:
-    inky-rb (1.3.6.1)
+    inky-rb (1.3.6.2)
       foundation_emails (~> 2)
+      nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
     foundation_emails (2.2.0.0)
+    mini_portile2 (2.1.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
     rake (11.2.2)
     rspec-core (3.5.0)
       rspec-support (~> 3.5.0)
@@ -28,4 +34,4 @@ DEPENDENCIES
   rspec-expectations
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/inky.gemspec

@@ -5,7 +5,6 @@ require 'inky/rails/version'
 Gem::Specification.new do |s|
   s.name        = 'inky-rb'
   s.version     = Inky::Rails::VERSION
-  s.date        = '2016-02-12'
   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"]
@@ -16,6 +15,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
 
   s.add_dependency "foundation_emails", "~> 2"
+  s.add_dependency "nokogiri"
   s.add_development_dependency "bundler", "~> 1.6"
   s.add_development_dependency "rake"
 end

data/lib/component_factory.rb

@@ -2,151 +2,136 @@ module ComponentFactory
   def component_factory(elem)
     inner = elem.children.map(&:to_s).join
     # TODO:  Handle changed names
-    transform_method = :"_transform_#{self.component_lookup[elem.name]}"
-    if self.respond_to?(transform_method)
-      REXML::Document.new(self.send(transform_method, elem, inner)).root
-    else
-      nil
-    end
+    transform_method = :"_transform_#{component_lookup[elem.name]}"
+    return unless respond_to?(transform_method)
+    Nokogiri::XML(send(transform_method, elem, inner)).root
   end
 
+  tags = %w[class id href size large no-expander small target]
+  tags = tags.to_set if tags.respond_to? :to_set
+  IGNORED_ON_PASSTHROUGH = tags.freeze
+
   def _pass_through_attributes(elem)
-    ignored = ['class', 'id', 'href', 'size', 'large', 'no-expander', 'small', 'target'];
-    elem.attributes.map do |name, value|
-      if ignored.include?(name.downcase)
-        ''
-      else
-        "#{name}=\"#{value}\""
-      end
-    end.join(' ')
+    elem.attributes.reject { |e| IGNORED_ON_PASSTHROUGH.include?(e.downcase) }.map do |name, value|
+      %{#{name}="#{value}" }
+    end.join
   end
 
   def _has_class(elem, klass)
-    !!elem.attributes['class'] && elem.attributes['class'].split(' ').include?(klass)
+    (elem.attr('class') || '').include?(klass)
   end
 
   def _class_array(elem, defaults = [])
-    (elem.attributes['class'] ? (defaults.concat(elem.attributes['class'].split(' '))) : defaults).uniq
+    classes = elem['class']
+    defaults.concat(classes.split(' ')) if classes
+    defaults
   end
 
   def _target_attribute(elem)
-    elem.attributes['target'] ? " target=\"#{elem.attributes['target']}\"" : ''
+    elem.attributes['target'] ? %{ target="#{elem.attributes['target']}"} : ''
   end
 
   def _transform_button(component, inner)
     expand = _has_class(component, 'expand')
-    if component.attributes['href']
+    if component.attr('href')
       target = _target_attribute(component)
-      if expand
-        inner = "<a href=\"#{component.attributes['href']}\"#{target} align=\"center\" class=\"float-center\">#{inner}</a>"
-      else
-        inner = "<a href=\"#{component.attributes['href']}\"#{target}>#{inner}</a>"
-      end
+      extra = ' align="center" class="float-center"' if expand
+      inner = %{<a href="#{component.attr('href')}"#{target}#{extra}>#{inner}</a>}
     end
     inner = "<center>#{inner}</center>" if expand
 
     classes = _class_array(component, ['button'])
-    if expand
-      return "<table class=\"#{classes.join(' ')}\"><tr><td><table><tr><td>#{inner}</td></tr></table></td><td class=\"expander\"></td></tr></table>"
-    else
-      return "<table class=\"#{classes.join(' ')}\"><tr><td><table><tr><td>#{inner}</td></tr></table></td></tr></table>"
-    end
+    expander = '<td class="expander"></td>' if expand
+    %{<table class="#{classes.join(' ')}"><tr><td><table><tr><td>#{inner}</td></tr></table></td>#{expander}</tr></table>}
   end
 
   def _transform_menu(component, inner)
     classes = _class_array(component, ['menu'])
-    "<table class=\"#{classes.join(' ')}\"><tr><td><table><tr>#{inner}</tr></table></td></tr></table>"
+    %{<table class="#{classes.join(' ')}"><tr><td><table><tr>#{inner}</tr></table></td></tr></table>}
   end
 
   def _transform_menu_item(component, inner)
     target = _target_attribute(component)
-    "<th class=\"menu-item\"><a href=\"#{component.attributes['href']}\"#{target}>#{inner}</a></th>"
+    %{<th class="menu-item"><a href="#{component.attr('href')}"#{target}>#{inner}</a></th>}
   end
 
   def _transform_container(component, inner)
     classes = _class_array(component, ['container'])
-    "<table class=\"#{classes.join(' ')}\"><tbody><tr><td>#{inner}</td></tr></tbody></table>"
+    %{<table class="#{classes.join(' ')}"><tbody><tr><td>#{inner}</td></tr></tbody></table>}
   end
 
   def _transform_row(component, inner)
     classes = _class_array(component, ['row'])
     attrs = _pass_through_attributes(component)
-    "<table #{attrs} class=\"#{classes.join(' ')}\"><tbody><tr>#{inner}</tr></tbody></table>"
+    %{<table #{attrs}class="#{classes.join(' ')}"><tbody><tr>#{inner}</tr></tbody></table>}
   end
 
   # in inky.js this is factored out into makeClumn.  TBD if we need that here.
   def _transform_columns(component, inner)
-
     col_count = component.parent.elements.size
-    small_size = component.attributes['small'] || self.column_count
-    large_size = component.attributes['large'] || component.attributes['small'] || (self.column_count / col_count).to_i
 
-    classes = _class_array(component, ["small-#{small_size}", "large-#{large_size}", "columns"])
+    small_val = component.attr('small')
+    large_val = component.attr('large')
+
+    small_size = small_val || column_count
+    large_size = large_val || small_val || (column_count / col_count).to_i
 
+    classes = _class_array(component, ["small-#{small_size}", "large-#{large_size}", "columns"])
 
     classes.push('first') unless component.previous_element
     classes.push('last') unless component.next_element
 
-    subrows = component.elements.to_a("//*[contains(@class,'row')]").concat(component.elements.to_a("//row"))
-    expander = ''
-    if large_size.to_i == self.column_count && subrows.size == 0
-      expander = "<th class=\"expander\"></th>"
-    end
-    "<th class=\"#{classes.join(' ')}\"><table><tr><th>#{inner}</th>#{expander}</tr></table></th>"
+    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?
+
+    %{<th class="#{classes.join(' ')}" #{_pass_through_attributes(component)}><table><tr><th>#{inner}</th>#{expander}</tr></table></th>}
   end
 
   def _transform_block_grid(component, inner)
-    classes = _class_array(component, ['block-grid', "up-#{component.attributes['up']}"])
-    "<table class=\"#{classes.join(' ')}\"><tr>#{inner}</tr></table>"
+    classes = _class_array(component, ['block-grid', "up-#{component.attr('up')}"])
+    %{<table class="#{classes.join(' ')}"><tr>#{inner}</tr></table>}
   end
 
-  def _transform_center(component, inner)
+  def _transform_center(component, _inner)
     # NOTE:  Using children instead of elements because elements.to_a
     # sometimes appears to miss elements that show up in size
-    component.elements.to_a.each do |child|
-      child.add_attribute('align', 'center')
+    component.elements.each do |child|
+      child['align'] = 'center'
       child_classes = _class_array(child, ['float-center'])
-      child.add_attribute('class', child_classes.join(' '))
-      items = component.elements.to_a("//*[contains(@class,'menu-item')]").concat(component.elements.to_a("//item"))
+      child['class'] = child_classes.join(' ')
+      items = component.elements.css(".menu-item").to_a.concat(component.elements.css("item").to_a)
       items.each do |item|
         item_classes = _class_array(item, ['float-center'])
-        item.add_attribute('class', item_classes.join(' '))
+        item['class'] = item_classes.join(' ')
       end
     end
-    return component.to_s
+    component.to_s
   end
 
   def _transform_callout(component, inner)
     classes = _class_array(component, ['callout-inner'])
-    return "<table class=\"callout\"><tr><th class=\"#{classes.join(' ')}\">#{inner}</th><th class=\"expander\"></th></tr></table>"
+    %{<table class="callout"><tr><th class="#{classes.join(' ')}">#{inner}</th><th class="expander"></th></tr></table>}
   end
 
-  def _transform_spacer(component, inner)
+  def _transform_spacer(component, _inner)
     classes = _class_array(component, ['spacer'])
-    size = component.attributes['size']
-    size_sm = component.attributes['size-sm']
-    size_lg = component.attributes['size-lg']
+    build_table = ->(size, extra) { %{<table class="#{classes.join(' ')} #{extra}"><tbody><tr><td height="#{size}px" 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')
     if size_sm || size_lg
       html = ''
-      if size_sm
-        html += "<table class=\"#{classes.join(' ')} hide-for-large\"><tbody><tr><td height=\"#{size_sm}px\" style=\"font-size:#{size_sm}px;line-height:#{size_sm}px;\">&#xA0;</td></tr></tbody></table>"
-      end
-      if size_lg
-        html += "<table class=\"#{classes.join(' ')} show-for-large\"><tbody><tr><td height=\"#{size_lg}px\" style=\"font-size:#{size_lg}px;line-height:#{size_lg}px;\">&#xA0;</td></tr></tbody></table>"
-      end
-      if size_sm && size_lg
-        # REXML doesn't like replacing a single element with a double
-        html = "<span>#{html}</span>"
-      end
-      return html
+      html << build_table[size_sm, 'hide-for-large'] if size_sm
+      html << build_table[size_lg, 'show-for-large'] if size_lg
+      html = "<span>#{html}</span>" if size_sm && size_lg
+      html
     else
-      size ||= 16
-      return "<table class=\"#{classes.join(' ')}\"><tbody><tr><td height=\"#{size}px\" style=\"font-size:#{size}px;line-height:#{size}px;\">&#xA0;</td></tr></tbody></table>"
+      build_table[size || 16, nil]
     end
   end
 
   def _transform_wrapper(component, inner)
     classes = _class_array(component, ['wrapper'])
-    return "<table class=\"#{classes.join(' ')}\" align=\"center\"><tr><td class=\"wrapper-inner\">#{inner}</td></tr></table>"
+    %{<table class="#{classes.join(' ')}" align="center"><tr><td class="wrapper-inner">#{inner}</td></tr></table>}
   end
 end

data/lib/generators/inky/install_generator.rb

@@ -5,14 +5,14 @@ module Inky
     class InstallGenerator < ::Rails::Generators::Base
       desc 'Install Foundation for Emails'
       source_root File.join(File.dirname(__FILE__), 'templates')
-      argument :layout_name, :type => :string, :default => 'mailer', :banner => 'layout_name'
+      argument :layout_name, type: :string, default: 'mailer', banner: 'layout_name'
 
       def preserve_original_mailer_layout
-        return nil unless layout_name == 'mailer'
+        return unless layout_name == 'mailer'
 
         original_mailer = File.join(layouts_base_dir, 'mailer.html.erb')
         rename_filename = File.join(layouts_base_dir, "old_mailer_#{Time.now.to_i}.html.erb")
-        File.rename(original_mailer, rename_filename) if File.exists? original_mailer
+        File.rename(original_mailer, rename_filename) if File.exist? original_mailer
       end
 
       def create_mailer_stylesheet

data/lib/inky.rb

@@ -1,6 +1,6 @@
 module Inky
   class Core
-    require 'rexml/document'
+    require 'nokogiri'
     require 'component_factory'
     attr_accessor :components, :column_count, :component_lookup, :component_tags
 
@@ -21,27 +21,22 @@ module Inky
         menu_item: 'item'
       }.merge(options[:components] || {})
 
-      self.component_lookup = self.components.invert
+      self.component_lookup = components.invert
 
       self.column_count = options[:column_count] || 12
 
-      self.component_tags = self.components.values
+      self.component_tags = components.values
     end
 
-
     def release_the_kraken(xml_string)
       xml_string = xml_string.gsub(/doctype/i, 'DOCTYPE')
       raws, str = Inky::Core.extract_raws(xml_string)
-      xml_doc = REXML::Document.new(str)
-      if self.components_exist?(xml_doc)
-        self.transform_doc(xml_doc.root)
-      end
-      str = xml_doc.to_s
-      return Inky::Core.re_inject_raws(str, raws)
+      xml_doc = Nokogiri::XML(str)
+      transform_doc(xml_doc.root) if components_exist?(xml_doc)
+      Inky::Core.re_inject_raws(xml_doc.to_s, raws)
     end
 
-
-    def components_exist?(xml_doc)
+    def components_exist?(_xml_doc)
       true
     end
 
@@ -50,8 +45,8 @@ module Inky
         elem.children.each do |child|
           transform_doc(child)
         end
-        component = self.component_factory(elem)
-        elem.replace_with(component) if component
+        component = component_factory(elem)
+        elem.replace(component) if component
       end
       elem
     end
@@ -59,22 +54,24 @@ module Inky
     def self.extract_raws(string)
       raws = []
       i = 0
-      regex = /\< *raw *\>(.*?)\<\/ *raw *\>/i;
+      regex = %r(< *raw *>(.*?)</ *raw *>)
       str = string
       while raw = str.match(regex)
         raws[i] = raw[1]
         str = str.sub(regex, "###RAW#{i}###")
-        i = i + 1
+        i += 1
       end
-      return [raws, str]
-     end
+      [raws, str]
+    end
 
     def self.re_inject_raws(string, raws)
       str = string
       raws.each_with_index do |val, i|
         str = str.sub("###RAW#{i}###", val)
       end
-      return str
+      # If we're in rails, these should be considered safe strings
+      str = str.html_safe if str.respond_to?(:html_safe)
+      str
     end
   end
 end

data/lib/inky/rails/engine.rb

@@ -4,7 +4,7 @@ module Inky
   module Rails
     class Engine < ::Rails::Engine
       if config.respond_to?(:annotations)
-        config.annotations.register_extensions("inky") { |annotation| /\/\/\s*(#{annotation}):?\s*(.*)$/ }
+        config.annotations.register_extensions("inky") { |annotation| %r(//\s*(#{annotation}):?\s*(.*)$) }
       end
     end
   end

data/lib/inky/rails/template_handler.rb

@@ -1,13 +1,15 @@
 module Inky
   module Rails
     class TemplateHandler
-      def self.erb_handler
-        @@erb_handler ||= ActionView::Template.registered_template_handler(:erb)
-      end
+      class << self
+        def erb_handler
+          @erb_handler ||= ActionView::Template.registered_template_handler(:erb)
+        end
 
-      def self.call(template)
-        compiled_source = erb_handler.call(template)
-        "Inky::Core.new.release_the_kraken(begin; #{compiled_source};end)"
+        def call(template)
+          compiled_source = erb_handler.call(template)
+          "Inky::Core.new.release_the_kraken(begin; #{compiled_source};end)"
+        end
       end
     end
   end

data/lib/inky/rails/version.rb

@@ -1,5 +1,5 @@
 module Inky
   module Rails
-    VERSION = "1.3.6.1"
+    VERSION = "1.3.6.2".freeze
   end
 end

data/spec/components_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 RSpec.describe "Center" do
   it "applies a text-center class and center alignment attribute to the first child" do
-    input = '<center><div></div></center>';
+    input = '<center><div></div></center>'
     expected = <<-HTML
       <center>
         <div align="center" class="float-center"></div>
       </center>
     HTML
 
-    compare(input, expected);
+    compare(input, expected)
   end
 
   it "doesn't choke if center tags are nested" do
@@ -23,7 +23,7 @@ RSpec.describe "Center" do
       </center>
     HTML
 
-    compare(input, expected);
+    compare(input, expected)
   end
 
   it "applies the class float-center to <item> elements" do
@@ -47,13 +47,13 @@ RSpec.describe "Center" do
       </center>
     HTML
 
-    compare(input, expected);
+    compare(input, expected)
   end
 end
 
 RSpec.describe "Button" do
   it "creates a simple button" do
-    input = '<button href="http://zurb.com">Button</button>';
+    input = '<button href="http://zurb.com">Button</button>'
     expected = <<-HTML
       <table class="button">
         <tr>
@@ -67,7 +67,7 @@ RSpec.describe "Button" do
         </tr>
       </table>
     HTML
-    compare(input, expected);
+    compare(input, expected)
   end
 
   it 'creates a button with target="_blank" attribute' do
@@ -224,7 +224,7 @@ end
 
 RSpec.describe "Callout" do
   it "creates a callout with correct syntax" do
-    input = '<callout>Callout</callout>';
+    input = '<callout>Callout</callout>'
     expected = <<-HTML
       <table class="callout">
         <tr>
@@ -234,7 +234,7 @@ RSpec.describe "Callout" do
       </table>
     HTML
 
-    compare(input, expected);
+    compare(input, expected)
   end
 
   it "copies classes to the final HTML" do
@@ -248,13 +248,13 @@ RSpec.describe "Callout" do
       </table>
     HTML
 
-    compare(input, expected);
+    compare(input, expected)
   end
 end
-  
+
 RSpec.describe "Spacer" do
   it 'creates a spacer element with correct size' do
-    input = '<spacer size="10"></spacer>';
+    input = '<spacer size="10"></spacer>'
     expected = <<-HTML
       <table class="spacer">
         <tbody>
@@ -265,7 +265,7 @@ RSpec.describe "Spacer" do
       </table>
     HTML
 
-    compare(input, expected);
+    compare(input, expected)
   end
 
   it 'creates a spacer element for small screens with correct size' do
@@ -334,7 +334,7 @@ RSpec.describe "Spacer" do
       </table>
     HTML
 
-    compare(input, expected);
+    compare(input, expected)
   end
 end
 
@@ -349,14 +349,14 @@ RSpec.describe "Wrapper" do
       </table>
     HTML
 
-    compare(input, expected);
+    compare(input, expected)
   end
 end
 
 RSpec.describe "raw" do
   it 'creates a wrapper that ignores anything inside' do
-    input = "<raw><<LCG Program\TG LCG Coupon Code Default='246996'>></raw>"
-    expected = "<<LCG Program\TG LCG Coupon Code Default='246996'>>"
+    input = "<body><raw><<LCG Program\TG LCG Coupon Code Default='246996'>></raw></body>"
+    expected = "<?xml version=\"1.0\"?>\n<body><<LCG ProgramTG LCG Coupon Code Default='246996'>></body>\n"
 
     # Can't do vanilla compare because the second will fail to parse
     inky = Inky::Core.new

data/spec/grid_spec.rb

@@ -46,7 +46,7 @@ end
 RSpec.describe 'Grid' do
   it 'creates a row' do
     input = '<row></row>'
-    expected =  <<-HTML
+    expected = <<-HTML
       <table class="row">
         <tbody>
           <tr></tr>
@@ -155,7 +155,7 @@ RSpec.describe 'Grid' do
     compare(input, expected)
   end
 
-  #if it just has small, borrow from small for large
+  # if it just has small, borrow from small for large
   it 'automatically assigns large columns if no large attribute is assigned' do
     input = <<-HTML
     <body>
@@ -214,6 +214,35 @@ RSpec.describe 'Grid' do
     compare(input, expected)
   end
 
+  it 'assigns small as full width and large as half width if neither is defined and there are two columns' do
+    input = <<-INKY
+    <body>
+      <columns>One</columns>
+      <columns>Two</columns>
+    </body>
+    INKY
+    expected = <<-HTML
+    <body>
+      <th class="small-12 large-6 columns first">
+        <table>
+          <tr>
+            <th>One</th>
+          </tr>
+        </table>
+      </th>
+      <th class="small-12 large-6 columns last">
+        <table>
+          <tr>
+            <th>Two</th>
+          </tr>
+        </table>
+      </th>
+    </body>
+    HTML
+
+    compare(input, expected)
+  end
+
   it 'supports nested grids' do
     input = '<row><columns><row></row></columns></row>'
     expected = <<-HTML
@@ -240,6 +269,23 @@ RSpec.describe 'Grid' do
 
     compare(input, expected)
   end
+
+  it 'transfers attributes like valign' do
+    input = '<columns small="6" valign="middle" foo="bar">x</columns>'
+    expected = <<-HTML
+      <th class="small-6 large-6 columns first last" valign="middle" foo="bar">
+        <table>
+          <tr>
+            <th>
+              x
+            </th>
+          </tr>
+        </table>
+      </th>
+    HTML
+
+    compare(input, expected)
+  end
 end
 
 RSpec.describe 'Block Grid' do
@@ -264,5 +310,4 @@ RSpec.describe 'Block Grid' do
 
     compare(input, expected)
   end
-
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'inky'
 
-require 'rexml/document'
 def compare(input, expected)
   inky = Inky::Core.new
   output = inky.release_the_kraken(input)
@@ -8,7 +7,7 @@ def compare(input, expected)
   # TODO:  Figure out a better way to do html compare in ruby..
   # this is overly dependent on things like class ordering, making it
   # fragile
-  output_str = REXML::Document.new(output).to_s.gsub(/\s/, '')
-  expected_str = REXML::Document.new(expected).to_s.gsub(/\s/, '')
+  output_str = Nokogiri::XML(output).to_s.gsub(/\s/, '')
+  expected_str = Nokogiri::XML(expected).to_s.gsub(/\s/, '')
   expect(output_str).to eql(expected_str)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inky-rb
 version: !ruby/object:Gem::Version
-  version: 1.3.6.1
+  version: 1.3.6.2
 platform: ruby
 authors:
 - ZURB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation_emails
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - README.md