RubyGems - antwort - Versions diffs - 0.0.12 → 1.0.0 - Mend

antwort 0.0.12 → 1.0.0

Files changed (96) hide show

checksums.yaml +4 -4
data/.gitignore +1 -0
data/.rubocop.yml +12 -0
data/.ruby-version +1 -1
data/CHANGELOG.md +28 -1
data/README.md +1 -1
data/antwort.gemspec +2 -2
data/lib/antwort.rb +5 -4
data/lib/antwort/builder/builder.rb +15 -24
data/lib/antwort/builder/email.rb +47 -22
data/lib/antwort/builder/flattener.rb +8 -9
data/lib/antwort/builder/partial.rb +12 -11
data/lib/antwort/builder/style.rb +26 -27
data/lib/antwort/{builder.rb → builders.rb} +3 -3
data/lib/antwort/cli.rb +0 -1
data/lib/antwort/cli/cli.rb +42 -48
data/lib/antwort/cli/send.rb +11 -14
data/lib/antwort/cli/upload.rb +29 -28
data/lib/antwort/core.rb +4 -0
data/lib/antwort/email/build.rb +41 -0
data/lib/antwort/email/collection.rb +41 -0
data/lib/antwort/email/data.rb +27 -0
data/lib/antwort/email/template.rb +88 -0
data/lib/antwort/helpers/file_helper.rb +27 -0
data/lib/antwort/{helpers.rb → helpers/helper.rb} +2 -2
data/lib/antwort/helpers/logic_helper.rb +81 -0
data/lib/antwort/helpers/markup_helper.rb +37 -0
data/lib/antwort/{builder/helpers/sanitizers.rb → helpers/sanitizers_helper.rb} +2 -4
data/lib/antwort/helpers/server_helper.rb +32 -0
data/lib/antwort/{server.rb → server/server.rb} +26 -23
data/{template/project → lib/antwort/server}/views/404.html.erb +1 -1
data/{template/project → lib/antwort/server}/views/index.html.erb +4 -6
data/{template/project → lib/antwort/server}/views/layout.erb +5 -5
data/{template/project/views/markup/_button.html.erb → lib/antwort/server/views/markup/button.html.erb} +0 -0
data/{template/project/views/markup/_image_tag.html.erb → lib/antwort/server/views/markup/image_tag.html.erb} +0 -0
data/{template/project → lib/antwort/server}/views/server.erb +0 -0
data/lib/antwort/version.rb +1 -1
data/spec/builder/builder_spec.rb +17 -22
data/spec/builder/email_spec.rb +11 -12
data/spec/builder/flattener_spec.rb +20 -21
data/spec/builder/helpers_logic_spec.rb +69 -73
data/spec/builder/partial_spec.rb +42 -51
data/spec/builder/style_spec.rb +25 -34
data/spec/{cli_spec.rb → cli/cli_spec.rb} +8 -9
data/spec/cli/send_spec.rb +80 -0
data/spec/cli/upload_spec.rb +17 -9
data/spec/email/build_spec.rb +13 -0
data/spec/email/collection_spec.rb +56 -0
data/spec/email/data_spec.rb +40 -0
data/spec/email/template_spec.rb +116 -0
data/spec/fixtures/assets/css/demo/include.scss +3 -0
data/spec/fixtures/assets/css/demo/inline.scss +33 -0
data/spec/fixtures/assets/css/no-images/include.scss +1 -0
data/spec/fixtures/assets/css/no-images/inline.scss +2 -0
data/spec/fixtures/assets/css/shared/_base.scss +64 -0
data/spec/fixtures/assets/css/shared/_mixins.scss +25 -0
data/spec/fixtures/assets/css/shared/_reset.scss +59 -0
data/spec/fixtures/assets/css/shared/_vars.scss +12 -0
data/spec/fixtures/assets/css/shared/include.scss +23 -0
data/spec/fixtures/assets/css/shared/inline.scss +9 -0
data/spec/fixtures/build/demo-20160101/demo.html +177 -0
data/spec/fixtures/build/demo-20160101/source/demo.html +118 -0
data/spec/fixtures/build/demo-20160101/source/include.css +58 -0
data/spec/fixtures/build/demo-20160101/source/inline.css +83 -0
data/spec/fixtures/build/demo-20160102/demo.html +177 -0
data/spec/fixtures/build/demo-20160102/source/demo.html +118 -0
data/spec/fixtures/build/demo-20160102/source/include.css +58 -0
data/spec/fixtures/build/demo-20160102/source/inline.css +83 -0
data/{template/project/data/.empty_directory → spec/fixtures/emails/1-demo/_bar.erb} +0 -0
data/spec/fixtures/emails/1-demo/_foo.erb +0 -0
data/spec/fixtures/emails/1-demo/index.html.erb +2 -2
data/spec/fixtures/emails/4-custom-layout/index.html.erb +6 -0
data/spec/fixtures/emails/4-custom-layout/layout.erb +5 -0
data/spec/fixtures/emails/demo/index.html.erb +4 -0
data/spec/fixtures/emails/no-images/index.html.erb +4 -0
data/spec/fixtures/emails/shared/_foo.erb +0 -0
data/spec/fixtures/{views → emails/shared}/layout.erb +0 -0
data/spec/helpers/file_helper_spec.rb +30 -0
data/spec/server/server_spec.rb +57 -0
data/spec/spec_helper.rb +18 -7
data/template/project/Gemfile.tt +1 -7
metadata +92 -42
data/lib/antwort/builder/helpers/logic.rb +0 -82
data/lib/antwort/cli/helpers.rb +0 -44
data/lib/antwort/server/helpers.rb +0 -67
data/lib/antwort/server/markup.rb +0 -39
data/spec/cli/helpers_spec.rb +0 -60
data/spec/fixtures/build/demo-123456/build.html +0 -7
data/spec/fixtures/build/demo-123457/build.html +0 -7
data/spec/fixtures/build/demo-bar-123/build.html +0 -7
data/spec/fixtures/views/404.html.erb +0 -1
data/spec/fixtures/views/index.html.erb +0 -14
data/spec/fixtures/views/server.erb +0 -5
data/spec/server_spec.rb +0 -54
data/template/project/.ruby-version +0 -1
data/template/project/data/config.yml +0 -3

data/{template/project → lib/antwort/server}/views/layout.erb RENAMED Viewed

@@ -7,15 +7,15 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- enable media queries for windows phone 8 -->
    <meta name="format-detection" content="telephone=no"> <!-- disable auto telephone linking in iOS -->
   <title><%= @title || "Email Title" %></title>
-  <link rel="stylesheet" type="text/css" href="/assets/<%= @template %>/inline.css">
-  <link rel="stylesheet" type="text/css" href="/assets/<%= @template %>/include.css">
+  <link rel="stylesheet" type="text/css" href="/assets/<%= @template.name %>/inline.css">
+  <link rel="stylesheet" type="text/css" href="/assets/<%= @template.name %>/include.css">
 </head>
-<body bgcolor="<%= @config.styles[:background_color] %>" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 <!-- 100% wrapper (grey background) -->
-<table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0" bgcolor="<%= @config.styles[:background_color] %>">
+<table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
   <tr>
-    <td align="center" valign="top" bgcolor="<%= @config.styles[:background_color] %>" style="background-color: <%= @config.styles[:background_color] %>;">
+    <td align="center" valign="top">
       <br>

data/{template/project/views/markup/_button.html.erb → lib/antwort/server/views/markup/button.html.erb} RENAMED Viewed

File without changes

data/{template/project/views/markup/_image_tag.html.erb → lib/antwort/server/views/markup/image_tag.html.erb} RENAMED Viewed

File without changes

data/{template/project → lib/antwort/server}/views/server.erb RENAMED Viewed

File without changes

data/lib/antwort/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Antwort
-  VERSION = '0.0.12'
+  VERSION = '1.0.0'.freeze
 end

data/spec/builder/builder_spec.rb CHANGED Viewed

@@ -1,30 +1,25 @@
-require "spec_helper"
+require 'spec_helper'
 describe Antwort::Builder do
-  before :each do
-    @builder = Antwort::Builder.new
-  end
+  let(:build) { Antwort::Builder.new }
-  describe "Initialize" do
-    it "has a template_name"
-    it "has a build_id"
-    it "has a markup_dir"
-    it "has a source_dir"
-    it "has a scss_dir"
-    it "has an asset_server"
+  describe 'Initialize' do
+    it 'has a template_name'
+    it 'has a build_id'
+    it 'has a markup_dir'
+    it 'has a source_dir'
+    it 'has a scss_dir'
+    it 'has an asset_server'
   end
-  describe "Compiles" do
-    it "SCSS"
-    it "inline.scss"
-    it "include.scss"
+  describe 'Compiles' do
+    it 'SCSS'
+    it 'inline.scss'
+    it 'include.scss'
   end
-  describe "Helpers" do
-    it "creates files"
-    it "creates IDs from Timestamps"
-    it "changes relative assets URLs to use asset server"
-    it "preserves `&nbsp;`s"
+  describe 'Helpers' do
+    it 'changes relative assets URLs to use asset server'
+    it 'preserves `&nbsp;`s'
   end
-end
+end

data/spec/builder/email_spec.rb CHANGED Viewed

@@ -1,21 +1,20 @@
-require "spec_helper"
+require 'spec_helper'
 describe Antwort::EmailBuilder do
   before :each do
     @builder = Antwort::EmailBuilder.new
   end
-  describe "Builds" do
-    it "builds HTML"
-    it "inlines CSS"
+  describe 'Builds' do
+    it 'builds HTML'
+    it 'inlines CSS'
   end
-  describe "Helpers" do
-    it "can inline CSS"
-    it "cleans up markup"
-    it "removes livereload"
-    it "adds in the included CSS"
-    it "removes excessive newlines"
+  describe 'Helpers' do
+    it 'can inline CSS'
+    it 'cleans up markup'
+    it 'removes livereload'
+    it 'adds in the included CSS'
+    it 'removes excessive newlines'
   end
-end
+end

data/spec/builder/flattener_spec.rb CHANGED Viewed

@@ -1,64 +1,63 @@
-require "spec_helper"
+require 'spec_helper'
 describe Antwort::Flattener do
-  describe "initialize" do
-    it "saves source to a attr_reader" do
+  describe 'initialize' do
+    it 'saves source to a attr_reader' do
       s = Antwort::Flattener.new('<td>')
       expect(s.source).to eq('<td>')
     end
-    describe "saves matches to an array" do
-      it "matches single style per source" do
+    describe 'saves matches to an array' do
+      it 'matches single style per source' do
         s = Antwort::Flattener.new('<div style="color:black">')
         expect(s.styles).to eq(['color:black'])
       end
-      it "matches multiple styles per source" do
+      it 'matches multiple styles per source' do
         s = Antwort::Flattener.new('<td style="background-color:#cccccc"><div style="color: red">')
         expect(s.styles).to eq(['background-color:#cccccc', 'color: red'])
       end
     end
   end
-  describe "flattens css styles" do
-    it "a single match" do
+  describe 'flattens css styles' do
+    it 'a single match' do
       s = Antwort::Flattener.new('<div style="color:black;color:red;background:white;">').flatten
       expect(s.flattened).to eq('<div style="color:red;background:white">')
     end
-    describe "multiple styles" do
-      let (:style) { Antwort::Flattener.new('<td style="color:black;color:red;"><div style="background:white;">').flatten }
+    describe 'multiple styles' do
+      let(:style) { Antwort::Flattener.new('<td style="color:black;color:red;"><div style="background:white;">').flatten }
-      it "stores original source as a string" do
+      it 'stores original source as a string' do
         expect(style.source).to eq('<td style="color:black;color:red;"><div style="background:white;">')
       end
-      it "stores flattened source as a string" do
+      it 'stores flattened source as a string' do
         expect(style.flattened).to eq('<td style="color:red"><div style="background:white">')
       end
     end
-    describe "method flattened?" do
-      it "returns true if changes where made" do
+    describe 'method flattened?' do
+      it 'returns true if changes where made' do
         s = Antwort::Flattener.new('<td style="color: red; color: black;">').flatten
         expect(s.flattened?).to eq(true)
       end
-      it "returns false if chnages were not made" do
+      it 'returns false if chnages were not made' do
         s = Antwort::Flattener.new('<td style"color:red">').flatten
         expect(s.flattened?).to eq(false)
       end
     end
   end
-  describe "code cleanup" do
-    let (:style) { Antwort::Flattener.new('<td style="color: black;">').flatten }
+  describe 'code cleanup' do
+    let(:style) { Antwort::Flattener.new('<td style="color: black;">').flatten }
-    it "removes trailing semicolon;" do
+    it 'removes trailing semicolon;' do
       expect(style.flattened).to eq('<td style="color:black">')
       expect(style.flattened).not_to eq('<td style="color:black;">')
     end
-    it "remove extra white space" do
+    it 'remove extra white space' do
       expect(style.flattened).not_to eq('<td style="color: black">')
     end
   end
-end
+end

data/spec/builder/helpers_logic_spec.rb CHANGED Viewed

@@ -4,63 +4,62 @@ class Dummy
 end
 describe Antwort::LogicHelpers do
   before :each do
     @helper = Dummy.new
     @helper.extend(Antwort::LogicHelpers)
   end
-  describe "non breaking spaces" do
-    it "preserves by adjusting markup" do
+  describe 'non breaking spaces' do
+    it 'preserves by adjusting markup' do
       expect(@helper.preserve_nbsps('foo&nbsp;bar')).to eq('foo%nbspace%bar')
     end
-    it "can restore to proper markup" do
+    it 'can restore to proper markup' do
       expect(@helper.restore_nbsps('foo%nbspace%bar')).to eq('foo&nbsp;bar')
     end
   end
-  describe "statements" do
-    it "preserves erb markup" do
+  describe 'statements' do
+    it 'preserves erb markup' do
       expect(@helper.preserve_logic('<% user.merge!({clear: true}) %>')).to eq('{% user.merge!({clear: true}) %}')
     end
   end
   #-- Comments --
-  describe "comments" do
-    it "preserves erb comments" do
+  describe 'comments' do
+    it 'preserves erb comments' do
       h = {
-        "<%# foo %>"  => "{# foo #}",
-        "<% # foo %>" => "{# foo #}",
-        "<% #foo %>"  => "{# foo #}",
-        "<%#= foo %>" => "{#= foo #}",
-        "<%# foo bar == cat %>" => "{# foo bar == cat #}"
+        '<%# foo %>'  => '{# foo #}',
+        '<% # foo %>' => '{# foo #}',
+        '<% #foo %>'  => '{# foo #}',
+        '<%#= foo %>' => '{#= foo #}',
+        '<%# foo bar == cat %>' => '{# foo bar == cat #}'
       }
       h.each do |key, value|
         expect(@helper.preserve_logic(key)).to eq(value)
       end
     end
-    it "preserves comments despite leading/trailing spaces" do
+    it 'preserves comments despite leading/trailing spaces' do
       expect(@helper.preserve_logic('<% # foo %>')).to eq('{# foo #}')
     end
   end
   #-- Variables --
-  describe "variable outputs" do
-    it "preserves interpolated strings" do
+  describe 'variable outputs' do
+    it 'preserves interpolated strings' do
       expect(@helper.preserve_logic('<%= "color: #{foo};" %>')).to eq('{{ "color: #{foo};" }}')
     end
-    context "hashes" do
-      it "preserves nested" do
+    context 'hashes' do
+      it 'preserves nested' do
         expect(@helper.preserve_logic('<%= foo[:bar] %>')).to eq('{{ foo.bar }}')
         expect(@helper.preserve_logic('<%= foo[:bar][:cat] %>')).to eq('{{ foo.bar.cat }}')
       end
-      it "preseves string keys" do
+      it 'preseves string keys' do
         expect(@helper.preserve_logic("<%= foo['bar'] %>")).to eq('{{ foo.bar }}')
         expect(@helper.preserve_logic("<%= foo['bar']['cat'] %>")).to eq('{{ foo.bar.cat }}')
         expect(@helper.preserve_logic('<%= foo["bar"] %>')).to eq('{{ foo.bar }}')
@@ -71,56 +70,55 @@ describe Antwort::LogicHelpers do
   #-- Assignments --
-  describe "preserves assignments" do
-    describe "incl. variables" do
-      it "well-formatted code" do
-        expect(@helper.preserve_logic("<% foo = bar %>")).to eq("{% set foo = bar %}")
+  describe 'preserves assignments' do
+    describe 'incl. variables' do
+      it 'well-formatted code' do
+        expect(@helper.preserve_logic('<% foo = bar %>')).to eq('{% set foo = bar %}')
       end
-      it "not well-formatted code" do
-        expect(@helper.preserve_logic("<% foo=bar %>")).to eq("{% set foo = bar %}")
-        expect(@helper.preserve_logic("<% foo =bar %>")).to eq("{% set foo = bar %}")
-        expect(@helper.preserve_logic("<% foo=bar %>")).to eq("{% set foo = bar %}")
+      it 'not well-formatted code' do
+        expect(@helper.preserve_logic('<% foo=bar %>')).to eq('{% set foo = bar %}')
+        expect(@helper.preserve_logic('<% foo =bar %>')).to eq('{% set foo = bar %}')
+        expect(@helper.preserve_logic('<% foo=bar %>')).to eq('{% set foo = bar %}')
       end
     end
-    it "incl. strings" do
+    it 'incl. strings' do
       expect(@helper.preserve_logic('<% foo = "bar" %>')).to eq('{% set foo = "bar" %}')
       expect(@helper.preserve_logic("<% foo = 'bar' %>")).to eq("{% set foo = 'bar' %}")
     end
-    it "incl. integers" do
+    it 'incl. integers' do
       expect(@helper.preserve_logic('<% foo = 1 %>')).to eq('{% set foo = 1 %}')
       expect(@helper.preserve_logic('<% foo=1 %>')).to eq('{% set foo = 1 %}')
     end
-    it "incl. arrays" do
+    it 'incl. arrays' do
       h = {
-        "<% foo = [1] %>" => "{% set foo = [1] %}",
-        "<% foo = [ 1 ] %>" => "{% set foo = [ 1 ] %}",
-        "<% foo = [1,2] %>" => "{% set foo = [1,2] %}",
-        "<% foo = [1, 2, 3] %>" => "{% set foo = [1, 2, 3] %}"
+        '<% foo = [1] %>' => '{% set foo = [1] %}',
+        '<% foo = [ 1 ] %>' => '{% set foo = [ 1 ] %}',
+        '<% foo = [1,2] %>' => '{% set foo = [1,2] %}',
+        '<% foo = [1, 2, 3] %>' => '{% set foo = [1, 2, 3] %}'
       }
       h.each do |key, value|
         expect(@helper.preserve_logic(key)).to eq(value)
       end
     end
-    it "incl. objects/hashes" do
+    it 'incl. objects/hashes' do
       expect(@helper.preserve_logic('<% foo =  { key: val } %>')).to eq('{% set foo = { key: val } %}')
     end
-    it "respects memoized assignemnts" do
+    it 'respects memoized assignemnts' do
       expect(@helper.preserve_logic('<% foo ||= "bar" %>')).to eq('{% set foo = foo || "bar" %}')
     end
   end
   #-- Conditionals --
-  describe "conditionals" do
-    describe "if" do
-      it "/ end" do
+  describe 'conditionals' do
+    describe 'if' do
+      it '/ end' do
         h = {
           '<% if foo %>do something<% end %>'           => '{% if foo %}do something{% end %}',
           '<%if foo%>do something<%end%>'               => '{% if foo %}do something{% end %}',
@@ -128,29 +126,29 @@ describe Antwort::LogicHelpers do
           '<% if foo = \'bar\' %>do something<% end %>' => '{% if foo = \'bar\' %}do something{% end %}',
           '<% if foo = "bar" %>do something<% end %>'   => '{% if foo = "bar" %}do something{% end %}',
           '<% if i < @config.products.length - 1 %>'    => '{% if i < @config.products.length - 1 %}',
-          '<% if i<@config.products.length-1 %>'    => '{% if i<@config.products.length-1 %}'
+          '<% if i<@config.products.length-1 %>'        => '{% if i<@config.products.length-1 %}'
         }
         h.each do |key, value|
           expect(@helper.preserve_logic(key)).to eq(value)
         end
       end
-      it "/ else / end" do
+      it '/ else / end' do
         expect(@helper.preserve_logic('<% if foo %>bar<% else %>cat<% end %>')).to eq('{% if foo %}bar{% else %}cat{% end %}')
       end
-      it "/ elsif / else / end" do
+      it '/ elsif / else / end' do
         expect(@helper.preserve_logic('<% if foo = bar %>bar<% elsif foo = cat %>cat<% else %>dog<% end %>')).to eq('{% if foo = bar %}bar{% elseif foo = cat %}cat{% else %}dog{% end %}')
       end
     end
-    describe "unless" do
-      it "/ end" do
+    describe 'unless' do
+      it '/ end' do
         expect(@helper.preserve_logic('<% unless foo %>')).to eq('{% if !( foo ) %}')
         expect(@helper.preserve_logic('<% unless foo == bar - 1 %>')).to eq('{% if !( foo == bar - 1 ) %}')
       end
-      it "/ else / end" do
+      it '/ else / end' do
         expect(@helper.preserve_logic('<% unless foo == bar %>this<% else %>that<% end %>')).to eq('{% if !( foo == bar ) %}this{% else %}that{% end %}')
       end
     end
@@ -158,23 +156,23 @@ describe Antwort::LogicHelpers do
   #-- Loops --
-  describe "loops" do
-    it "preserves each loops as for loops" do
+  describe 'loops' do
+    it 'preserves each loops as for loops' do
       h = {
-        "<% cats.each do |cat| %>" => "{% for cat in cats %}",
-        "<% cats.each do | cat | %>" => "{% for cat in cats %}",
-        "<% end %>" => "{% end %}"
+        '<% cats.each do |cat| %>' => '{% for cat in cats %}',
+        '<% cats.each do | cat | %>' => '{% for cat in cats %}',
+        '<% end %>' => '{% end %}'
       }
       h.each do |key, value|
         expect(@helper.preserve_logic(key)).to eq(value)
       end
     end
-    it "preserves each_with_index" do
+    it 'preserves each_with_index' do
       h = {
-        "<% cats.each_with_index do | cat , i | %>" => "{% for cat in cats with: {@index: i} %}",
-        "<% cats.each_with_index do |cat, i| %>" => "{% for cat in cats with: {@index: i} %}",
-        "<% cats.each_with_index do |cat,i| %>" => "{% for cat in cats with: {@index: i} %}"
+        '<% cats.each_with_index do | cat , i | %>' => '{% for cat in cats with: {@index: i} %}',
+        '<% cats.each_with_index do |cat, i| %>' => '{% for cat in cats with: {@index: i} %}',
+        '<% cats.each_with_index do |cat,i| %>' => '{% for cat in cats with: {@index: i} %}'
       }
       h.each do |key, value|
         expect(@helper.preserve_logic(key)).to eq(value)
@@ -184,13 +182,13 @@ describe Antwort::LogicHelpers do
   #-- Helpers --
-  describe "Helpers use statements syntax, not output" do
-    it "includes button" do
+  describe 'Helpers use statements syntax, not output' do
+    it 'includes button' do
       expect(@helper.preserve_logic("<%= button 'foo', '#' %>")).to eq("{% button 'foo', '#' %}")
       expect(@helper.preserve_logic("<%= button 'foo', '#', color: 'blue' %>")).to eq("{% button 'foo', '#', color: 'blue' %}")
     end
-    it "includes image_tag" do
+    it 'includes image_tag' do
       expect(@helper.preserve_logic("<%= image_tag 'photo.jpg', width: 100, alt: 'caption' %>")).to eq("{% image_tag 'photo.jpg', width: 100, alt: 'caption' %}")
       expect(@helper.preserve_logic('<%= image_tag "#{user}-photo.jpg", width: 100, alt: "caption" %>')).to eq('{% image_tag "#{user}-photo.jpg", width: 100, alt: "caption" %}')
     end
@@ -198,47 +196,45 @@ describe Antwort::LogicHelpers do
   #-- Partials --
-  describe "partials are converted to friendlier include syntax" do
-    it "with locals" do
+  describe 'partials are converted to friendlier include syntax' do
+    it 'with locals' do
       expect(@helper.preserve_logic("{{ partial :'foo', locals: bar }}")).to eq("{% include 'foo' with: bar %}")
       expect(@helper.preserve_logic("{{ partial :'foo', locals:bar }}")).to eq("{% include 'foo' with:bar %}")
       expect(@helper.preserve_logic("{{ partial :'foo', locals: {cat: cat} }}")).to eq("{% include 'foo' with: {cat: cat} %}")
     end
-    it "including multiline" do
-      markup = %q(
+    it 'including multiline' do
+      markup = <<-END
         <%= partial :'user', locals: {
           name: 'foo',
           size: bar
         } %>
-      )
-      result = %q(
+      END
+      result = <<-END
         {% include 'user' with: {
           name: 'foo',
           size: bar
         } %}
-      )
+      END
       expect(@helper.preserve_logic(markup)).to eq(result)
     end
-    it "without locals" do
+    it 'without locals' do
       expect(@helper.preserve_logic("{{ partial :'foo' }}")).to eq("{% include 'foo' %}")
-      expect(@helper.preserve_logic("{{ partial :foo }}")).to eq("{% include foo %}")
+      expect(@helper.preserve_logic('{{ partial :foo }}')).to eq('{% include foo %}')
     end
   end
-  describe "multiple statements on one line" do
-    it "does not match too early" do
+  describe 'multiple statements on one line' do
+    it 'does not match too early' do
       h = {
-        "<% if %>this<% else %>that<%end%>" => "{% if %}this{% else %}that{% end %}",
-        "<% if i==0 %><%= partial :foo %><% else %><%= partial :bar %><% end %>" => "{% if i==0 %}{% include foo %}{% else %}{% include bar %}{% end %}"
+        '<% if %>this<% else %>that<%end%>' => '{% if %}this{% else %}that{% end %}',
+        '<% if i==0 %><%= partial :foo %><% else %><%= partial :bar %><% end %>' => '{% if i==0 %}{% include foo %}{% else %}{% include bar %}{% end %}'
       }
       h.each do |key, value|
         expect(@helper.preserve_logic(key)).to eq(value)
       end
     end
   end
 end