inkcite 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aabad99d9252f3ff61ea16a6fcd79c145de6f399
-  data.tar.gz: 0642dc04ebf7c0ca068bbe6bb782bb6cf1539e2c
+  metadata.gz: 9bb7e08b66c836a2c76155628f8f95a6bc26fb8a
+  data.tar.gz: 4861793716a8cffefea911601e915c6d9faf6fdc
 SHA512:
-  metadata.gz: 0d7fd3bd14490e024b7e3a06e928c3fb796c66d47a7ada0ae4902ddff30f60cc444f178a535290ec51e32281891799eb6301c72e8f5677d066817c73f3f5279d
-  data.tar.gz: 3975bf906623676bdbbebe8cccc763326e67739a959fdadf4e3f21a7c9222dfe3385cef18ce1fa67b044dad6dae9c14f9b3d44041dcfb1ac3210d0986eb6544a
+  metadata.gz: f0dee482e05a25f5a7be7acb9f10e21b05ee346c59ba4e5428fe78b36614da4e2c2883df544e85bf6b44f8d134c9a7f5831d9ea72f1f5a2001081aaedf2f75c3
+  data.tar.gz: 38084033ae6eb914af1da477c6ceb803bf6025d02d9ced8e55a983247b416526e231805a78ccc9a3669ba81c7f930454bb73bce68a4a254b4b62d733dc4fd1da

data/README.md

@@ -5,10 +5,12 @@ Like [Middleman] is to static web sites, Inkcite makes it easy for email
 developers to keep their code DRY (don’t repeat yourself) and integrate
 versioning, testing and minification into their workflow.
 
+* Powerful media query and fluid-hybrid responsive support
 * Easy, flexible templates, variables and Helpers
 * ERB for dynamic content and easy A/B Testing and Versioning
 * Automatic link tagging and tracking
-* [Litmus]-integrated compatibility testing and analytics
+* Instant compatibility testing with [Email on Acid] or [Litmus]
+* Automatic [Litmus] Engagement analytics integration
 * Email preview distribution lists
 * Automatic image optimization using ImageOptim
 * Failsafe rules to double-check your work
@@ -92,6 +94,9 @@ of other preflight features.
 
 ## Learn More
 
+A step-by-step [tutorial] for building a modern, responsive email from start to
+finish is available on the Inkceptional blog.
+
 Documentation for Inkcite is generously hosted by the friendly folks at [Readme].
 Get started here: https://inkcite.readme.io/
 
@@ -111,7 +116,9 @@ Copyright (c) 2014-2015 Jeffrey D. Hoffman. MIT Licensed, see [LICENSE] for
 details.
 
 [Middleman]: http://middlemanapp.com
+[Email On Acid]: http://emailonacid.com
 [Litmus]: http://litmus.com
 [rubyinstaller]: http://rubyinstaller.org/
 [LICENSE]: https://github.com/inkceptional/inkcite/blob/master/LICENSE
 [Readme]: https://readme.io
+[tutorial]: http://blog.inkceptional.com/build-a-modern-responsive-email-with-inkcite/

data/lib/inkcite/cli/base.rb

@@ -50,6 +50,15 @@ module Inkcite
         Cli::Preview.invoke(email, to, options)
       end
 
+      desc 'scope [options]', 'Share this email using Litmus Scope (https://litmus.com/scope/)'
+      option :version,
+          :aliases => '-v',
+          :desc => 'Scope a specific version of the email'
+      def scope
+        require_relative 'scope'
+        Cli::Scope.invoke(email, options)
+      end
+
       desc 'server [options]', 'Start the preview server'
       option :environment,
           :aliases => '-e',

data/lib/inkcite/cli/scope.rb

@@ -0,0 +1,127 @@
+require 'inkcite/mailer'
+require 'json'
+require 'uri'
+require 'net/http'
+require 'net/https'
+
+module Inkcite
+  module Cli
+    class Scope
+
+      def self.invoke email, opts
+
+        # Push the browser preview(s) up to the server to ensure that the
+        # latest images and "view in browser" versions are available.
+        email.upload
+
+        puts "Scoping your email ..."
+
+        # Check to see if the Litmus section has been configured in the
+        # config.yml file - if so, we'll use their Litmus credentials
+        # so the email is associated with their account.
+        config = email.config[:litmus]
+
+        # True if the designer has a Litmus account.  We'll use their
+        # username and password to authenticate the request in an effort
+        # to associate it with their Litmus account.
+        has_litmus = !config.blank?
+        if has_litmus
+          username = config[:username]
+          password = config[:password]
+        end
+
+        # Litmus Scope endpoint
+        uri = URI.parse('https://litmus.com/scope/api/v1/emails/')
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+
+        # Check to see if a specific version is requested or if unspecified
+        # all versions of the email should be sent.
+        versions = Array(opts[:version] || email.versions)
+
+        versions.each do |version|
+
+          # The version of the email we will be sending.
+          view = email.view(:preview, :email, version)
+
+          subject = view.subject
+
+          # Use Mail to assemble the SMTP-formatted content of the email
+          # but don't actually send the message.  The to: and from:
+          # addresses do not need to be legitimate addresses.
+          mail = Mail.new do
+            from '"Inkcite" <inkcite@inkceptional.com>'
+            to '"Awesome Designer" <xxxxxxx@xxxxxxxxxxxx.xxx>'
+            subject subject
+
+            html_part do
+              content_type 'text/html; charset=UTF-8'
+              body view.render!
+            end
+          end
+
+          # Send an HTTPS post to Litmus with the encoded SMTP content
+          # produced by Mail.
+          scope_request = Net::HTTP::Post.new(uri.path)
+          scope_request.basic_auth(username, password) unless username.blank?
+          scope_request.set_form_data('email[source]' => mail.to_s)
+
+          begin
+
+            response = https.request(scope_request)
+            case response
+              when Net::HTTPSuccess
+                result = JSON.parse(response.body)
+                slug = result['email']['slug']
+                puts "'#{subject}' shared to https://litmus.com/scope/#{slug}"
+
+              when Net::HTTPUnauthorized
+                abort <<-ERROR.strip_heredoc
+
+                          Oops! Inkcite wasn't able to scope your email because of an
+                          authentication problem with Litmus.  Please check the settings
+                          in config.yml:
+
+                            litmus:
+                              username: '#{username}'
+                              password: '#{password}'
+
+                ERROR
+
+              when Net::HTTPServerError
+                abort <<-ERROR.strip_heredoc
+
+                           Oops! Inkcite wasn't able to scope your email because Litmus'
+                           server returned an error.  Please try again later.
+
+                           #{response.message}
+
+                ERROR
+              else
+                raise response.message
+            end
+
+          rescue Exception => e
+            abort <<-ERROR.strip_heredoc
+
+               Oops! Inkcite wasn't able to scope your email because of an
+               unexpected error.  Please try again later.
+
+                  #{e.message}
+
+            ERROR
+          end
+
+
+        end
+
+        unless has_litmus
+          puts 'Note! Your scoped email will expire in 15 days.'
+        end
+
+        true
+      end
+
+    end
+  end
+end

data/lib/inkcite/minifier.rb

@@ -136,6 +136,10 @@ module Inkcite
       minify?(ctx) ? js_compressor(ctx).compress(code) : code
     end
 
+    def self.remove_comments html, ctx
+      minify?(ctx) ? html.gsub(HTML_COMMENT_REGEX, '') : html
+    end
+
     private
 
     # Name of the Image Optim configuration yml file that can be
@@ -143,7 +147,6 @@ module Inkcite
     # optimization process.
     IMAGE_OPTIM_CONFIG_YML = 'image_optim.yml'
 
-
     NEW_LINE = "\n"
     MAXIMUM_LINE_LENGTH = 800
 
@@ -151,6 +154,11 @@ module Inkcite
     # the entire email.
     INLINE_STYLE_REGEX = /style=\"([^\"]+)\"/
 
+    # Regex to match HTML comments when removal is necessary. The ? makes
+    # the regex ungreedy.  The /m at the end ensures the regex matches
+    # multiple lines.
+    HTML_COMMENT_REGEX = /<!--(.*?)-->/m
+
     def self.minify? ctx
       ctx.is_enabled?(:minify)
     end

data/lib/inkcite/parser.rb

@@ -81,6 +81,15 @@ module Inkcite
             params[key] = value
             value = ''
             key = nil
+
+          # If a space is encountered but a value has been previously collected,
+          # a boolean attribute has been encountered - e.g. 'selected' or 'flush'.
+          # Use the value as the symbolized key and set the value to true.
+          elsif !value.blank?
+
+            params[value.to_sym] = true
+            value = ''
+
           end
 
         else

data/lib/inkcite/renderer.rb

@@ -1,6 +1,7 @@
 require_relative 'renderer/base'
 require_relative 'renderer/element'
 require_relative 'renderer/responsive'
+require_relative 'renderer/container_base'
 require_relative 'renderer/image_base'
 require_relative 'renderer/table_base'
 
@@ -44,8 +45,8 @@ module Inkcite
         value.gsub!(/…/, '...')
 
       else
-        value.gsub!(/[–—]/, '–')
-        value.gsub!(/\-\-/, '–')
+        value.gsub!(/–/, '–')
+        value.gsub!(/—/, '—')
         value.gsub!(/™/, '™')
         value.gsub!(/®/, '®')
         value.gsub!(/[‘’`]/, '’')

data/lib/inkcite/renderer/base.rb

@@ -33,6 +33,7 @@ module Inkcite
       TEXT_SHADOW_BLUR = :'shadow-blur'
       TEXT_SHADOW_OFFSET = :'shadow-offset'
       VERTICAL_ALIGN = :'vertical-align'
+      WHITE_SPACE = :'white-space'
 
       # CSS Margins
       MARGINS = [MARGIN_TOP, MARGIN_LEFT, MARGIN_BOTTOM, MARGIN_RIGHT]
@@ -93,7 +94,7 @@ module Inkcite
 
       # Sets the element's in-line bgcolor style if it has been defined
       # in the provided options.
-      def mix_background element, opt
+      def mix_background element, opt, ctx
 
         # Background color of the image, if populated.
         bgcolor = detect_bgcolor(opt)
@@ -101,7 +102,7 @@ module Inkcite
 
       end
 
-      def mix_border element, opt
+      def mix_border element, opt, ctx
 
         border = opt[:border]
         element.style[:border] = border unless border.blank?
@@ -116,6 +117,13 @@ module Inkcite
 
       end
 
+      def mix_border_radius element, opt, ctx
+
+        border_radius = opt[BORDER_RADIUS].to_i
+        element.style[BORDER_RADIUS] = px(border_radius) if border_radius > 0
+
+      end
+
       def mix_font element, opt, ctx, parent=nil
 
         # Always ensure we have a parent to inherit from.

data/lib/inkcite/renderer/container_base.rb

@@ -0,0 +1,36 @@
+module Inkcite
+  module Renderer
+    class ContainerBase < Responsive
+
+      protected
+
+      def mix_all element, opt, ctx
+
+        mix_background element, opt, ctx
+        mix_border element, opt, ctx
+        mix_border_radius element, opt, ctx
+        mix_font element, opt, ctx
+
+        # Supports both integers and mixed padding (e.g. 10px 20px)
+        padding = opt[:padding]
+        element.style[:padding] = px(padding) unless none?(padding)
+
+        # Text alignment - left, right, center.
+        align = opt[:align]
+        element.style[TEXT_ALIGN] = align unless none?(align)
+
+        # Vertical alignment - top, middle, bottom.
+        valign = opt[:valign]
+        element.style[VERTICAL_ALIGN] = valign unless none?(valign)
+
+        display = opt[:display]
+        element.style[:display] = display unless display.blank?
+
+        mix_responsive element, opt, ctx
+
+        element.to_s
+      end
+
+    end
+  end
+end

data/lib/inkcite/renderer/div.rb

@@ -1,6 +1,6 @@
 module Inkcite
   module Renderer
-    class Div < Responsive
+    class Div < ContainerBase
 
       def render tag, opt, ctx
 
@@ -14,22 +14,7 @@ module Inkcite
         height = opt[:height].to_i
         div.style[:height] = px(height) if height > 0
 
-        mix_background div, opt
-        mix_font div, opt, ctx
-
-        # Text alignment - left, right, center.
-        align = opt[:align]
-        div.style[TEXT_ALIGN] = align unless none?(align)
-
-        valign = opt[:valign]
-        div.style[VERTICAL_ALIGN] = valign unless valign.blank?
-
-        display = opt[:display]
-        div.style[:display] = display unless display.blank?
-
-        mix_responsive div, opt, ctx
-
-        div.to_s
+        mix_all div, opt, ctx
       end
 
     end

data/lib/inkcite/renderer/image.rb

@@ -7,14 +7,14 @@ module Inkcite
         img = Element.new('img', { :border => 0 })
 
         # Ensure that height and width are defined in the image's attributes.
-        mix_dimensions img, opt
+        mix_dimensions img, opt, ctx
 
         # Get the fully-qualified URL to the image or placeholder image if it's
         # missing from the images directory.
         img[:src] = image_url(opt[:src], opt, ctx)
 
-        mix_background img, opt
-        mix_border img, opt
+        mix_background img, opt, ctx
+        mix_border img, opt, ctx
 
         # Check to see if there is alt text specified for this image.  We are
         # testing against nil because sometimes the author desires an empty
@@ -40,6 +40,12 @@ module Inkcite
             text_align = opt[TEXT_ALIGN]
             img.style[TEXT_ALIGN] = text_align unless text_align.blank?
 
+            # Check to see if the alt text contains line breaks.  If so, automatically add
+            # the white-space style set to 'pre' which forces the alt text to render with
+            # that line breaks visible.
+            # https://litmus.com/community/discussions/418-line-breaks-within-alt-text
+            img.style[WHITE_SPACE] = 'pre' if alt.match(/[\n\r\f]/)
+
           end
 
         end

data/lib/inkcite/renderer/image_base.rb

@@ -42,22 +42,36 @@ module Inkcite
             width = opt[:width]
             height = opt[:height]
 
-            # As a convenience, replace missing images with placehold.it as long as they
-            # meet the minimum dimensions.  No need to spam the design with tiny, tiny
-            # placeholders.
-            src = "http://placehold.it/#{width}x#{height}.jpg"
-
-            # Check to see if the image has a background color.  If so, we'll use that
-            # to set the background color of the placeholder.
-            bgcolor = detect_bgcolor(opt)
-            src << "/#{bgcolor}".gsub('#', '') unless none?(bgcolor)
+            # Will hold the query parameters being passed to the placeholder service.
+            # I didn't name these parameters - they're from the imgix.net API.
+            query = {
+                :txtsize => 18,
+                :txttrack => 0,
+                :w => width,
+                :h => height,
+                :fm => :jpg,
+            }
 
             # Check to see if the designer specified FPO text for this placeholder -
             # otherwise default to the dimensions of the image.
             fpo = opt[:fpo]
             fpo = _src.dup if fpo.blank?
             fpo << "\n(#{width}×#{height})"
-            src << "?text=#{URI::encode(fpo)}"
+            query[:txt] = fpo
+
+            # Check to see if the image has a background color.  If so, we'll use that
+            # to set the background color of the placeholder.  We'll also pick a
+            # contrasting color for the foreground text.
+            bgcolor = detect_bgcolor(opt)
+            unless none?(bgcolor)
+              query[:bg] = bgcolor.gsub('#', '')
+              query[:txtclr] = Util::contrasting_text_color(bgcolor).gsub('#', '')
+            end
+
+            # Replace the missing image with an imgix.net-powered placeholder using
+            # the query parameters assembled above.
+            # e.g. https://placeholdit.imgix.net/~text?txtsize=18&txt=left.jpg%0A%28155%C3%97155%29&w=155&h=155&fm=jpg&txttrack=0
+            src = "//placeholdit.imgix.net/~text?#{query.to_query}"
 
           end
 
@@ -78,7 +92,7 @@ module Inkcite
         DIMENSIONS.any? { |dim| att[dim].to_i <= 0 }
       end
 
-      def mix_dimensions img, opt
+      def mix_dimensions img, opt, ctx
         DIMENSIONS.each { |dim| img[dim] = opt[dim].to_i }
       end
 

data/lib/inkcite/renderer/link.rb

@@ -1,6 +1,6 @@
 module Inkcite
   module Renderer
-    class Link < Responsive
+    class Link < ContainerBase
 
       def render tag, opt, ctx
 
@@ -37,14 +37,20 @@ module Inkcite
 
         a = Element.new('a')
 
-        mix_font a, opt, ctx
+        # Mixes the attributes common to all container elements
+        # including font, background color, border, etc.
+        mix_all a, opt, ctx
 
         id   = opt[:id]
         href = opt[:href]
 
         # If a URL wasn't provided in the HTML, then check to see if there is
-        # a link declared in the project's links_tsv file.
-        href = ctx.links_tsv[id].dup if href.blank? && ctx.links_tsv[id]
+        # a link declared in the project's links_tsv file.  If so, we need to
+        # duplicate it so that tagging doesn't get applied multiple times.
+        if href.blank?
+          links_tsv_href = ctx.links_tsv[id]
+          href = links_tsv_href.dup unless links_tsv_href.blank?
+        end
 
         # True if the href is missing.  If so, we may try to look it up by it's ID
         # or we'll insert a default TBD link.

data/lib/inkcite/renderer/mobile_image.rb

@@ -21,9 +21,9 @@ module Inkcite
         # email is viewed on a mobile device.
         img = Element.new('mobile-img')
 
-        mix_dimensions img, opt
+        mix_dimensions img, opt, ctx
 
-        mix_background img, opt
+        mix_background img, opt, ctx
 
         display = opt[:display]
         img.style[:display] = "#{display}" if display && display != BLOCK && display != DEFAULT

data/lib/inkcite/renderer/partial.rb

@@ -12,7 +12,7 @@ module Inkcite
         # Verify the file exists and route it through ERB.  Otherwise
         # let the designer know that the file is missing.
         if File.exist?(file)
-          ctx.eval_erb(File.open(file).read, file_name)
+          ctx.read_source(file)
 
         else
           ctx.error "Include not found", :file => file

data/lib/inkcite/renderer/property.rb

@@ -33,7 +33,14 @@ module Inkcite
           tag_stack = ctx.tag_stack(open_tag)
 
           # The provided opts take precedence over the ones passed to the open tag.
-          opt = tag_stack.pop.merge(opt) if tag_stack
+          if tag_stack
+
+            # Need to verify that there are open opts to pop - if a tag is closed that
+            # hasn't been opened (e.g. {h3}...{/h2}) the open_opt can be nil.
+            open_opt = tag_stack.pop
+            opt = open_opt.merge(opt) if open_opt
+
+          end
 
         end
 

data/lib/inkcite/renderer/responsive.rb

@@ -169,11 +169,11 @@ module Inkcite
 
         button_styles[:border] = cfg.border unless cfg.border.blank?
         button_styles[BORDER_BOTTOM] = cfg.border_bottom if cfg.bevel > 0
-        button_styles[BORDER_RADIUS] = Renderer.px(cfg.border_radius) if cfg.border_radius > 0
+        button_styles[BORDER_RADIUS] = Renderer.px(cfg.border_radius) unless cfg.border_radius.blank?
         button_styles[FONT_WEIGHT] = cfg.font_weight unless cfg.font_weight.blank?
         button_styles[:height] = Renderer.px(cfg.height) if cfg.height > 0
         button_styles[MARGIN_TOP] = Renderer.px(cfg.margin_top) if cfg.margin_top > 0
-        button_styles[:padding] = Renderer.px(cfg.padding) if cfg.padding > 0
+        button_styles[:padding] = Renderer.px(cfg.padding) unless cfg.padding.blank?
         button_styles[TEXT_ALIGN] = 'center'
 
         styles << Rule.new('a', BUTTON, button_styles, false)

data/lib/inkcite/renderer/span.rb

@@ -1,23 +1,13 @@
 module Inkcite
   module Renderer
-    class Span < Responsive
+    class Span < ContainerBase
 
       def render tag, opt, ctx
-
-        return '</span>' if tag == '/span'
-
-        span = Element.new('span')
-
-        padding = opt[:padding].to_i
-        span.style[:padding] = px(padding) if padding > 0
-
-        mix_font span, opt, ctx
-
-        mix_background span, opt
-
-        mix_responsive span, opt, ctx
-
-        span.to_s
+        if tag == '/span'
+          '</span>'
+        else
+          mix_all Element.new('span'), opt, ctx
+        end
       end
 
     end

data/lib/inkcite/renderer/table.rb

@@ -69,13 +69,11 @@ module Inkcite
           align = opt[:align] || opt[:float]
           table[:align] = align unless align.blank?
 
-          border_radius = opt[BORDER_RADIUS].to_i
-          table.style[BORDER_RADIUS] = px(border_radius) if border_radius > 0
+          mix_border_radius table, opt, ctx
 
           border_collapse = opt[BORDER_COLLAPSE]
           table.style[BORDER_COLLAPSE] = border_collapse unless border_collapse.blank?
 
-
           # For both fluid and fluid-drop share certain setup which is performed here.
           if is_fluid?(mobile)
 

data/lib/inkcite/renderer/table_base.rb

@@ -13,7 +13,7 @@ module Inkcite
       def mix_all element, opt, ctx
 
         mix_background element, opt, ctx
-        mix_border element, opt
+        mix_border element, opt, ctx
         mix_dimensions element, opt, ctx
 
       end

data/lib/inkcite/version.rb

@@ -1,3 +1,3 @@
 module Inkcite
-  VERSION = "1.9.1"
+  VERSION = "1.10.0"
 end

data/lib/inkcite/view.rb

@@ -333,11 +333,10 @@ module Inkcite
       @environment == :production
     end
 
-    def render!
-      raise "Already rendered" unless @content.blank?
-
-      source_file = 'source'
-      source_file << (text?? TXT_EXTENSION : HTML_EXTENSION)
+    # Helper method which reads the designated file (e.g. source.html) and
+    # performs ERB on it, strips illegal characters and comments (if minified)
+    # and returns the filtered content.
+    def read_source source_file
 
       # Will be used to assemble the parameters passed to File.open.
       # First, always open the file in read mode.
@@ -346,19 +345,35 @@ module Inkcite
       # Detect abnormal file encoding and construct the string to
       # convert such encoding to UTF-8 if specified.
       encoding = self[SOURCE_ENCODING]
-      if !encoding.blank? && encoding != UTF_8
+      unless encoding.blank? || encoding == UTF_8
         mode << encoding
         mode << UTF_8
       end
 
       # Read the original source which may include embedded Ruby.
-      source = File.open(@email.project_file(source_file), mode.join(':')).read
+      source = File.open(source_file, mode.join(':')).read
 
       # Run the content through Erubis
-      filtered = self.eval_erb(source, source_file)
+      source = self.eval_erb(source, source_file)
+
+      # If minification is enabled this will remove anything that has been
+      # <!-- commented out --> to ensure the email is as small as possible.
+      source = Minifier.remove_comments(source, self)
 
       # Protect against unsupported characters
-      Renderer.fix_illegal_characters filtered, self
+      source = Renderer.fix_illegal_characters(source, self)
+
+      source
+    end
+
+    def render!
+      raise "Already rendered" unless @content.blank?
+
+      source_file = 'source'
+      source_file << (text?? TXT_EXTENSION : HTML_EXTENSION)
+
+      # Read the original source which may include embedded Ruby.
+      filtered = read_source(@email.project_file(source_file))
 
       # Filter each of the lines of text and push them onto the stack of lines
       # that we be written into the text or html file.

data/test/minifier_spec.rb

@@ -17,4 +17,12 @@ describe Inkcite::View do
     Inkcite::Minifier.html(["This string has trailing line-breaks.\n\r\f"], @view).must_equal('This string has trailing line-breaks.')
   end
 
+  it "removes HTML comments" do
+    Inkcite::Minifier.remove_comments(%Q(I am <!-- This is an HTML comment -->not commented<!-- This is another comment --> out), @view).must_equal('I am not commented out')
+  end
+
+  it "removes multi-line HTML comments" do
+    Inkcite::Minifier.remove_comments(%Q(I am not <!-- This is a\n\nmulti-line HTML\ncomment -->commented out), @view).must_equal('I am not commented out')
+  end
+
 end

data/test/parser_spec.rb

@@ -8,6 +8,15 @@ describe Inkcite::Parser do
     Inkcite::Parser.parameters('border=1').must_equal({ :border => '1' })
   end
 
+  it 'can resolve name-only boolean parameters' do
+    Inkcite::Parser.parameters('selected').must_equal({ :selected => true })
+  end
+
+  it 'can resolve combinations of name=value and boolean parameters' do
+    Inkcite::Parser.parameters('border=1 selected').must_equal({ :border => '1', :selected => true })
+    Inkcite::Parser.parameters('selected border=1').must_equal({ :border => '1', :selected => true })
+  end
+
   it 'can resolve parameters with dashes in the name' do
     Inkcite::Parser.parameters('border-radius=5').must_equal({ :'border-radius' => '5' })
   end

data/test/project/config.yml

@@ -91,7 +91,7 @@ preview:
 # These overrides apply to the final, ready-to-send files.
 production:
   cache-bust: false
-  image-host: "http://production.imagehost.com/emails/myemail"
+  image-host: "http://production.imagehost.com/emails/myemail/"
 
   email:
     view-in-browser-url: 'http://production.contenthost.com/path/{filename}'

data/test/renderer/image_spec.rb

@@ -20,12 +20,12 @@ describe Inkcite::Renderer::Image do
 
   it 'substitutes a placeholder for a missing image of sufficient size' do
     @view.config[Inkcite::Email::IMAGE_PLACEHOLDERS] = true
-    Inkcite::Renderer.render('{img src=missing.jpg height=50 width=100}', @view).must_equal('<img border=0 height=50 src="http://placehold.it/100x50.jpg?text=missing.jpg%0A(100%C3%9750)" style="display:block" width=100>')
+    Inkcite::Renderer.render('{img src=missing.jpg height=50 width=100}', @view).must_equal('<img border=0 height=50 src="//placeholdit.imgix.net/~text?fm=jpg&h=50&txt=missing.jpg%0A%28100%C3%9750%29&txtsize=18&txttrack=0&w=100" style="display:block" width=100>')
   end
 
   it 'has configurable placeholder text' do
     @view.config[Inkcite::Email::IMAGE_PLACEHOLDERS] = true
-    Inkcite::Renderer.render('{img src=missing.jpg height=50 width=100 fpo="F P O"}', @view).must_equal('<img border=0 height=50 src="http://placehold.it/100x50.jpg?text=F%20P%20O%0A(100%C3%9750)" style="display:block" width=100>')
+    Inkcite::Renderer.render('{img src=missing.jpg height=50 width=100 fpo="F P O"}', @view).must_equal('<img border=0 height=50 src="//placeholdit.imgix.net/~text?fm=jpg&h=50&txt=F+P+O%0A%28100%C3%9750%29&txtsize=18&txttrack=0&w=100" style="display:block" width=100>')
   end
 
   it 'does not substitute placeholders for small images' do
@@ -87,4 +87,12 @@ describe Inkcite::Renderer::Image do
     Inkcite::Renderer.render('{img src=inkcite.jpg height=200 width=325 mobile=fluid}', @view).must_equal('<img border=0 src="images/inkcite.jpg" style="display:block;height:auto;max-width:325px;width:100%" width=325>')
   end
 
+  it 'supports multi-line alt text' do
+    Inkcite::Renderer.render(%Q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), @view).must_equal(%Q(<img alt="Multiple\nLine\nAlt\nText" border=0 height=150 src="images/inkcite.jpg" style="display:block;white-space:pre" width=100>))
+  end
+
+  it 'supports multi-line alt text in production, too' do
+    Inkcite::Renderer.render(%Q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), Inkcite::Email.new('test/project/').view(:production, :email)).must_equal(%Q(<img alt="Multiple\nLine\nAlt\nText" border=0 height=150 src="http://production.imagehost.com/emails/myemail/inkcite.jpg" style="display:block;white-space:pre" width=100>))
+  end
+
 end

data/test/renderer/link_spec.rb

@@ -36,7 +36,9 @@ describe Inkcite::Renderer::Link do
 
   it 'tags a reused link once and only once' do
     @view.config[:'tag-links'] = "tag=inkcite|{id}"
-    Inkcite::Renderer.render('{a id="litmus" href="http://litmus.com"}Test Emails Here{/a}{a id="litmus"}Also Here{/a}', @view).must_equal('<a href="http://litmus.com?tag=inkcite|litmus" style="color:#0099cc;text-decoration:none" target=_blank>Test Emails Here</a><a href="http://litmus.com?tag=inkcite|litmus" style="color:#0099cc;text-decoration:none" target=_blank>Also Here</a>')
+    @view.links_tsv['litmus'] = 'http://litmus.com'
+
+    Inkcite::Renderer.render('{a id="litmus"}Test Emails Here{/a}{a id="litmus"}Also Here{/a}', @view).must_equal('<a href="http://litmus.com?tag=inkcite|litmus" style="color:#0099cc;text-decoration:none" target=_blank>Test Emails Here</a><a href="http://litmus.com?tag=inkcite|litmus" style="color:#0099cc;text-decoration:none" target=_blank>Also Here</a>')
 
   end
 

data/test/renderer/mobile_image_spec.rb

@@ -17,7 +17,7 @@ describe Inkcite::Renderer::MobileImage do
   it 'substitutes a placeholder for a missing image of sufficient size' do
     @view.config[Inkcite::Email::IMAGE_PLACEHOLDERS] = true
     Inkcite::Renderer.render('{mobile-img src=inkcite-mobile.jpg height=100 width=300}{/mobile-img}', @view).must_equal('<span class="i01 img"></span>')
-    @view.media_query.find_by_klass('i01').to_css.must_equal('span[class~="i01"] { background-image:url("http://placehold.it/300x100.jpg?text=inkcite-mobile.jpg%0A(300%C3%97100)");height:100px;width:300px }')
+    @view.media_query.find_by_klass('i01').to_css.must_equal('span[class~="i01"] { background-image:url("//placeholdit.imgix.net/~text?fm=jpg&h=100&txt=inkcite-mobile.jpg%0A%28300%C3%97100%29&txtsize=18&txttrack=0&w=300");height:100px;width:300px }')
   end
 
   it 'hides any images it wraps' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inkcite
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Jeffrey D. Hoffman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -333,6 +333,7 @@ files:
 - lib/inkcite/cli/build.rb
 - lib/inkcite/cli/init.rb
 - lib/inkcite/cli/preview.rb
+- lib/inkcite/cli/scope.rb
 - lib/inkcite/cli/server.rb
 - lib/inkcite/cli/test.rb
 - lib/inkcite/email.rb
@@ -342,6 +343,7 @@ files:
 - lib/inkcite/renderer.rb
 - lib/inkcite/renderer/base.rb
 - lib/inkcite/renderer/button.rb
+- lib/inkcite/renderer/container_base.rb
 - lib/inkcite/renderer/div.rb
 - lib/inkcite/renderer/element.rb
 - lib/inkcite/renderer/footnote.rb