jekyll_picture_tag 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f25151354c1e1d62aa3b9097316538012dfa84bcd91bad49af2349adc25b12
-  data.tar.gz: b80c014044abfb092c8949faf674281d57f130384ca2c37b0b17715a445048eb
+  metadata.gz: 8c92364f9a864fd33948b32ddfb9593b6256d1f14da56cf821175189b30c2ea4
+  data.tar.gz: ea0e199aaafcef76906b61de9a03170c84e6e6e2771bcaf2aa2e9ace7223ca80
 SHA512:
-  metadata.gz: b16a09afffe03178211c01840eb3767f0fc7c21b597f1148dff9d6f35fedefa6830288b23c63bd28bc75a67683ad3d8d633c2c3ce44af2c5916f7cee16722685
-  data.tar.gz: 45875378703e55d08f11f1d0a102fdfe9cae09c75a6aae8edd16d83277b8cccb4d72e3307c02a592a66481a7f39f5e8f3c078e97dbf57013dbc1d968d64a40e3
+  metadata.gz: 990f28ad52b23265ae10ab7430060fddc5ef902b03d87fb9fe4d0796dc5ff221720a277d5abca89bdf2cc8973c41994a03dcae8a1ef9ba459af1ac29c53d999b
+  data.tar.gz: cfbd031a3741f63e9653cf098e5e95af411d52081f5b06ca7497d89ad64ed93dd762a0f1655c9752b18104bb913fde0854a157c0948796372439f1d7f026c99e

data/jekyll-picture-tag.gemspec

@@ -1,3 +1,20 @@
+# Why 2 gemspecs?
+
+# Originally, this gem was named 'jekyll-picture-tag', and published on rubygems
+# under this name. There was a break in development, during which push access to
+# rubygems was lost. Development was later resumed, and as a workaround for that
+# issue the installation instructions were to source the gem from the Github
+# repository.
+#
+# Ultimately, the decision was made to rename it by switching the dashes for
+# underscores, which follows best practice and allows pushing it to rubygems
+# under the new name. The drawback of this situation is that everyone who
+# followed the installaion instructions previously would see their site
+# inexplicably break, as it would be searching for a gemspec that doesn't exist.
+# As a workaround (to the old workaround... sigh) this gemspec lets us print a
+# warning and then require the new version, which keeps old sites working while
+# encouraging people to use rubygems.
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jekyll_picture_tag/version'

data/lib/jekyll-picture-tag.rb

@@ -11,7 +11,7 @@ puts <<~HEREDOC
 
   and replace it with:
 
-  gem 'jekyll_picture_tag', '~> 1.3'
+  gem 'jekyll_picture_tag'
 
   Sorry about that. For an explanation, see issue #120:
   https://github.com/rbuchberger/jekyll-picture-tag/issues/120

data/lib/jekyll_picture_tag/instructions.rb

@@ -76,10 +76,6 @@ module PictureTag
       @config.build_source_url(filename)
     end
 
-    def nomarkdown?
-      @config.nomarkdown?
-    end
-
     # Preset forwarding
     def widths(media)
       @preset.widths(media)
@@ -93,6 +89,11 @@ module PictureTag
       @preset.fallback_width
     end
 
+    def nomarkdown?
+      @preset.nomarkdown?
+    end
+
+
     # Params forwarding
     def preset_name
       @params.preset_name

data/lib/jekyll_picture_tag/instructions/preset.rb

@@ -27,6 +27,16 @@ module PictureTag
         @content['fallback_width']
       end
 
+      # Allows a per-preset hard override of the global nomarkdown setting and
+      # JPT's feeble attempts at auto-detection.
+      def nomarkdown?
+        if @content['nomarkdown'].nil?
+          PictureTag.config.nomarkdown?
+        else
+          @content['nomarkdown']
+        end
+      end
+
       private
 
       def build_preset

data/lib/jekyll_picture_tag/output_formats/basics.rb

@@ -31,8 +31,10 @@ module PictureTag
 
       # Handles various wrappers around basic markup
       def wrap(markup)
-        markup = anchor_tag(markup) if PictureTag.html_attributes['link']
-        markup = nomarkdown_wrapper(markup.to_s) if PictureTag.nomarkdown?
+        if PictureTag.html_attributes['link']
+          markup = anchor_tag(markup)
+          markup = nomarkdown_wrapper(markup.to_s) if PictureTag.nomarkdown?
+        end
 
         markup
       end

data/lib/jekyll_picture_tag/version.rb

@@ -1,3 +1,3 @@
 module PictureTag
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/readme.md

@@ -83,7 +83,7 @@ Get this in your generated site:
 ```html
 <!-- Line breaks added for readability, the actual markup will not have them. -->
 
-<img src="/generated/test-800-195f7d.jpg" 
+<img src="/generated/test-800-195f7d.jpg"
   srcset="/generated/test-400-195f7d.jpg 400w,
           /generated/test-600-195f7d.jpg 600w,
           /generated/test-800-195f7d.jpg 800w,
@@ -178,19 +178,31 @@ modifications and I'll take care of it.
 
 # Release History
 
-* 1.4.0 Jun 26, 2019: 
+* 1.5.0 Jun 26, 2019: 
+  * better `{::nomarkdown}` necessity detection
+  * allow user to override `{::nomarkdown}` autodetection
+* 1.4.0 Jun 26, 2019:
   * Rename gem from `jekyll-picture-tag` to `jekyll_picture_tag`, allowing us to use rubygems again.
   * Add new output format: `naked_srcset`.
 * 1.3.1 Jun 21, 2019: Bugfix
-* 1.3.0 Jun  7, 2019: Initial compatibility with Jekyll 4.0, bugfixes, change to generated image
-    naming. The first build after this update will be longer, and you might want to clear out your
-    generated images.
-* 1.2.0 Feb  9, 2019: Add nomarkdown fix, noscript option, relative url option, anchor tag wrappers
-* 1.1.0 Jan 22, 2019: Add direct_url markup format, auto-orient images before stripping metadata.
+* 1.3.0 Jun  7, 2019:
+  * Initial compatibility with Jekyll 4.0
+  * bugfixes
+  * change to generated image naming-- The first build after this update will be longer, and you
+    might want to clear out your generated images.
+* 1.2.0 Feb  9, 2019:
+  * Add nomarkdown fix
+  * noscript option
+  * relative url option
+  * anchor tag wrappers
+* 1.1.0 Jan 22, 2019:
+  * Add direct_url markup format,
+  * auto-orient images before stripping metadata
 * 1.0.2 Jan 18, 2019: Fix ruby version specification
-* 1.0.1 Jan 13, 2019: Added ruby version checking for more helpful error messages when running old versions of ruby.
-* **1.0.0** Nov 27, 2018: Rewrite from the ground up. See [migration.md](/migration.md).
-* 0.2.2 Aug  2, 2013: Bugfixes.
+* 1.0.1 Jan 13, 2019: Added ruby version checking
+* **1.0.0** Nov 27, 2018: Rewrite from the ground up. See [the migration
+  guide](https://github.com/rbuchberger/jekyll-picture-tag/wiki/Migrating-from-versions-prior-to-1.0).
+* 0.2.2 Aug  2, 2013: Bugfixes
 * 0.2.1 Jul 17, 2013: Refactor again, add Liquid parsing.
 * 0.2.0 Jul 14, 2013: Rewrite code base, bring in line with Jekyll Image Tag.
 * 0.1.1 Jul  5, 2013: Quick round of code improvements.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_picture_tag
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Robert Wierzbowski