jekyll-picture-tag 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5973c7f85a12ce7efb0a109d27a102012fd8d11
-  data.tar.gz: cab2315e25e0140dcf35aed001b1d6acd8204531
+  metadata.gz: f8aa94e4a07e2076e502bb11471d4bed3cb6fd90
+  data.tar.gz: d0f17151a2d776a335fa89ecde5b39ad8ad412ef
 SHA512:
-  metadata.gz: 9401800983de613fc69419effd1fd0ad44d4c8698b103368e01adb459e9104448ee9fc2acb05d84ccc68b53a2b00b71baed0a2177fb6972ad221fb03695836f1
-  data.tar.gz: a9f21424491affe44ec6f58ead9aeb4ee1794a28fb2e6b602f8ed1608d63b1ea6af1fc579926909bcac9a1793021acb70ecede32f6706d73047ecb786a20ab70
+  metadata.gz: 57583d5abe715eefb55b29da796ae45ec95a3ee97bc6d082f4d00babaefd9f5fdcc043209ce51ba8e0b41384069cfdeccbe01d9f5ed2247185898e271ca0e6ab
+  data.tar.gz: cdd134f5929466984007ba9d598ad61e64b07054ea4bd2af7e2230ad1f6e848cc2d81116ec7637ba9bcc15ec1392f552fb5a31c0cb4a73efda2725e14ca8c3fa

data/jekyll-picture-tag.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-picture-tag"
-  spec.version       = '0.2.3'
+  spec.version       = '0.3.0'
   spec.authors       = ['Robert Wierzbowski', "Brendan Tobolaski"]
   spec.email         = ['hello@robwierzbowski.com', "brendan@tobolaski.com"]
 
@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'mini_magick', '~> 3.8.0'
   spec.add_dependency 'fastimage', '~> 1.6.4'
-  spec.add_runtime_dependency 'jekyll', '< 3'
+  spec.add_runtime_dependency 'jekyll', '< 4'
 end

data/lib/jekyll-picture-tag.rb

@@ -39,6 +39,7 @@ module Jekyll
       # Gather settings
       site = context.registers[:site]
       settings = site.config['picture']
+      url = site.config['url']
       markup = /^(?:(?<preset>[^\s.:\/]+)\s+)?(?<image_src>[^\s]+\.[a-zA-Z0-9]{3,4})\s*(?<source_src>(?:(source_[^\s.:\/]+:\s+[^\s]+\.[a-zA-Z0-9]{3,4})\s*)+)?(?<html_attr>[\s\S]+)?$/.match(render_markup)
       preset = settings['presets'][ markup[:preset] ] || settings['presets']['default']
 
@@ -150,17 +151,26 @@ module Jekyll
       if settings['markup'] == 'picture'
 
         source_tags = ''
-        source_keys.each { |source|
+        source_keys.each do |source|
           media = " media=\"#{instance[source]['media']}\"" unless source == 'source_default'
-          source_tags += "#{markdown_escape * 4}<source srcset=\"#{instance[source][:generated_src]}\"#{media}>\n"
-        }
+          source_tags += "#{markdown_escape * 4}<source srcset=\"#{url}#{instance[source][:generated_src]}\"#{media}>\n"
+        end
 
         # Note: we can't indent html output because markdown parsers will turn 4 spaces into code blocks
         # Note: Added backslash+space escapes to bypass markdown parsing of indented code below -WD
         picture_tag = "<picture>\n"\
                       "#{source_tags}"\
-                      "#{markdown_escape * 4}<img srcset=\"#{instance['source_default'][:generated_src]}\" #{html_attr_string}>\n"\
+                      "#{markdown_escape * 4}<img src=\"#{url}#{instance['source_default'][:generated_src]}\" #{html_attr_string}>\n"\
                       "#{markdown_escape * 2}</picture>\n"
+      elsif settings['markup'] == 'interchange'
+
+        interchange_data = Array.new
+        source_keys.reverse.each do |source|
+          interchange_data << "[#{url}#{instance[source][:generated_src]}, #{source == 'source_default' ? '(default)' : instance[source]['media']}]"
+        end
+
+        picture_tag = %Q{<img data-interchange="#{interchange_data.join ', '}" #{html_attr_string} />\n}
+        picture_tag += %Q{<noscript><img src="#{url}#{instance['source_default'][:generated_src]}" #{html_attr_string} /></noscript>}
 
       elsif settings['markup'] == 'img'
         # TODO implement <img srcset/sizes>
@@ -171,7 +181,12 @@ module Jekyll
     end
 
     def generate_image(instance, site_source, site_dest, image_source, image_dest, baseurl)
-      digest = Digest::MD5.hexdigest(File.read(File.join(site_source, image_source, instance[:src]))).slice!(0..5)
+      begin
+        digest = Digest::MD5.hexdigest(File.read(File.join(site_source, image_source, instance[:src]))).slice!(0..5)
+      rescue Errno::ENOENT
+        warn "Warning:".yellow + " source image #{instance[:src]} is missing."
+        return ""
+      end
 
       image_dir = File.dirname(instance[:src])
       ext = File.extname(instance[:src])

data/readme.md

@@ -128,6 +128,9 @@ Defaults to `{compiled Jekyll site}/generated`.
 
 Choose `picture` to output markup based on the `<picture>` element. Future options may include `srcset` but have not yet been implemented.
 
+Choose `interchange` to use markup compatible with
+[ZURB Foundation's Interchange](http://foundation.zurb.com/docs/components/interchange.html).
+
 #### presets
 
 Presets contain reusable settings for a Jekyll Picture Tag. Each is made up of a list of sources, and an optional attributes list and ppi array.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-picture-tag
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Wierzbowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 description: |2
       Jekyll Picture Tag is a liquid tag that adds responsive images to your Jekyll static site. It follows the picture
       element pattern, and polyfills older browsers with Picturefill. Jekyll Picture Tag automatically creates resized