jekyll-srcset-tag 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876700adecc1986ddfeeabf56466422a3c5a5a7f
-  data.tar.gz: 57828f6f5c9f9a17fa257a547aa2699a1a4cab6f
+  metadata.gz: 4731a5625c94f4612a08a86acb434690e8c2a014
+  data.tar.gz: 01ba9cd52d94b7b1b1aa06e67bd0a8f98b880c6a
 SHA512:
-  metadata.gz: be076b1d033beb25700ef300aa4601d8c8564b65fa0ac5b88d45874bbed9f28d760d19e97de73aa32fa01d4ae871cba2e2ccd3b9320004969be714f4444bb256
-  data.tar.gz: df4c246c0057c60e78314a85f9795d47eef42f0260e85fe6a386f3b9a47e707df2381238963dc01af4e69d867d0920caf9544b978b2a64e903140e92207d01d0
+  metadata.gz: f870f6dcff942afe51be12973e2baaa5beeb81c902c3682b990240a361c2fc476be7f8dd33739f6f245935af3fe78b8f090ad94b1303aa9700ba45c474185b51
+  data.tar.gz: ac551526bf8d16ca8c2bdfa23855374754ca2475d487c4b24846de803dffaf6a28c3c447b0a27a59ece949294ddab0b6ba68f39775093a36e84bbbfc8d74f576

data/lib/jekyll/srcset_tag/image/instance.rb

@@ -5,17 +5,14 @@ module Jekyll
       attr_reader :width, :height, :image, :extension, :image_width, :image_height, :output_width, :output_height,
                   :undersized
 
-      def initialize(width:, height:, extension:)
+      def initialize(width:, height:, extension:, image:)
         @width = width
         @height = height
         @extension = extension
-      end
-
-      def for_image!(image)
         @image = image
         @image_width = image[:width].to_i
         @image_height = image[:height].to_i
-        calculate_output_dimensions!
+        calculate_output_dimensions!        
       end
 
       def filename

data/lib/jekyll/srcset_tag/image.rb

@@ -20,15 +20,8 @@ module Jekyll
       end
 
       def generate_images!
-        unless images_exist?
-          original = MiniMagick::Image.open File.join(source_path, image_path)
-          instances.each { |instance| instance.for_image!(original) }
-          resize_images! uniq_instances, original
-        end
-      end
-
-      def images_exist?
-        Dir.exist? output_dir
+        needed_instances = uniq_instances.select { |instance| !File.exist?(File.join(output_dir, instance.filename)) }
+        resize_images! needed_instances
       end
 
       def instances
@@ -71,10 +64,12 @@ module Jekyll
         all_sources = sources.map do |source|
           reverse_ppi.map { |ppi| [source, ppi] }
         end.flatten(1)
+        original = MiniMagick::Image.open File.join(source_path, image_path)
         all_sources.map do |(source, ppi)|
           Instance.new width: (source.width ? (source.width.to_f * ppi).round : nil),
                        height: (source.height ? (source.height.to_f * ppi).round : nil),
-                       extension: File.extname(image_path)
+                       extension: File.extname(image_path),
+                       image: original
         end
       end
 
@@ -88,13 +83,13 @@ module Jekyll
         sources.map { |source| source.size_string }
       end
 
-      def resize_images!(instances, original)
+      def resize_images!(instances)
         if instances.any? { |i| i.undersized }
           warn "Warning:".yellow + " #{image_path} is smaller than the requested output file. " +
                "It will be resized without upscaling."
         end
         instances.each do |instance|
-          Resizer::resize(original, output_dir, instance.filename, instance.output_width, instance.output_height)
+          Resizer::resize(instance.image, output_dir, instance.filename, instance.output_width, instance.output_height)
           puts "Generated #{File.join(output_dir, instance.filename)}"
         end
       end

data/lib/jekyll/srcset_tag/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module SrcsetTag
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-srcset-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kevin Dew