jekyll-gallery-generator 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +0 -1
  3. data/README.md +6 -2
  4. data/jekyll-gallery-generator.gemspec +1 -1
  5. data/lib/jekyll-gallery-generator.rb +11 -2
  6. metadata +15 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7c2785b3a78aa7f708bb804bd4053452cbcf534b
4
- data.tar.gz: bfb6285b42dcff18761e0d18a1e8cfec5c0b14d0
3
+ metadata.gz: 62eab9e4098f2693e5c613abf7da7c85e69a569a
4
+ data.tar.gz: 7df6e089d4dc8aa7324699d5ffb7e3b5ab456352
5
5
  SHA512:
6
- metadata.gz: 34187612c2737f3fbbf2cff03acfd84b77e6863a2d5cb2df29e7d3481cac1d4f2023b4906714736d60696575700c0386d1b7f779de27d0b28cd718d01358774c
7
- data.tar.gz: 45311536a4202b90403b3dc6cbe7c13e8834fdc7bf9c5aa31de1dc980276911ffd8c17fd247722d969fe9b022671dd737f05524eb004ee68d6fefd0457a5a5a9
6
+ metadata.gz: a54307afdc1271a40c94e96828ccd62766c8b2e12318632e2789f286990e7197dec02bf2116e3181415723a3e32aff21a7ca61eb6521bacd78c07996b0839acb
7
+ data.tar.gz: b841a27c6fc45b3d5fbc1ffd9b694f9f848be05e8b9b8c4599c2ac47b10f589c4ad355607bd7cc1f9dd1e32e6e40a7f33174098da19e2b639b07c588493439b8
data/.travis.yml CHANGED
@@ -1,7 +1,6 @@
1
1
  language: ruby
2
2
 
3
3
  rvm:
4
- - 2.3
5
4
  - 2.2
6
5
 
7
6
  before_script: bundle update
data/README.md CHANGED
@@ -39,17 +39,21 @@ IMG_1039.JPG IMG_1046.JPG IMG_1057.JPG
39
39
  * [ImageMagick](http://www.imagemagick.org/)
40
40
  * [RMagick](https://github.com/rmagick/rmagick)
41
41
  * [exifr](https://github.com/remvee/exifr/)
42
+ * [Ruby](https://www.ruby-lang.org) >= 2.1
42
43
 
43
44
  ### Install dependencies on OS X
44
45
 
45
46
  ```bash
46
- brew install imagemagick
47
+ brew install imagemagick rbenv
48
+ rbenv install 2.4.0
49
+ rbenv global 2.4.0
47
50
  gem install rmagick exifr
48
51
  ```
49
52
 
50
53
  ### Install dependencies on Ubuntu
51
54
 
52
- ```apt install libmagick++-dev
55
+ ```bash
56
+ apt install libmagick++-dev
53
57
  gem install rmagick exifr
54
58
  ```
55
59
 
data/jekyll-gallery-generator.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |spec|
2
2
  spec.name = "jekyll-gallery-generator"
3
3
  spec.summary = "Generate galleries with thumbnails for your Jekyll site."
4
- spec.version = "1.1.0"
4
+ spec.version = "1.2.0"
5
5
  spec.authors = ["Geoff Greer"]
6
6
  spec.email = "geoff@greer.fm"
7
7
  spec.homepage = "https://github.com/ggreer/jekyll-gallery-generator"
data/lib/jekyll-gallery-generator.rb CHANGED
@@ -191,7 +191,7 @@ module Jekyll
191
191
  if symlink
192
192
  link_src = site.in_source_dir(image.path)
193
193
  link_dest = site.in_dest_dir(image.path)
194
- @site.static_files.delete_if { |sf|
194
+ @site.static_files.delete_if {|sf|
195
195
  sf.relative_path == "/" + image.path
196
196
  }
197
197
  @site.static_files << GalleryFile.new(site, base, dir, name)
@@ -231,7 +231,16 @@ module Jekyll
231
231
  puts ""
232
232
 
233
233
  begin
234
- @images.sort!
234
+ sort_field = gallery_config["sort_field"] || "date_time"
235
+ if sort_field == "date_time"
236
+ @images.sort!
237
+ elsif sort_field == "name"
238
+ @images.sort! {|a,b| cmp = a.name <=> b.name}
239
+ else
240
+ puts "Invalid sort_field for gallery #{gallery_name}: #{sort_field}. Sorting by datetime."
241
+ @images.sort!
242
+ end
243
+
235
244
  if gallery_config["sort_reverse"]
236
245
  @images.reverse!
237
246
  end
metadata CHANGED
@@ -1,69 +1,69 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-gallery-generator
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Geoff Greer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-11-23 00:00:00.000000000 Z
11
+ date: 2017-06-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: exifr
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.2'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.2'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rmagick
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '2.12'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '2.12'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jekyll
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '2.0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '2.0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.6'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1.6'
69
69
  description:
@@ -72,8 +72,8 @@ executables: []
72
72
  extensions: []
73
73
  extra_rdoc_files: []
74
74
  files:
75
- - .gitignore
76
- - .travis.yml
75
+ - ".gitignore"
76
+ - ".travis.yml"
77
77
  - Gemfile
78
78
  - LICENSE
79
79
  - NOTICE
@@ -93,18 +93,18 @@ require_paths:
93
93
  - lib
94
94
  required_ruby_version: !ruby/object:Gem::Requirement
95
95
  requirements:
96
- - - '>='
96
+ - - ">="
97
97
  - !ruby/object:Gem::Version
98
98
  version: '0'
99
99
  required_rubygems_version: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  requirements:
105
105
  - imagemagick, >=v6.9 (needed by RMagick)
106
106
  rubyforge_project:
107
- rubygems_version: 2.0.14.1
107
+ rubygems_version: 2.5.1
108
108
  signing_key:
109
109
  specification_version: 4
110
110
  summary: Generate galleries with thumbnails for your Jekyll site.