wax_tasks 1.1.5 → 1.1.6

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8fd8340a2ecff9fe1d3fa57fa2bbd0d70dfbf33584131d2056a8805ee36e1902
4
- data.tar.gz: db4172c4bbd872c5f07e042149137eb321d0b3dd7862819a2cdb4e758c5ae87c
3
+ metadata.gz: ba72929e69be8107be29473509f19a93631ca31997152b5d31b197e8482cbbeb
4
+ data.tar.gz: 9bc99826e9a1ebe1a14fe0fbb40ab7e6cbeb8eb941751da26943f1a56d7c3a9e
5
5
  SHA512:
6
- metadata.gz: 7f001ba8520a410f2601eb6386fd2fca430af7f8feea875497e589454472822a6ceecb8bf41711be8cdff89b45a63f82393da7354a98bd8e0a4392515de4ae65
7
- data.tar.gz: abbec63cdc47318a45b9dc3eb74d9341f39f3aac2ba807879bb9008467f1f78c9b4033e2ec344367b54e88d1434717456a71f59fb181d16ac35a5e779f7a7b99
6
+ metadata.gz: f691c56816b236f8ea623c44622c6a90f5ebe7e16dc6811bb2a30a6d807e6bf6b0fff7684a623611479d333ee39822b0e6818b2561580ad81fccd66e32f373ac
7
+ data.tar.gz: a49c2570fcdd2cbc1d0e40058a1da612b6234cfdfaa061b8379beb0631baff0f9d587bb9b19efd765ea7721246bcfa5fb0023923038d7380ef8e126eb9c4136a
@@ -1,11 +1,9 @@
1
1
  name: ci:test
2
2
  on:
3
+ push:
4
+ branches: [main, development, v1*]
3
5
  pull_request:
4
- paths-ignore:
5
- - '**/README.md'
6
- push:
7
- paths-ignore:
8
- - '**/README.md'
6
+ branches: [main, development, v1*]
9
7
 
10
8
  jobs:
11
9
  rspec:
@@ -16,14 +14,10 @@ jobs:
16
14
  sudo sed -i 's/^.*policy.*coder.*none.*PDF.*//' /etc/ImageMagick-6/policy.xml
17
15
  - name: install ghostscript
18
16
  run: sudo apt-get update && sudo apt-get install -y ghostscript
19
- - uses: actions/checkout@v2
20
- with:
21
- fetch-depth: 1
17
+ - uses: actions/checkout@v3
22
18
  - uses: ruby/setup-ruby@v1
23
19
  with:
24
20
  bundler-cache: true
25
- - name: install
26
- run: gem install bundler && bundle
27
21
  - name: check for outdated gems
28
22
  run: bundle outdated
29
23
  - name: test
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.7.2
1
+ 3.2.2
data/Gemfile CHANGED
@@ -5,7 +5,6 @@ gemspec
5
5
 
6
6
  # dev/test utilities
7
7
  gem 'bundle-audit', require: false
8
- gem 'diane', require: false
9
8
  gem 'rubocop', require: false
10
9
  gem 'simplecov', require: false
11
10
  gem 'yard', require: false
data/README.md CHANGED
@@ -23,30 +23,31 @@ It can be used to:
23
23
 
24
24
  ## Prerequisites
25
25
 
26
- You'll need `Ruby >= 2.4` with `bundler` installed. Check your versions with:
26
+ You'll need `Ruby >= 3.2` with `bundler` installed. Check your versions with:
27
27
  ```bash
28
28
  $ ruby -v
29
- ruby 2.7.2p137 (2020-10-01 revision 5445e04352) [x86_64-darwin18]
29
+ ruby 3.2.2 (2023-03-30 revision e51014f9c0) [arm64-darwin22]
30
30
 
31
31
  $ bundler -v
32
- Bundler version 1.16.1
32
+ Bundler version 2.4.16
33
33
  ```
34
34
 
35
35
  To use the image derivative tasks, you will also need to have ImageMagick and Ghostscript installed and functional. You can check to see if you have ImageMagick by running:
36
36
  ```bash
37
37
  $ convert -version
38
- Version: ImageMagick 6.9.9-20 Q16 x86_64 2017-10-15 http://www.imagemagick.org
39
- Copyright: (c) 1999-2017 ImageMagick Studio LLC
40
- License: http://www.imagemagick.org/script/license.php
41
- Features: Cipher DPC Modules
42
- Delegates (built-in): bzlib freetype jng jpeg ltdl lzma png tiff xml zlib
38
+ Version: ImageMagick 7.1.1-12 Q16-HDRI aarch64 21239 https://imagemagick.org
39
+ Copyright: (C) 1999 ImageMagick Studio LLC
40
+ License: https://imagemagick.org/script/license.php
41
+ Features: Cipher DPC HDRI Modules OpenMP(5.0)
42
+ Delegates (built-in): bzlib fontconfig freetype gslib heic jng jp2 jpeg jxl lcms lqr ltdl lzma openexr png ps raw tiff webp xml zlib
43
+ Compiler: gcc (4.2)
43
44
  ```
44
45
 
45
46
  ... and check Ghostscript with:
46
47
  ```bash
47
48
  $ gs -version
48
- GPL Ghostscript 9.21 (2017-03-16)
49
- Copyright (C) 2017 Artifex Software, Inc. All rights reserved.
49
+ GPL Ghostscript 10.01.2 (2023-06-21)
50
+ Copyright (C) 2023 Artifex Software, Inc. All rights reserved.
50
51
  ```
51
52
 
52
53
  Next, you'll need a Jekyll site. You can clone the [minicomp/wax demo site](https://github.com/minicomp/wax/) or start a site from scratch with:
@@ -6,7 +6,7 @@ module WaxTasks
6
6
  attr_reader :pid, :hash
7
7
 
8
8
  def initialize(hash)
9
- @hash = hash
9
+ @hash = hash.compact
10
10
  @pid = @hash.dig 'pid'
11
11
  end
12
12
 
@@ -54,6 +54,12 @@ module WaxTasks
54
54
  @hash.select! { |k, _v| fields.include? k }
55
55
  end
56
56
 
57
+ #
58
+ #
59
+ def drop_empties!
60
+ @hash.reject! { |_k, v| v.nil? || v&.empty? }
61
+ end
62
+
57
63
  #
58
64
  #
59
65
  def write_to_page(dir)
@@ -63,6 +69,7 @@ module WaxTasks
63
69
  if File.exist? path
64
70
  0
65
71
  else
72
+ self.drop_empties!
66
73
  FileUtils.mkdir_p File.dirname(path)
67
74
  File.open(path, 'w') { |f| f.puts "#{@hash.to_yaml}---" }
68
75
  1
@@ -108,7 +108,7 @@ module WaxTasks
108
108
  # Converts string to snake case and swaps out special chars
109
109
  # @return [String]
110
110
  def self.slug(str)
111
- Utils.remove_diacritics(str).to_s.downcase.tr(' ', '_').gsub(/[^\w-]/, '')
111
+ Utils.remove_diacritics(str).to_s.tr(' ', '_').gsub(/[^\w-]/, '')
112
112
  end
113
113
 
114
114
  #
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module WaxTasks
4
- VERSION = '1.1.5'
4
+ VERSION = '1.1.6'
5
5
  end
data/wax_tasks.gemspec CHANGED
@@ -17,17 +17,18 @@ Gem::Specification.new do |spec|
17
17
  end
18
18
 
19
19
  spec.test_files = Dir['spec/*']
20
- spec.required_ruby_version = '>= 2.4'
20
+ spec.required_ruby_version = '>= 3.0'
21
21
  spec.metadata['yard.run'] = 'yri'
22
22
 
23
23
  spec.requirements << 'imagemagick'
24
24
  spec.requirements << 'ghostscript'
25
25
 
26
- spec.add_runtime_dependency 'progress_bar', '~> 1.3'
27
- spec.add_runtime_dependency 'rainbow', '~> 3.0'
28
- spec.add_runtime_dependency 'rake', '~> 13.0'
29
- spec.add_runtime_dependency 'safe_yaml', '~> 1.0'
26
+ spec.add_runtime_dependency 'progress_bar'
27
+ spec.add_runtime_dependency 'rainbow'
28
+ spec.add_runtime_dependency 'rake'
29
+ spec.add_runtime_dependency 'safe_yaml'
30
30
  spec.add_runtime_dependency 'wax_iiif', '~> 0.2'
31
31
 
32
- spec.add_development_dependency 'rspec', '~> 3'
32
+ spec.add_development_dependency 'rspec'
33
+ spec.add_development_dependency 'yard'
33
34
  end
metadata CHANGED
@@ -1,71 +1,71 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wax_tasks
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.5
4
+ version: 1.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marii Nyrop
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-13 00:00:00.000000000 Z
11
+ date: 2023-07-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: progress_bar
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '1.3'
19
+ version: '0'
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
- version: '1.3'
26
+ version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rainbow
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '3.0'
33
+ version: '0'
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
- version: '3.0'
40
+ version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '13.0'
47
+ version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '13.0'
54
+ version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: safe_yaml
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: '1.0'
61
+ version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
- version: '1.0'
68
+ version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: wax_iiif
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,30 @@ dependencies:
84
84
  name: rspec
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
- version: '3'
89
+ version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - "~>"
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
- version: '3'
96
+ version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: yard
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - ">="
102
+ - !ruby/object:Gem::Version
103
+ version: '0'
104
+ type: :development
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ">="
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
97
111
  description: Rake tasks for minimal exhibition sites with Minicomp/Wax.
98
112
  email:
99
113
  - marii@nyu.edu
@@ -146,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
146
160
  requirements:
147
161
  - - ">="
148
162
  - !ruby/object:Gem::Version
149
- version: '2.4'
163
+ version: '3.0'
150
164
  required_rubygems_version: !ruby/object:Gem::Requirement
151
165
  requirements:
152
166
  - - ">="
@@ -155,10 +169,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
155
169
  requirements:
156
170
  - imagemagick
157
171
  - ghostscript
158
- rubygems_version: 3.1.4
172
+ rubygems_version: 3.4.17
159
173
  signing_key:
160
174
  specification_version: 4
161
175
  summary: Rake tasks for minimal exhibition sites with Minicomp/Wax.
162
176
  test_files:
163
- - spec/spec_helper.rb
164
177
  - spec/setup.rb
178
+ - spec/spec_helper.rb