inky-rb 1.3.7.2 → 1.3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f486e08b00ec2b699b7a5143bf8470fe0cac860c
-  data.tar.gz: e0c04b5643e02a1d97ee14551e00bc2dca90b386
+SHA256:
+  metadata.gz: 6f128cd66f4c50d6498301a720c686a24f75afb6121f7574fcf38ae4e4197e39
+  data.tar.gz: 9953f571f49f8fe6712a89331726eca0e1c6756129d75d782e12685190549487
 SHA512:
-  metadata.gz: 0e85ff5da6cd267d4422026ebdac6cc0898d8f5fa922f027722662c6e1be212b38e19ee1bf54bb2977446e2e5484dac3f0790f96c8ec136418f84eda1d5ddab1
-  data.tar.gz: 6d45c612c490c64e1ab555d6fcf197ac622fbac4abdbe75619353b126642f4b7e2b3d093d3be4a634ed0d3122fe133354317128f7e192091510fdbc53c641dd3
+  metadata.gz: a0c09ee38d1611662c935d09e4326fde73ff2261ff1cd45f457e693d37b640f4303da063269ae663fdf574564cdc368f0877a8219ade38a174d0f474e6e2ca61
+  data.tar.gz: b3154afa14af608c817f92b20a2763de1e681eb8b253aae12e76c85b5c7859e937afd7da7cee3243a86842f20611b69e151ae15291301f0a6d907f2dc66e745c

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  DisplayCopNames: true
+  TargetRubyVersion: 2.2
 # Relaxed.Ruby.Style
 
 Style/Alias:
@@ -16,7 +19,7 @@ Style/Documentation:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styledocumentation
 
-Style/DotPosition:
+Layout/DotPosition:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styledotposition
 
@@ -84,11 +87,11 @@ Style/SingleLineMethods:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
 
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
 
-Style/SpaceInsideParens:
+Layout/SpaceInsideParens:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
 
@@ -100,10 +103,6 @@ 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
@@ -148,3 +147,11 @@ Lint/HandleExceptions:
   Exclude:
     - 'Rakefile'
     - 'lib/inky.rb'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'Rakefile'
+    - 'spec/**/*.rb'
+
+Style/Encoding:
+  Enabled: false

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: ruby
 rvm:
   - 2.0.0
-  - 2.2.5
+  - 2.4.1
 gemfile:
   - gemfiles/rails_3.gemfile
   - gemfiles/rails_4.gemfile

data/Gemfile.lock

@@ -1,153 +1,173 @@
 PATH
   remote: .
   specs:
-    inky-rb (1.3.7.1)
+    inky-rb (1.3.7.2)
       foundation_emails (~> 2)
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    actioncable (5.2.1)
+      actionpack (= 5.2.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.1)
+      actionview (= 5.2.1)
+      activesupport (= 5.2.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (5.2.1)
+      activesupport (= 5.2.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.1)
+      activesupport (= 5.2.1)
+      globalid (>= 0.3.6)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activerecord (5.2.1)
+      activemodel (= 5.2.1)
+      activesupport (= 5.2.1)
+      arel (>= 9.0)
+    activestorage (5.2.1)
+      actionpack (= 5.2.1)
+      activerecord (= 5.2.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    arel (6.0.3)
-    ast (2.3.0)
-    builder (3.2.2)
-    capybara (2.7.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (9.0.0)
+    ast (2.4.0)
+    builder (3.2.3)
+    capybara (3.9.0)
       addressable
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    concurrent-ruby (1.0.2)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubi (1.7.1)
     foundation_emails (2.2.1.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.1)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    parser (2.3.1.4)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    public_suffix (3.0.3)
+    rack (2.0.5)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.1)
+      actioncable (= 5.2.1)
+      actionmailer (= 5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
+      activemodel (= 5.2.1)
+      activerecord (= 5.2.1)
+      activestorage (= 5.2.1)
+      activesupport (= 5.2.1)
+      bundler (>= 1.3.0)
+      railties (= 5.2.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.1)
+      actionpack (= 5.2.1)
+      activesupport (= 5.2.1)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
-    rake (11.3.0)
-    rspec-core (3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+      thor (>= 0.19.0, < 2.0)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.43.0)
-      parser (>= 2.3.1.1, < 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.59.2)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
-    slim (3.0.6)
-      temple (~> 0.7.3)
-      tilt (>= 1.3.3, < 2.1)
-    sprockets (3.7.0)
+    ruby-progressbar (1.10.0)
+    slim (4.0.1)
+      temple (>= 0.7.6, < 0.9)
+      tilt (>= 2.0.6, < 2.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    temple (0.7.6)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
+    temple (0.8.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    unicode-display_width (1.4.0)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -165,4 +185,4 @@ DEPENDENCIES
   slim
 
 BUNDLED WITH
-   1.13.6
+   1.16.4

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013-2018 ZURB, inc.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -108,6 +108,29 @@ welcome.html.haml => welcome.html.inky-haml
 pw_reset.html.erb => pw_reset.html.inky-erb
 ```
 
+## Other options
+
+### Column Count
+
+You can change the column count in the initializer too:
+
+```ruby
+# config/initializers/inky.rb
+Inky.configure do |config|
+  config.column_count = 24
+end
+```
+
+Make sure to change the SASS variable as well:
+
+```sass
+# assets/stylesheets/foundation_emails.scss
+# ...
+$grid-column-count: 24;
+
+@import "foundation-emails";
+```
+
 ## Custom Elements
 
 Inky simplifies the process of creating HTML emails by expanding out simple tags like `<row>` and `<column>` into full table syntax. The names of the tags can be changed with the `components` setting.

data/Rakefile

@@ -9,6 +9,6 @@ begin
 rescue LoadError
 end
 
-task test_all: [:spec, :rubocop]
+task test_all: %i[spec rubocop]
 
 task default: :test_all

data/gemfiles/rails_3.gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gem "rails", "~>3.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gem "rails", "~>4.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gem "rails", "~>5.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/inky.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'inky/rails/version'
 
@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.authors     = ["ZURB"]
   s.email       = ['foundation@zurb.com']
   s.homepage    = 'https://github.com/zurb/inky-rb'
+  s.licenses    = ['MIT']
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -18,11 +19,11 @@ Gem::Specification.new do |s|
   s.add_dependency "foundation_emails", "~> 2"
   s.add_dependency "nokogiri"
   s.add_development_dependency "bundler", "~> 1.6"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rubocop"
-  s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara"
   s.add_development_dependency "rails"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "rubocop"
   s.add_development_dependency "slim"
   # s.add_development_dependency "pry-byebug"
 end

data/lib/generators/inky/install_generator.rb

@@ -12,6 +12,7 @@ module Inky
 
       def preserve_original_mailer_layout
         return unless layout_name == 'mailer' && extension == 'erb'
+
         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.exist? original_mailer

data/lib/inky.rb

@@ -25,19 +25,21 @@ module Inky
 
       self.component_lookup = components.invert
 
-      self.column_count = options[:column_count] || 12
+      self.column_count = options[:column_count] || ::Inky.configuration.column_count
 
       self.component_tags = components.values
     end
 
     def release_the_kraken(html_string)
-      html_string.force_encoding('utf-8') # transform_doc barfs if encoding is ASCII-8bit
+      if html_string.encoding.name == "ASCII-8BIT"
+        html_string.force_encoding('utf-8') # transform_doc barfs if encoding is ASCII-8bit
+      end
       html_string = html_string.gsub(/doctype/i, 'DOCTYPE')
       raws, str = Inky::Core.extract_raws(html_string)
       parse_cmd = str =~ /<html/i ? :parse : :fragment
       html = Nokogiri::HTML.public_send(parse_cmd, str)
       transform_doc(html)
-      string = html.to_html(encoding: 'US-ASCII')
+      string = html.to_html
       Inky::Core.re_inject_raws(string, raws)
     end
 

data/lib/inky/component_factory.rb

@@ -3,6 +3,7 @@ module Inky
     def component_factory(elem)
       transform_method = :"_transform_#{component_lookup[elem.name]}"
       return unless respond_to?(transform_method)
+
       inner = elem.children.map(&:to_s).join
       send(transform_method, elem, inner)
     end
@@ -22,7 +23,10 @@ module Inky
     end
 
     def _combine_classes(elem, extra_classes)
-      [elem['class'], extra_classes].join(' ')
+      existing = elem['class'].to_s.split(' ')
+      to_add = extra_classes.to_s.split(' ')
+
+      (existing + to_add).uniq.join(' ')
     end
 
     def _combine_attributes(elem, extra_classes = nil)

data/lib/inky/configuration.rb

@@ -15,6 +15,7 @@ module Inky
   # ```
   # Inky.configure do |config|
   #   config.template_engine = :slim
+  #   config.column_count = 24
   # end
   # ```
   def self.configure
@@ -22,10 +23,11 @@ module Inky
   end
 
   class Configuration
-    attr_accessor :template_engine
+    attr_accessor :template_engine, :column_count
 
     def initialize
       @template_engine = :erb
+      @column_count = 12
     end
   end
 end

data/lib/inky/rails/template_handler.rb

@@ -7,6 +7,7 @@ module Inky
 
       def engine_handler
         return @engine_handler if @engine_handler
+
         type = ::Inky.configuration.template_engine
         ActionView::Template.registered_template_handler(type) ||
           raise("No template handler found for #{type}")
@@ -14,6 +15,7 @@ module Inky
 
       def call(template)
         compiled_source = engine_handler.call(template)
+
         "Inky::Core.new.release_the_kraken(begin; #{compiled_source};end)"
       end
 

data/lib/inky/rails/version.rb

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

data/spec/cases_spec.rb

@@ -5,51 +5,55 @@ INKY_VERSION_REQUIRED = Inky::NODE_VERSION
 
 def npm_packages
   JSON.parse(`npm list -g --depth=1 --json=true`)
-rescue
-  puts <<-Err
+rescue SystemCallError, JSON::ParserError
+  puts <<-ERR
     npm not detected, skipping comparison tests.
-  Err
+  ERR
   nil
 end
 
 def inky_cli_ok?
   return unless packages = npm_packages
+
   version = packages['dependencies']['inky-cli']['dependencies']['inky']['version']
   return true if version >= INKY_VERSION_REQUIRED
+
   puts "Requires inky version #{INKY_VERSION_REQUIRED}+, currently installed #{version}"
   false
-rescue
-  puts <<-Err
+rescue NoMethodError
+  puts <<-ERR
     inky-cli not globally installed, skipping comparison tests.
     Install with:
         npm install inky-cli -g
-  Err
+  ERR
   false
 end
 
 RSpec.describe "Inky-rb" do
-  context "compared to inky-cli" do
-    Dir['./spec/cases/*'].each do |path|
-      folder = File.basename(path)
-      output_path = "./spec/_cases_output/#{File.basename(folder)}"
-      sources = "#{path}/*.inky"
-      source_paths = Dir[sources]
-
-      context "for #{folder} components" do
-        before(:all) do
-          shell = source_paths.map { |p| "inky #{p} #{output_path}" }
-          `#{shell.join(' && ')}`
-        end
+  if inky_cli_ok?
+    context "compared to inky-cli" do
+      Dir['./spec/cases/*'].each do |path|
+        folder = File.basename(path)
+        output_path = "./spec/_cases_output/#{File.basename(folder)}"
+        sources = "#{path}/*.inky"
+        source_paths = Dir[sources]
+
+        context "for #{folder} components" do
+          before(:all) do
+            shell = source_paths.map { |p| "inky #{p} #{output_path}" }
+            `#{shell.join(' && ')}`
+          end
 
-        source_paths.each do |filepath|
-          file = File.basename(filepath, '.inky')
-          content = File.read(filepath)
-          exec = content =~ /^<!--\s*(pending|skip)/ ? $1 : :it
-          send exec, "provides the same results for #{file}" do
-            compare(content, File.read("#{output_path}/#{file}.inky"))
+          source_paths.each do |filepath|
+            file = File.basename(filepath, '.inky')
+            content = File.read(filepath)
+            exec = content =~ /^<!--\s*(pending|skip)/ ? $1 : :it
+            send exec, "provides the same results for #{file}" do
+              compare(content, File.read("#{output_path}/#{file}.inky"))
+            end
           end
         end
       end
     end
-  end if inky_cli_ok?
+  end
 end

data/spec/configuration_spec.rb

@@ -14,11 +14,17 @@ RSpec.describe "Configuration" do
   end
 
   describe "#configuration=" do
-    it "can set value" do
+    it "can set 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
+      config = Inky::Configuration.new
+      config.column_count = 4
+      expect(config.column_count).to eq(4)
+    end
   end
 
   describe "#configuration=" do

data/spec/grid_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe "Container" do
   it 'works when parsing a full HTML document' do
     input = <<-INKY
       <!doctype html> <html>
-        <head><meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"></head>
+        <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head>
         <body>
           <container></container>
         </body>
@@ -27,7 +27,7 @@ RSpec.describe "Container" do
     expected = <<-HTML
       <!DOCTYPE html>
       <html>
-        <head><meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"></head>
+        <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head>
         <body>
           <table class="container" align="center">
             <tbody>
@@ -57,6 +57,50 @@ RSpec.describe 'Grid' do
     compare(input, expected)
   end
 
+  it 'creates a single column with default large and small classes' do
+    input = '<columns>One</columns>'
+    expected = <<-HTML
+      <th class="small-12 large-12 columns first last">
+        <table>
+          <tr>
+            <th>One</th>
+            <th class="expander"></th>
+          </tr>
+        </table>
+      </th>
+    HTML
+
+    compare(input, expected)
+  end
+
+  it 'creates a single column with default large and small classes using the column_count option' do
+    begin
+      @previous_column_count = Inky.configuration.column_count
+
+      Inky.configure do |config|
+        config.column_count = 5
+      end
+
+      input = '<columns>One</columns>'
+      expected = <<-HTML
+        <th class="small-5 large-5 columns first last">
+          <table>
+            <tr>
+              <th>One</th>
+              <th class="expander"></th>
+            </tr>
+          </table>
+        </th>
+      HTML
+
+      compare(input, expected)
+    ensure
+      Inky.configure do |config|
+        config.column_count = @previous_column_count
+      end
+    end
+  end
+
   it 'creates a single column with first and last classes' do
     input = '<columns large="12" small="12">One</columns>'
     expected = <<-HTML

data/spec/inky_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 RSpec.describe "Inky#release_the_kraken" do
@@ -16,4 +18,37 @@ RSpec.describe "Inky#release_the_kraken" do
     output = Inky::Core.new.release_the_kraken(input)
     expect_same_html(output, expected)
   end
+
+  it "works on utf-8 text" do
+    input = '<container><p>Güten tag Marc-André</p></container>'
+    expected = <<-HTML
+      <table class="container" align="center">
+        <tbody>
+          <tr>
+            <td><p>Güten tag Marc-André</p></td>
+          </tr>
+        </tbody>
+      </table>
+    HTML
+
+    output = Inky::Core.new.release_the_kraken(input)
+    expect_same_html(output, expected)
+  end
+
+  it "works on US-ASCII text" do
+    input = '<container><p>G&#252;ten tag Marc-Andr&#233;</p></container>'.force_encoding("us-ascii")
+    expected = <<-HTML
+      <table class="container" align="center">
+        <tbody>
+          <tr>
+            <td><p>G&#252;ten tag Marc-Andr&#233;</p></td>
+          </tr>
+        </tbody>
+      </table>
+    HTML
+
+    output = Inky::Core.new.release_the_kraken(input)
+    expect_same_html(output, expected)
+    output.encoding.name.should == 'US-ASCII'
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'inky'
 
 def reformat_html(html)
@@ -8,7 +10,7 @@ def reformat_html(html)
     .gsub(/ "/, '"').gsub(/\=" /, '="')               # Remove leading/trailing spaces inside attributes
     .gsub(/ </, '<').gsub(/> /, '>')                  # Remove leading/trailing spaces inside tags
     .gsub(' data-parsed=""', '')                      # Don't consider this known inky-node artefact
-    .gsub('&#xA0', '&#160')                           # These are the same entity...
+    .gsub('&#xA0;', ' ')                              # These are the same entity...
     .gsub(/(align="[^"]+") (class="[^"]+")/, '\2 \1') # Tweak order to match inky-node on container
     .gsub(/class\="([^"]+)"/) do                      # Sort class names
       classes = $1.split(' ').sort.join(' ')

data/spec/test_app/config/environments/development.rb

@@ -17,9 +17,11 @@ Rails.application.configure do
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store
-    config.public_file_server.headers = {
-      'Cache-Control' => 'public, max-age=172800'
-    } if config.respond_to? :public_file_server
+    if config.respond_to? :public_file_server
+      config.public_file_server.headers = {
+        'Cache-Control' => 'public, max-age=172800'
+      }
+    end
   else
     config.action_controller.perform_caching = false
 

data/spec/test_app/spec/features/inky_spec.rb

@@ -53,7 +53,7 @@ describe 'Rails', type: :feature do
       <!DOCTYPE html>
       <html>
         <head>
-          <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+          <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
           <title>inky : layout</title>
         </head>
         <body>

data/spec/test_app/spec/helper.rb

@@ -9,6 +9,6 @@ require 'slim'
 
 Rails.backtrace_cleaner.remove_silencers!
 RSpec.configure do |config|
-  config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
+  config.expect_with(:rspec) { |c| c.syntax = %i[should expect] }
   # config.infer_spec_type_from_file_location!
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inky-rb
 version: !ruby/object:Gem::Version
-  version: 1.3.7.2
+  version: 1.3.7.3
 platform: ruby
 authors:
 - ZURB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation_emails
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,6 +150,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/rails_3.gemfile
@@ -244,7 +245,8 @@ files:
 - spec/test_app/spec/features/inky_spec.rb
 - spec/test_app/spec/helper.rb
 homepage: https://github.com/zurb/inky-rb
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -262,85 +264,85 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 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.
 test_files:
-- spec/cases/button/no_link.inky
-- spec/cases/button/with_expand_class.inky
-- spec/cases/button/with_image.inky
-- spec/cases/button/with_link.inky
-- spec/cases/button/with_tricky_class.inky
-- spec/cases/callout/basic.inky
-- spec/cases/callout/with_attributes.inky
-- spec/cases/general/multiple_root.inky
-- spec/cases/general/no_tag.inky
-- spec/cases/general/root_within_text.inky
-- spec/cases/general/void_html_elements.inky
-- spec/cases/grid/columns.inky
-- spec/cases/grid/container.inky
-- spec/cases/grid/container_with_align.inky
-- spec/cases/grid/row.inky
-- spec/cases/grid/row_with_columns.inky
-- spec/cases/menu/item.inky
-- spec/cases/menu/menu.inky
-- spec/cases/menu/menu_with_align.inky
-- spec/cases/menu/menu_with_items.inky
-- spec/cases/spacer/basic.inky
-- spec/cases/spacer/with_size.inky
-- spec/cases/spacer/with_size_lg.inky
-- spec/cases/spacer/with_size_sm.inky
-- spec/cases/spacer/with_size_sm_and_lg.inky
-- spec/cases/wrapper/basic.inky
-- spec/cases/wrapper/with_align.inky
-- spec/cases/wrapper/with_attributes.inky
-- spec/cases_spec.rb
-- spec/components_spec.rb
-- spec/configuration_spec.rb
-- spec/grid_spec.rb
-- spec/inky_spec.rb
 - spec/spec_helper.rb
+- spec/test_app/app/mailers/application_mailer.rb
 - spec/test_app/app/controllers/application_controller.rb
 - spec/test_app/app/controllers/inky_controller.rb
-- spec/test_app/app/helpers/application_helper.rb
-- spec/test_app/app/mailers/application_mailer.rb
-- spec/test_app/app/views/inky/_inky_partial.html.inky
-- spec/test_app/app/views/inky/explicit_builder.html.inky-builder
-- spec/test_app/app/views/inky/explicit_slim.html.inky-slim
+- spec/test_app/app/views/inky/simple.html.inky
 - spec/test_app/app/views/inky/layout.html.erb
+- spec/test_app/app/views/inky/explicit_slim.html.inky-slim
+- spec/test_app/app/views/inky/_inky_partial.html.inky
 - spec/test_app/app/views/inky/non_inky.html.erb
-- spec/test_app/app/views/inky/simple.html.inky
+- spec/test_app/app/views/inky/explicit_builder.html.inky-builder
 - spec/test_app/app/views/inky/slim.html.inky
-- spec/test_app/app/views/layouts/application.html.erb
 - spec/test_app/app/views/layouts/inky_layout.html.inky
-- spec/test_app/config/application.rb
-- spec/test_app/config/boot.rb
+- spec/test_app/app/views/layouts/application.html.erb
+- spec/test_app/app/helpers/application_helper.rb
+- spec/test_app/config/secrets.yml
+- spec/test_app/config/routes.rb
+- spec/test_app/config/locales/en.yml
 - spec/test_app/config/cable.yml
-- spec/test_app/config/database.yml
-- spec/test_app/config/environment.rb
-- spec/test_app/config/environments/development.rb
 - spec/test_app/config/environments/production.rb
+- spec/test_app/config/environments/development.rb
 - spec/test_app/config/environments/test.rb
+- spec/test_app/config/spring.rb
+- spec/test_app/config/environment.rb
+- spec/test_app/config/application.rb
+- spec/test_app/config/puma.rb
+- spec/test_app/config/database.yml
+- spec/test_app/config/boot.rb
 - spec/test_app/config/initializers/application_controller_renderer.rb
-- spec/test_app/config/initializers/assets.rb
 - spec/test_app/config/initializers/backtrace_silencers.rb
-- spec/test_app/config/initializers/cookies_serializer.rb
-- spec/test_app/config/initializers/filter_parameter_logging.rb
-- spec/test_app/config/initializers/inflections.rb
 - spec/test_app/config/initializers/mime_types.rb
-- spec/test_app/config/initializers/new_framework_defaults.rb
-- spec/test_app/config/initializers/secret_token.rb
+- spec/test_app/config/initializers/filter_parameter_logging.rb
 - spec/test_app/config/initializers/session_store.rb
 - spec/test_app/config/initializers/wrap_parameters.rb
-- spec/test_app/config/locales/en.yml
-- spec/test_app/config/puma.rb
-- spec/test_app/config/routes.rb
-- spec/test_app/config/secrets.yml
-- spec/test_app/config/spring.rb
+- spec/test_app/config/initializers/new_framework_defaults.rb
+- spec/test_app/config/initializers/assets.rb
+- spec/test_app/config/initializers/cookies_serializer.rb
+- spec/test_app/config/initializers/secret_token.rb
+- spec/test_app/config/initializers/inflections.rb
 - spec/test_app/config.ru
-- spec/test_app/Rakefile
-- spec/test_app/spec/features/inky_spec.rb
 - spec/test_app/spec/helper.rb
+- spec/test_app/spec/features/inky_spec.rb
+- spec/test_app/Rakefile
+- spec/cases_spec.rb
+- spec/grid_spec.rb
+- spec/configuration_spec.rb
+- spec/cases/wrapper/basic.inky
+- spec/cases/wrapper/with_align.inky
+- spec/cases/wrapper/with_attributes.inky
+- spec/cases/general/no_tag.inky
+- spec/cases/general/multiple_root.inky
+- spec/cases/general/void_html_elements.inky
+- spec/cases/general/root_within_text.inky
+- spec/cases/spacer/basic.inky
+- spec/cases/spacer/with_size_sm.inky
+- spec/cases/spacer/with_size_lg.inky
+- spec/cases/spacer/with_size_sm_and_lg.inky
+- spec/cases/spacer/with_size.inky
+- spec/cases/callout/basic.inky
+- spec/cases/callout/with_attributes.inky
+- spec/cases/button/with_tricky_class.inky
+- spec/cases/button/with_expand_class.inky
+- spec/cases/button/with_link.inky
+- spec/cases/button/no_link.inky
+- spec/cases/button/with_image.inky
+- spec/cases/menu/menu_with_items.inky
+- spec/cases/menu/menu_with_align.inky
+- spec/cases/menu/menu.inky
+- spec/cases/menu/item.inky
+- spec/cases/grid/row.inky
+- spec/cases/grid/row_with_columns.inky
+- spec/cases/grid/columns.inky
+- spec/cases/grid/container.inky
+- spec/cases/grid/container_with_align.inky
+- spec/components_spec.rb
+- spec/inky_spec.rb