inkcite 1.15.0 → 1.16.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inkcite
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Jeffrey D. Hoffman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,34 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: image_optim
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: image_optim_pack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mozjpeg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -389,11 +347,7 @@ files:
 - lib/inkcite/facade/element.rb
 - lib/inkcite/facade/keyframe.rb
 - lib/inkcite/facade/style.rb
-- lib/inkcite/image/base.rb
-- lib/inkcite/image/guetzli_minifier.rb
-- lib/inkcite/image/image_minifier.rb
-- lib/inkcite/image/image_optim_minifier.rb
-- lib/inkcite/image/mozjpeg_minifier.rb
+- lib/inkcite/image_minifier.rb
 - lib/inkcite/mailer.rb
 - lib/inkcite/minifier.rb
 - lib/inkcite/parser.rb
@@ -414,6 +368,7 @@ files:
 - lib/inkcite/renderer/increment.rb
 - lib/inkcite/renderer/like.rb
 - lib/inkcite/renderer/link.rb
+- lib/inkcite/renderer/list.rb
 - lib/inkcite/renderer/litmus_analytics.rb
 - lib/inkcite/renderer/lorem.rb
 - lib/inkcite/renderer/mobile_image.rb
@@ -425,6 +380,7 @@ files:
 - lib/inkcite/renderer/property.rb
 - lib/inkcite/renderer/redacted.rb
 - lib/inkcite/renderer/responsive.rb
+- lib/inkcite/renderer/slant.rb
 - lib/inkcite/renderer/snow.rb
 - lib/inkcite/renderer/social.rb
 - lib/inkcite/renderer/span.rb
@@ -442,6 +398,7 @@ files:
 - lib/inkcite/version.rb
 - lib/inkcite/view.rb
 - lib/inkcite/view/context.rb
+- lib/inkcite/view/developer_scripts.rb
 - lib/inkcite/view/media_query.rb
 - lib/inkcite/view/tag_stack.rb
 - test/animation_spec.rb
@@ -460,11 +417,13 @@ files:
 - test/renderer/footnote_spec.rb
 - test/renderer/image_spec.rb
 - test/renderer/link_spec.rb
+- test/renderer/list_spec.rb
 - test/renderer/lorem_spec.rb
 - test/renderer/mobile_image_spec.rb
 - test/renderer/mobile_only_spec.rb
 - test/renderer/mobile_style_spec.rb
 - test/renderer/redacted_spec.rb
+- test/renderer/slant_spec.rb
 - test/renderer/social_spec.rb
 - test/renderer/span_spec.rb
 - test/renderer/table_spec.rb
@@ -496,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Simplifying email development
@@ -517,11 +476,13 @@ test_files:
 - test/renderer/footnote_spec.rb
 - test/renderer/image_spec.rb
 - test/renderer/link_spec.rb
+- test/renderer/list_spec.rb
 - test/renderer/lorem_spec.rb
 - test/renderer/mobile_image_spec.rb
 - test/renderer/mobile_only_spec.rb
 - test/renderer/mobile_style_spec.rb
 - test/renderer/redacted_spec.rb
+- test/renderer/slant_spec.rb
 - test/renderer/social_spec.rb
 - test/renderer/span_spec.rb
 - test/renderer/table_spec.rb

data/lib/inkcite/image/base.rb

@@ -1,38 +0,0 @@
-module Inkcite
-  module Image
-    class ImageMinifier
-
-      # Base class for all image minifiers in the optimization pipeline
-      class Base
-
-        attr_reader :name
-
-        def initialize name
-          @name = name
-        end
-
-        def minify! email, source_img, cache_img
-          raise 'The extending class must implement this method'
-        end
-
-        protected
-
-        # Common configuration names
-        JPG_QUALITY = :'jpg-quality'
-
-        # JPG quality bounds
-        MIN_QUALITY = 0
-        MAX_QUALITY = 100
-
-        def get_jpg_quality config, override_key, default
-          quality = (config[override_key] || config[JPG_QUALITY] || default).to_i
-          quality = MIN_QUALITY if quality < MIN_QUALITY
-          quality = MAX_QUALITY if quality > MAX_QUALITY
-          quality
-        end
-
-      end
-
-    end
-  end
-end

data/lib/inkcite/image/guetzli_minifier.rb

@@ -1,62 +0,0 @@
-module Inkcite
-  module Image
-    class GuetzliMinifier < ImageMinifier::Base
-
-      def initialize
-        super('Guetzli')
-      end
-
-      def minify! email, source_img, cache_img
-
-        # Grab the full path to the guetzli binary
-        guetzli_path = `which guetzli`.delete("\n")
-        unless guetzli_path.blank?
-
-          cmd = []
-          cmd << guetzli_path
-
-          config = email.config
-
-          quality = get_jpg_quality(config, GUETZLI_QUALITY, DEFAULT_QUALITY)
-          if quality > 0 && quality < MAX_QUALITY
-
-            # Per the Guetzli documentation, a value less than 84 isn't useful.
-            quality = MIN_GUETZLI_QUALITY if quality < MIN_GUETZLI_QUALITY
-            cmd << "--quality #{quality}"
-
-          end
-
-          cmd << %Q("#{source_img}")
-          cmd << %Q("#{cache_img}")
-
-          Util::exec(cmd)
-
-          true
-
-        else
-
-          # No guetzli, so simply move the source image into the destination
-          # position without compression.
-          FileUtils.copy(source_img, cache_img)
-
-          false
-        end
-
-
-      end
-
-      private
-
-      # Default quality is zero - which lets Guetzli decide how best to
-      # optimize the image.
-      DEFAULT_QUALITY = 0
-
-      # The minimum quality setting per the Guetzli runtime.
-      MIN_GUETZLI_QUALITY = 84
-
-      # Configuration field names
-      GUETZLI_QUALITY = :'guetzli-quality'
-
-    end
-  end
-end

data/lib/inkcite/image/image_minifier.rb

@@ -1,143 +0,0 @@
-require_relative 'base'
-require_relative 'guetzli_minifier'
-require_relative 'image_optim_minifier'
-require_relative 'mozjpeg_minifier'
-
-module Inkcite
-  module Image
-    class ImageMinifier
-
-      # Directory of optimized images
-      IMAGE_CACHE = 'images-optim'
-
-      # Common extensions
-      GIF = 'gif'
-      JPG = 'jpg'
-      PNG = 'png'
-
-      def self.minify email, img_name, force=false
-
-        # Original, unoptimized source image
-        source_img = File.join(email.image_dir, img_name)
-
-        # Cached, optimized path for this image.
-        cache_path = email.project_file(IMAGE_CACHE)
-        cached_img = File.join(cache_path, File.basename(img_name))
-
-        # Grab the first file that exists for this project.
-        config_path = email.config_file
-
-        unless force
-
-          # Get the last-modified date of the image optimization config
-          # file - if that file is newer than the image, re-optimization
-          # is necessary because the settings have changed.
-          config_last_modified = Util.last_modified(config_path)
-
-          # Get the last-modified date of the actual image.  If the source
-          # image is newer than the cached version, we'll need to run it
-          # through optimization again, too.
-          cache_last_modified = Util.last_modified(cached_img)
-          source_last_modified = Util.last_modified(source_img)
-
-          # Nothing to do unless the image in the cache is older than the
-          # source or the config file.
-          return unless config_last_modified > cache_last_modified || source_last_modified > cache_last_modified
-
-        end
-
-        # Make sure the image cache directory exists
-        FileUtils.mkpath(cache_path)
-
-        # Copy the original image to the cache where it can be processed.
-        FileUtils.copy(source_img, cached_img)
-
-        # Get the file format (e.g. gif) of the file being optimized.
-        source_ext = Util::file_extension(source_img)
-
-        # This will hold the list of minifiers that will be applied to the
-        # image, based on its extension.
-        pipeline = []
-
-        # True if ImageOptim is allowed to make lossy optimizations to the
-        # images.  When false, even if the quality settings allow it, ImageOptim
-        # won't make lossy optimizations.
-        allow_lossy = true
-
-        if source_ext == JPG
-          pipeline << MozjpegMinifier.new
-          pipeline << GuetzliMinifier.new
-          allow_lossy = false
-        end
-
-        # Always optimize with ImageOptim although for JPGs additional
-        # lossy compression is force disabled.
-        pipeline << ImageOptimMinifier.new(allow_lossy)
-
-        original_size = File.size(source_img)
-
-        msg = "Compressing #{img_name} #{Util.pretty_file_size(original_size)}"
-
-        # Process the image
-        pipeline.each do |p|
-
-          # Minifiers don't work well when the source and destination images are the
-          # same files - so move the image to a temporary file so the minifier can
-          # optimize it back into place.
-          temp_img = "#{cached_img}.tmp"
-          FileUtils.move(cached_img, temp_img)
-
-          temp_size = File.size(temp_img)
-
-          # Let the processor compress the image
-          p.minify!(email, temp_img, cached_img)
-
-          compressed_size = File.size(cached_img)
-          if compressed_size < temp_size
-            msg << " >> #{p.name} #{Util.pretty_file_size(compressed_size)}"
-
-          else
-
-            # Occassionally the compressor does the wrong thing and
-            # makes the image bigger (particularly ImageOptim after
-            # Guetzli) so in that case, revert the image to its
-            # smaller pre-optimization form.
-            FileUtils.copy(temp_img, cached_img)
-
-          end
-
-          # Now remove the temp file.
-          FileUtils.remove(temp_img) if File.exists?(temp_img)
-
-        end
-
-        # Get the final compressed size of the image so we can print the
-        # resulting compression ratio.
-        compressed_size = File.size(cached_img)
-        msg << " (#{self.compressed_percent(original_size, compressed_size)}%)"
-
-        Util.log msg
-
-      end
-
-      # Minifies all of the images in the provided email's project directory.
-      def self.minify_all email, force=false
-
-        images_path = File.join(email.image_dir, '*.*')
-
-        # Iterate through all of the images in the project and optimize them
-        # if necessary.
-        Dir.glob(images_path).each do |img|
-          self.minify(email, File.basename(img), force)
-        end
-
-      end
-
-      def self.compressed_percent original_size, compressed_size
-        ((1.0 - (compressed_size / original_size.to_f)) * 100).round(1)
-      end
-
-    end
-  end
-end
-

data/lib/inkcite/image/image_optim_minifier.rb

@@ -1,90 +0,0 @@
-module Inkcite
-  module Image
-    class ImageOptimMinifier < ImageMinifier::Base
-
-      def initialize allow_lossy=true
-        super('ImageOptim')
-        @allow_lossy = allow_lossy
-      end
-
-      def minify! email, source_img, cache_img
-
-        config = email.config
-
-        img_type = Util::file_extension(cache_img)
-
-        # This will hold the settings that control how imageoptim
-        # compresses the image, based on extension.
-        optim_opt = {
-            :verbose => false,
-            :svgo => false
-        }
-
-        FileUtils.copy(source_img, cache_img)
-
-        case img_type
-          when ImageMinifier::GIF
-            mix_gif_options email, config, optim_opt
-          when ImageMinifier::JPG
-            mix_jpg_options email, config, optim_opt
-          when ImageMinifier::PNG
-            mix_png_options email, config, optim_opt
-          else
-            # Don't know how to compress this type of image so
-            # just leave it alone
-            return
-        end
-
-        ImageOptim.new(optim_opt).optimize_image!(cache_img)
-
-      end
-
-      private
-
-      # Name of the configuration field that controls ImageOptim's JPG quality
-      IMAGEOPTIM_JPG_QUALITY = :'imageopt-jpg-quality'
-
-      # Default JPG image quality
-      DEFAULT_JPG_QUALITY = 85
-
-      # Quality constraints
-      MIN_QUALITY = 0
-      MAX_QUALITY = 100
-
-      def mix_gif_options email, config, opts
-
-      end
-
-      def mix_jpg_options email, config, opts
-
-        max_quality = get_jpg_quality(config, IMAGEOPTIM_JPG_QUALITY, DEFAULT_JPG_QUALITY)
-
-        # Anything less than 100% quality means lossy is enabled.
-        lossy = @allow_lossy && max_quality < 100
-        opts[:allow_lossy] = lossy
-
-        # Additional configuration necessary only if lossy compression
-        # is enabled.  Otherwise, the defaults are acceptable.
-        if lossy
-          opts[:jpegoptim] = {
-              :allow_lossy => lossy,
-              :max_quality => max_quality
-          }
-
-          opts[:jpegrecompress] = {
-              :allow_lossy => lossy,
-              :quality => (max_quality / 100.0 * 3).round(0)
-          }
-        end
-
-
-      end
-
-      def mix_png_options email, config, opts
-
-      end
-
-
-    end
-  end
-end