jekyll-srcset-tag 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 194e7fb5c9eb2b7a53422c5ba2ae6a8104f0611a
-  data.tar.gz: 5f93965bacc7f99a446962d94ffb5eb591b7ae72
+  metadata.gz: 12ba6eb88428a7083708074d59638015d0b012d8
+  data.tar.gz: 8fd8f97a70a2c21d072adb430ef9a598e4bedab0
 SHA512:
-  metadata.gz: 341e7fa5751f78a13664b187ff85263ddd2bb6227686cae831f26c703c083b270a0dc8c69e5968e3fb9227ea073720373a87916be6181a8ae90e21d6b57aa9b6
-  data.tar.gz: 0420a9375e8944b674d37a3f9afb0ae6ca11eef99a72b0e1b41a0bfaf72edf6f8bd8dba8fc462271a1f6469b4502bb77d2b446949e35925849ab17efb640c400
+  metadata.gz: 958b740d170119bb07c50a99809bda0003ce041f4755e789d663301dc177b91e4d041ef049fb08a085ce21507f01d26e55467433f6be3542d73d0fe69aa90946
+  data.tar.gz: 93624f3ba0dd3f08dade9097eb058b937fe7296c1027b3fda42598a6e3dc2e34aa2ec2dc5b75e377261cb157f98935e3fca602524898a62a1608fe836ea0b952

data/lib/jekyll/srcset_tag/image.rb

@@ -34,7 +34,7 @@ module Jekyll
 
       def to_html
         srcs = image_srcs
-        src = CGI.escape_html(srcs.last[0])
+        src = CGI.escape_html(fallback_src)
         show_srcset = srcs.length > 1
         srcset = CGI.escape_html(srcs.map {|path, size| "#{path} #{size}w" }.join(', '))
         sizes = CGI::escape_html(source_sizes.join(', '))
@@ -65,7 +65,7 @@ module Jekyll
 
       def output_image_paths
         uniq_instances.map { |instance| File.join(output_dir, instance.filename)}
-      end      
+      end
 
       protected
 
@@ -79,16 +79,26 @@ module Jekyll
           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),
-                       image: original
+                       image: original,
+                       fallback: source.fallback
         end
       end
 
       def image_srcs
         uniq_instances.map do |instance|
-          [File.join(web_output_dir, instance.filename), instance.output_width.to_s]
+          [instance_path(instance), instance.output_width.to_s]
         end
       end
 
+      def instance_path(instance)
+        File.join(web_output_dir, instance.filename)
+      end
+
+      def fallback_src
+        fallbacks = uniq_instances.select { |instance| instance.fallback }
+        fallbacks.empty? ? image_srcs.last[0] : instance_path(fallbacks.last)
+      end
+
       def source_sizes
         sources.map { |source| source.size_string }
       end

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

@@ -3,16 +3,17 @@ module Jekyll
     class Image::Instance
 
       attr_reader :width, :height, :image, :extension, :image_width, :image_height, :output_width, :output_height,
-                  :undersized
+                  :undersized, :fallback
 
-      def initialize(width:, height:, extension:, image:)
+      def initialize(width:, height:, extension:, image:, fallback:)
         @width = width
         @height = height
         @extension = extension
         @image = image
         @image_width = image[:width].to_i
         @image_height = image[:height].to_i
-        calculate_output_dimensions!        
+        @fallback = fallback
+        calculate_output_dimensions!
       end
 
       def filename

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

@@ -2,13 +2,14 @@ module Jekyll
   module SrcsetTag
     class Image::Source
 
-      attr_reader :media, :size, :width, :height
+      attr_reader :media, :size, :width, :height, :fallback
 
-      def initialize(width: nil, height: nil, media: nil, size: nil)
+      def initialize(width: nil, height: nil, media: nil, size: nil, fallback: nil)
         @media = media
         @size = size
         @width = width
         @height = height
+        @fallback = fallback
       end
 
       def size_string

data/lib/jekyll/srcset_tag/srcset_tag.rb

@@ -38,9 +38,9 @@ module Jekyll
           Image::Source.new(width: source.attr('width'),
                             height: source.attr('height'),
                             media: source.attr('media'),
-                            size: source.attr('size'))
+                            size: source.attr('size'),
+                            fallback: source.attr('fallback') == 'true')
         end
-
       end
 
       def image(source_path, output_path, web_output_path, markup, sources)

data/lib/jekyll/srcset_tag/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module SrcsetTag
-    VERSION = '0.1.4'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-srcset-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Kevin Dew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll