jekyll-image_optimizer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1976646dd0f9304e27a9ff4ce3e6bc93af56a67
-  data.tar.gz: b620a1968b3c3b0cdb8ad2270ea7be8db07bfb8d
+  metadata.gz: ede44b92874642f51ae35e6040f96c58ad0717cf
+  data.tar.gz: b6256615bd5e2984cb727435d2b306eb6abfa61c
 SHA512:
-  metadata.gz: decbd20e523daffcd47e273c85530c6b07e3e8e9fea91b55ad33e42c184eed6d80ac3054d1b0922419482a3c408c1be1ad61d3ba09d23b7c6acba4a1af32de6e
-  data.tar.gz: ca85d2bc1b365f382f8ea77dc1090f087b9955068d4a144999f59892e8fc07a088b9ee90270ebeda5cb86c251742b3a2c695171137e26ff464b57feb8aebb95c
+  metadata.gz: 9622b082d933826853f17f24f03dd039b04a91f97ab021a89f213f4b0510e4063d4ea2b70e6c2627215b0d5f442f7ea81dc1a18da959f4837712e75d0982cde1
+  data.tar.gz: 7c6f8aa33b750b9f36d0525d75b98c9730676cb61d308c7e2965a6a90f3747994dad4f25bbc3d1320fb727b590b600d47be7ada2e3ebc33ba8769fbd0be00447

data/lib/jekyll/image_optimizer.rb

@@ -1,4 +1,9 @@
 require_relative 'image_optimizer/image_optimizer'
+require 'RMagick'
+
+def opt_dir(config)
+  config['opt_images'] || 'img/opt'
+end
 
 module Jekyll
 
@@ -7,15 +12,66 @@ module Jekyll
 
     def initialize(config)
       @raw=config['raw_images'] || 'img/raw'
-      @opt=config['opt_images'] || 'img/opt'
+      @opt=opt_dir(config)
       @symlink=config['images_link'] || 'images'
       @geometry=config['image_geometry'] || '800x800>'
     end
 
     def generate(site)
       io=ImageOptimizer.new(@raw, @opt)
-      io.optimize_images(@geometry)
-      io.create_symlink(@symlink, @geometry)
+      if @geometry.is_a? Enumerable
+        @geometry.each { |geom| io.optimize_images(geom) }
+      else
+        io.optimize_images(@geometry)
+        io.create_symlink(@symlink, @geometry)
+      end
     end
   end
-end
+
+  class SrcsetTag < Liquid::Tag
+
+    def initialize(tag_name, markup, tokens)
+      super
+      @markup
+    end
+
+    def render(context)
+      s=''
+      base_url=context['site']['baseurl']
+      index=Liquid::Template.parse(@markup).render(context).to_i
+      src=context['page']['image'][index]['url']
+      for dir in Dir[opt_dir(context['site'])+'*']
+        file = dir+'/'+src
+        if File.file? file
+          img=Magick::Image::read(file).first
+          s+=base_url+'/'+file+' '+img.columns.to_s+'w,'
+        end
+      end
+      s[0..-2]
+    end
+  end
+
+  class ImageTag < Liquid::Tag
+
+    def initialize(tag_name, markup, tokens)
+      super
+      @index = markup.to_i
+    end
+
+    def render(context)
+      context.stack do
+        context['image']=context['page']['image'][@index]
+        context['image']['index']=@index
+        Liquid::Template.parse(File.read(layout(context))).render(context)
+      end
+    end
+
+    def layout(context)
+      context['site']['image_layout'] || '_layouts/image.html'
+    end
+  end
+end
+
+
+Liquid::Template.register_tag('srcset', Jekyll::SrcsetTag)
+Liquid::Template.register_tag('image', Jekyll::ImageTag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-image_optimizer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Stefan Niederhauser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -34,7 +34,7 @@ files:
 - lib/jekyll/image_optimizer.rb
 - lib/jekyll/image_optimizer/image_optimizer.rb
 - lib/jekyll/image_optimizer/synchronizer.rb
-homepage: http://rubygems.org/gems/jekyll-image_optimizer
+homepage: https://github.com/nidi3/jekyll-image_optimizer
 licenses:
 - Apache
 metadata: {}