jekyll-galleries 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0489231e919c218babd6617e37e913be0dd8c72d
-  data.tar.gz: f22848c946b32ac8f1214b92e1ef0c0c9a5abf6d
+  metadata.gz: 97094652304097fd23bedda6bd418b77c8aa6c36
+  data.tar.gz: 5e750d11dfc95fbef20ad81222bc5f62ea46948e
 SHA512:
-  metadata.gz: f34067a34ac82992965a482fce1feb0052eba6db5ce772f3083b9a2d0972d19f58a1d7472d0c7d0486c251d7ada79ad69564c181b297e05598d17687c6e424d5
-  data.tar.gz: 8a88da9bbc312697178aa02018ccc8f79defbc429e947a0765d30d4547e5f8fcd725fcb1727a1eacb1227bb001e6fdcb94c4988ec78327595390ec356131bdbb
+  metadata.gz: 0298c72a757f8b41a5cacb7fa15d0b3d83b178a948743146828d4ad8eafe2a46504861ea881714fb1c6c80059d17d7f5b5568931b28ebdb29d97e19d8d965ab7
+  data.tar.gz: c063ffd4cb8d39d9a77133d90ce44425d47ee9b164852db4457a0c74f74b46f436f7e4ff5c66a74fb144b5abd1f7bc061ac06fffa65dd11cc8eaccdcb94f3ea1

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.8.1 [2014-05-07]
+
+* Fixed bug: thumbnail generation not working
+
 == 0.8.0 [2014-03-13]
 
 * Add `top` as an attribute, for putting an gallery on the top of index page

data/lib/jekyll/galleries.rb

@@ -1,6 +1,6 @@
 require 'RMagick'
+require 'exifr'
 include Magick
-
 include FileUtils
 
 module Jekyll
@@ -25,7 +25,6 @@ module Jekyll
       site.data['galleries'] = []
 
       gallery_dirs = Dir["#{site.source}/#{gallery_dir}/*/"].select { |e| File.directory? e }
-      gallery_dirs.reverse! # in order to sort by date desc
       gallery_dirs.each do |dir|
         generate_gallery_page(dir)
       end
@@ -90,12 +89,17 @@ module Jekyll
       self.data['url'] = URI.escape self.url
 
       # For each photo, initial attributes are `filename` and `url`
-      photos = Dir["#{self.gallery_dir}/*"].map { |e| { filename: File.basename(e), url: URI.escape("/#{self.gen_dir}/#{self.gallery_dir_name}/#{File.basename e}") } } # basic photos attributes
+      photos = Dir["#{self.gallery_dir}/*"].map { |e| { file: File.new(e), filename: File.basename(e), url: URI.escape("/#{self.gen_dir}/#{self.gallery_dir_name}/#{File.basename e}") } } # basic photos attributes
 
       self.data['photos'] = [] # storing an array of Photo
       photos.each do |photo|
-        photo_data = {}
         photo_data = photos_config.find { |e| e['filename'] == photo[:filename] } if photos_config
+        photo_data ||= {}
+        begin
+          photo_data['date'] = EXIFR::JPEG.new(photo[:file].path).date_time.strftime("%F %R")
+        rescue
+          puts "#{photo[:file].path}: cannot load date"
+        end
 
         self.data['photos'] << Photo.new(@site, photo[:filename], self, photo_data)
       end
@@ -145,7 +149,6 @@ module Jekyll
       self.data['filename'] = filename
       self.filename = filename
 
-
       @thumbs_dir = site.config['thumbnails_dir']
       generate_thumbnails if @thumbs_dir
 
@@ -159,7 +162,7 @@ module Jekyll
       size_x = @site.config['thumbnail_x'] || 100
       size_y = @site.config['thumbnail_y'] || 100
 
-      full_thumbs_path = "#{@site.dest}/#{@thumbs_dir}/#{@gallery.gallery_dir_name}"
+      full_thumbs_path = "#{@thumbs_dir}/#{@gallery.gallery_dir_name}"
       FileUtils.mkdir_p(full_thumbs_path, :mode => 0755)
       if File.file?("#{full_thumbs_path}/#{self.filename}") == false or File.mtime("#{@gallery.gallery_dir}/#{self.filename}") > File.mtime("#{full_thumbs_path}/#{self.filename}")
         begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-galleries
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - allenlsy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies: []
 description: Jekyll plugin to automatically generate photo gallery (album) from image
   folder.
@@ -32,7 +32,7 @@ rdoc_options:
 - --line-numbers
 - --all
 - --title
-- jekyll-galleries Application documentation (v0.8.0)
+- jekyll-galleries Application documentation (v0.8.1)
 - --main
 - ChangeLog
 require_paths: