jekyll-gallery-generator 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2785b3a78aa7f708bb804bd4053452cbcf534b
-  data.tar.gz: bfb6285b42dcff18761e0d18a1e8cfec5c0b14d0
+  metadata.gz: 62eab9e4098f2693e5c613abf7da7c85e69a569a
+  data.tar.gz: 7df6e089d4dc8aa7324699d5ffb7e3b5ab456352
 SHA512:
-  metadata.gz: 34187612c2737f3fbbf2cff03acfd84b77e6863a2d5cb2df29e7d3481cac1d4f2023b4906714736d60696575700c0386d1b7f779de27d0b28cd718d01358774c
-  data.tar.gz: 45311536a4202b90403b3dc6cbe7c13e8834fdc7bf9c5aa31de1dc980276911ffd8c17fd247722d969fe9b022671dd737f05524eb004ee68d6fefd0457a5a5a9
+  metadata.gz: a54307afdc1271a40c94e96828ccd62766c8b2e12318632e2789f286990e7197dec02bf2116e3181415723a3e32aff21a7ca61eb6521bacd78c07996b0839acb
+  data.tar.gz: b841a27c6fc45b3d5fbc1ffd9b694f9f848be05e8b9b8c4599c2ac47b10f589c4ad355607bd7cc1f9dd1e32e6e40a7f33174098da19e2b639b07c588493439b8

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 
 rvm:
-- 2.3
 - 2.2
 
 before_script: bundle update

data/README.md

@@ -39,17 +39,21 @@ IMG_1039.JPG  IMG_1046.JPG  IMG_1057.JPG
 * [ImageMagick](http://www.imagemagick.org/)
 * [RMagick](https://github.com/rmagick/rmagick)
 * [exifr](https://github.com/remvee/exifr/)
+* [Ruby](https://www.ruby-lang.org) >= 2.1
 
 ### Install dependencies on OS X
 
 ```bash
-brew install imagemagick
+brew install imagemagick rbenv
+rbenv install 2.4.0
+rbenv global 2.4.0
 gem install rmagick exifr
 ```
 
 ### Install dependencies on Ubuntu
 
-```apt install libmagick++-dev
+```bash
+apt install libmagick++-dev
 gem install rmagick exifr
 ```
 

data/jekyll-gallery-generator.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |spec|
   spec.name        = "jekyll-gallery-generator"
   spec.summary     = "Generate galleries with thumbnails for your Jekyll site."
-  spec.version     = "1.1.0"
+  spec.version     = "1.2.0"
   spec.authors     = ["Geoff Greer"]
   spec.email       = "geoff@greer.fm"
   spec.homepage    = "https://github.com/ggreer/jekyll-gallery-generator"

data/lib/jekyll-gallery-generator.rb

@@ -191,7 +191,7 @@ module Jekyll
         if symlink
           link_src = site.in_source_dir(image.path)
           link_dest = site.in_dest_dir(image.path)
-          @site.static_files.delete_if { |sf|
+          @site.static_files.delete_if {|sf|
             sf.relative_path == "/" + image.path
           }
           @site.static_files << GalleryFile.new(site, base, dir, name)
@@ -231,7 +231,16 @@ module Jekyll
       puts ""
 
       begin
-        @images.sort!
+        sort_field = gallery_config["sort_field"] || "date_time"
+        if sort_field == "date_time"
+          @images.sort!
+        elsif sort_field == "name"
+          @images.sort! {|a,b| cmp = a.name <=> b.name}
+        else
+          puts "Invalid sort_field for gallery #{gallery_name}: #{sort_field}. Sorting by datetime."
+          @images.sort!
+        end
+
         if gallery_config["sort_reverse"]
           @images.reverse!
         end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-gallery-generator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Geoff Greer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exifr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 description: 
@@ -72,8 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - NOTICE
@@ -93,18 +93,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - imagemagick, >=v6.9 (needed by RMagick)
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate galleries with thumbnails for your Jekyll site.