jekyll-bits 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec9d0aaf051e1422379bb6288efb78a6966a98f1
-  data.tar.gz: d098833193da98cd60580a7291b82def12f24321
+  metadata.gz: f53a53276bcd63614b03be6fdc26d8c3391849c0
+  data.tar.gz: 5a1d1c7944e8c534fd5cd07f8fb27def67ca0088
 SHA512:
-  metadata.gz: de8508ffcb161fbc05ff81e5ff234cbc54b47d0fd5ef8276cf5aeef144a49c9aa76c812efc88c94469e63667535f1fc003f24668068eec5dd292dc9ee700b4b9
-  data.tar.gz: 7b3b045704e9139335da5b025f9ea948403e80db55396485a88b84de726497c9bf3d04e49d1148c948f62b8cc5e223afc52a877e73aaa2bfe7f1f4893cbacaa1
+  metadata.gz: 9b61d7c6a2e35535ecef635dea76a14488f687a13f7743fd02e0aef8512def0dcd40ed222ddeaf92b479fe6022dfd762cf73d748b48ef636fd43749ba1c172f6
+  data.tar.gz: 6b9aa1b7cebe2c799dbe7ca63a8e0e2dbbec8460ca63d2d7e2b887d6ba2f2049a03d7c3edffa8e041873660c51a42a28997180c8b85827fd2f541b8844dc4a60

data/.0pdd.yml

@@ -1,3 +1,5 @@
-alerts:
-  github:
-    - yegor256
+errors:
+  - yegor256@gmail.com
+# alerts:
+#   github:
+#     - yegor256

data/README.md

@@ -76,6 +76,19 @@ Something like that will be rendered:
 </figure>
 ```
 
+You can also define your picture URL in `image`, for example:
+
+```yaml
+---
+image: /images/2017/01/hello-world.jpg
+jb_picture:
+  alt: Hello, world!
+  caption: This is my hello world picture for you
+  width: 1280
+  height: 800
+---
+```
+
 # License
 
 (The MIT License)

data/jekyll-bits.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.2.2'
   s.required_ruby_version = '>= 1.9.3'
   s.name = 'jekyll-bits'
-  s.version = '0.6'
+  s.version = '0.7'
   s.license = 'MIT'
   s.summary = 'Jekyll Bits'
   s.description = 'Useful and very simple Jekyll plugins'

data/lib/jekyll-bits/picture.rb

@@ -30,37 +30,23 @@ module Jekyll
   # All our custom filters
   module JbFilters
     def jb_picture_head(page)
-      yaml = page['jb_picture']
-      return unless yaml
-      if yaml.is_a?(Hash)
-        raise "src is absent for jb_picture in #{page.url}" unless yaml['src']
-        src = yaml['src']
-      else
-        src = yaml
-      end
-      "<meta property='og:image' content='#{src}'/>"
+      uri = uri(page)
+      return '' if uri.empty?
+      "<meta property='og:image' content='#{CGI.escapeElement(uri)}'/>"
     end
 
     def jb_picture_body(page)
+      uri = uri(page)
+      return '' if uri.empty?
       yaml = page['jb_picture']
-      return unless yaml
       html = "<img itemprop='image' alt='"
-      if yaml.is_a?(Hash) && yaml['alt']
+      if yaml && yaml.is_a?(Hash) && yaml['alt']
         html += CGI.escapeHTML(yaml['alt'])
       else
         html += 'front image'
       end
-      html += "' src='"
-      if yaml.is_a?(Hash)
-        raise "src is absent for jb_picture in #{page.url}" unless yaml['src']
-        html += CGI.escapeElement(yaml['src'])
-        md5 = Digest::MD5.new.hexdigest(yaml['src'])
-      else
-        html += yaml
-        md5 = Digest::MD5.new.hexdigest(yaml)
-      end
-      md5 = md5[0, 8]
-      html += "'"
+      html += "' src='#{CGI.escapeElement(uri)}'"
+      md5 = Digest::MD5.new.hexdigest(uri)[0, 8]
       html += " longdesc='##{md5}'" \
         if yaml.is_a?(Hash) && yaml['caption']
       html += " width='#{yaml['width']}'" \
@@ -77,6 +63,22 @@ module Jekyll
       end
       html + '</figure>'
     end
+
+    private
+
+    def uri(page)
+      uri = ''
+      uri = page['image'] if page['image']
+      yaml = page['jb_picture']
+      if yaml
+        if yaml.is_a?(Hash)
+          uri = yaml['src'] if yaml['src']
+        else
+          uri = yaml
+        end
+      end
+      uri
+    end
   end
 
   # Box for testing and calling static methods.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bits
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll