inky-rb 1.3.6.2 → 1.3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70d84a75f2e9381d149d54dfb5fe9e965ad0dcb
-  data.tar.gz: dfb5d7fa5a16a9a332f6f0dcd31652b445a7df69
+  metadata.gz: 71ce8013a2662a04d29f602103e3469f8b643438
+  data.tar.gz: 72256f8875d40b80943cb5cb77d9eb437e76c649
 SHA512:
-  metadata.gz: 53b0a6662556687a5d52d498fe47963cf7e2f53cbdc3d60e54f48a4dfbff95c55eb615401827f21f5cfd37d5f8c8cad3a710d45d218ba05eb012d56394e1d70a
-  data.tar.gz: c2729bf8cddad5ed77eda40b3fd9d866b6bce67e6ef4480b0b5ddf9955758ebb58a9eb451242e9f87091b67b74ad834f805aa6145e1a3c1e5a7e0d82daf61491
+  metadata.gz: 05a783f3a2966497ec8894945c7f389c4a76b9f16d5e70e0b50b9afc3f67877ba1976988911ed8aca605391e64c1f2ed1fb476c671b21257fb733251d07d8c9c
+  data.tar.gz: d17d71d531bd72f64d08d72e2ab1f97348ce41f1b240f1182998c6ec58bd5a4a979d0fb4971d70201923775a1bda15d455302cd7ae64002ca8cbd39b31c288d0

data/.travis.yml

@@ -0,0 +1,16 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.2.5
+gemfile:
+  - gemfiles/rails_3.gemfile
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile
+matrix:
+  exclude:
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails_5.gemfile
+before_install:
+  - gem install bundler
+  - 'npm install -g inky-cli'

data/Gemfile.lock

@@ -1,27 +1,47 @@
 PATH
   remote: .
   specs:
-    inky-rb (1.3.6.2)
+    inky-rb (1.3.6.3)
       foundation_emails (~> 2)
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.3.0)
     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)
+    parser (2.3.1.4)
+      ast (~> 2.2)
     pkg-config (1.1.7)
+    powerpack (0.1.1)
+    rainbow (2.1.0)
     rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
     rspec-core (3.5.0)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubocop (0.43.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.7.5)
+    unicode-display_width (1.1.1)
 
 PLATFORMS
   ruby
@@ -30,8 +50,10 @@ DEPENDENCIES
   bundler (~> 1.6)
   inky-rb!
   rake
+  rspec
   rspec-core
   rspec-expectations
+  rubocop
 
 BUNDLED WITH
    1.12.5

data/README.md

@@ -1,6 +1,6 @@
 # Inky
 
-[![Gem Version](https://badge.fury.io/rb/inky-rb.svg)](https://badge.fury.io/rb/inky-rb)
+[![Gem Version](https://badge.fury.io/rb/inky-rb.svg)](https://badge.fury.io/rb/inky-rb) [![Build Status](https://travis-ci.org/zurb/inky-rb.svg?branch=master)](https://travis-ci.org/zurb/inky-rb)
 
 Inky is an HTML-based templating language that converts simple HTML into complex, responsive email-ready HTML. Designed for [Foundation for Emails](http://foundation.zurb.com/emails), a responsive email framework from [ZURB](http://zurb.com).
 
@@ -101,3 +101,10 @@ Here are the names of the defaults:
 ## Programmatic Use
 
 The Inky parser can be accessed directly for programmatic use.
+
+## Requirements
+
+Inky-rb currently requires:
+
+* Ruby 2.0+
+* Rails 3, 4 or 5

data/Rakefile

@@ -1,7 +1,14 @@
 require "bundler/gem_tasks"
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
 
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec)
 rescue LoadError
 end
+
+task test_all: [:spec, :rubocop]
+
+task default: :test_all

data/gemfiles/rails_3.gemfile

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

data/gemfiles/rails_4.gemfile

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

data/gemfiles/rails_5.gemfile

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

data/inky.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |s|
   s.add_dependency "nokogiri"
   s.add_development_dependency "bundler", "~> 1.6"
   s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rubocop"
 end

data/lib/inky/rails/version.rb

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

data/lib/inky.rb

@@ -33,7 +33,9 @@ module Inky
       raws, str = Inky::Core.extract_raws(xml_string)
       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)
+      string = xml_doc.to_s
+      string.sub!(/^<\?xml.*\?>\n/, '')
+      Inky::Core.re_inject_raws(string, raws)
     end
 
     def components_exist?(_xml_doc)

data/spec/components_spec.rb

@@ -355,8 +355,8 @@ end
 
 RSpec.describe "raw" do
   it 'creates a wrapper that ignores anything inside' do
-    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"
+    input = "<body><raw><<LCG ProgramTG LCG Coupon Code Default='246996'>></raw></body>"
+    expected = "<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/spec_helper.rb

@@ -1,5 +1,14 @@
 require 'inky'
 
+def reformat_html(html)
+  html
+    .gsub(/\s+/, ' ')                           # Compact all whitespace to a single space
+    .gsub(/> *</, ">\n<")                       # Use returns between tags
+    .gsub(%r{<(\w+)([^>]*)>\n</\1>}, '<\1\2/>') # Auto close empty tags, e.g. <hr>\n</hr> => <hr/>
+    .gsub(/ "/, '"').gsub(/\=" /, '="')         # Remove leading/trailing spaces inside attributes
+    .gsub(/ </, '<').gsub(/> /, '>')            # Remove leading/trailing spaces inside tags
+end
+
 def compare(input, expected)
   inky = Inky::Core.new
   output = inky.release_the_kraken(input)
@@ -7,7 +16,5 @@ 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 = Nokogiri::XML(output).to_s.gsub(/\s/, '')
-  expected_str = Nokogiri::XML(expected).to_s.gsub(/\s/, '')
-  expect(output_str).to eql(expected_str)
+  expect(reformat_html(output)).to eql(reformat_html(expected))
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inky-rb
 version: !ruby/object:Gem::Version
-  version: 1.3.6.2
+  version: 1.3.6.3
 platform: ruby
 authors:
 - ZURB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation_emails
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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.  '
@@ -77,10 +105,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- gemfiles/rails_3.gemfile
+- gemfiles/rails_4.gemfile
+- gemfiles/rails_5.gemfile
 - inky.gemspec
 - lib/component_factory.rb
 - lib/generators/inky/install_generator.rb