wax_tasks 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd8340a2ecff9fe1d3fa57fa2bbd0d70dfbf33584131d2056a8805ee36e1902
-  data.tar.gz: db4172c4bbd872c5f07e042149137eb321d0b3dd7862819a2cdb4e758c5ae87c
+  metadata.gz: ba72929e69be8107be29473509f19a93631ca31997152b5d31b197e8482cbbeb
+  data.tar.gz: 9bc99826e9a1ebe1a14fe0fbb40ab7e6cbeb8eb941751da26943f1a56d7c3a9e
 SHA512:
-  metadata.gz: 7f001ba8520a410f2601eb6386fd2fca430af7f8feea875497e589454472822a6ceecb8bf41711be8cdff89b45a63f82393da7354a98bd8e0a4392515de4ae65
-  data.tar.gz: abbec63cdc47318a45b9dc3eb74d9341f39f3aac2ba807879bb9008467f1f78c9b4033e2ec344367b54e88d1434717456a71f59fb181d16ac35a5e779f7a7b99
+  metadata.gz: f691c56816b236f8ea623c44622c6a90f5ebe7e16dc6811bb2a30a6d807e6bf6b0fff7684a623611479d333ee39822b0e6818b2561580ad81fccd66e32f373ac
+  data.tar.gz: a49c2570fcdd2cbc1d0e40058a1da612b6234cfdfaa061b8379beb0631baff0f9d587bb9b19efd765ea7721246bcfa5fb0023923038d7380ef8e126eb9c4136a

data/.github/workflows/ci.yml

@@ -1,11 +1,9 @@
 name: ci:test
 on:
+  push: 
+    branches: [main, development, v1*]
   pull_request:
-    paths-ignore:
-      - '**/README.md'
-  push:
-    paths-ignore:
-      - '**/README.md'
+    branches: [main, development, v1*]
 
 jobs:
    rspec:
@@ -16,14 +14,10 @@ jobs:
         sudo sed -i 's/^.*policy.*coder.*none.*PDF.*//' /etc/ImageMagick-6/policy.xml
     - name: install ghostscript
       run: sudo apt-get update && sudo apt-get install -y ghostscript
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-    - name: install
-      run: gem install bundler && bundle
     - name: check for outdated gems
       run: bundle outdated
     - name: test

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.2.2

data/Gemfile

@@ -5,7 +5,6 @@ gemspec
 
 # dev/test utilities
 gem 'bundle-audit', require: false
-gem 'diane', require: false
 gem 'rubocop', require: false
 gem 'simplecov', require: false
 gem 'yard', require: false

data/README.md

@@ -23,30 +23,31 @@ It can be used to:
 
 ## Prerequisites
 
-You'll need `Ruby >= 2.4` with `bundler` installed. Check your versions with:
+You'll need `Ruby >= 3.2` with `bundler` installed. Check your versions with:
 ```bash
 $ ruby -v
-  ruby 2.7.2p137 (2020-10-01 revision 5445e04352) [x86_64-darwin18]
+  ruby 3.2.2 (2023-03-30 revision e51014f9c0) [arm64-darwin22]
 
 $ bundler -v
-  Bundler version 1.16.1
+  Bundler version 2.4.16
 ```
 
 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:
 ```bash
 $ convert -version
-  Version: ImageMagick 6.9.9-20 Q16 x86_64 2017-10-15 http://www.imagemagick.org
-  Copyright: (c) 1999-2017 ImageMagick Studio LLC
-  License: http://www.imagemagick.org/script/license.php
-  Features: Cipher DPC Modules
-  Delegates (built-in): bzlib freetype jng jpeg ltdl lzma png tiff xml zlib
+  Version: ImageMagick 7.1.1-12 Q16-HDRI aarch64 21239 https://imagemagick.org
+  Copyright: (C) 1999 ImageMagick Studio LLC
+  License: https://imagemagick.org/script/license.php
+  Features: Cipher DPC HDRI Modules OpenMP(5.0)
+  Delegates (built-in): bzlib fontconfig freetype gslib heic jng jp2 jpeg jxl lcms lqr ltdl lzma openexr png ps raw tiff webp xml zlib
+  Compiler: gcc (4.2)
 ```
 
 ... and check Ghostscript with:
 ```bash
 $ gs -version
-  GPL Ghostscript 9.21 (2017-03-16)
-  Copyright (C) 2017 Artifex Software, Inc.  All rights reserved.
+  GPL Ghostscript 10.01.2 (2023-06-21)
+  Copyright (C) 2023 Artifex Software, Inc.  All rights reserved.
 ```
 
 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:

data/lib/wax_tasks/record.rb

@@ -6,7 +6,7 @@ module WaxTasks
     attr_reader :pid, :hash
 
     def initialize(hash)
-      @hash  = hash
+      @hash  = hash.compact
       @pid   = @hash.dig 'pid'
     end
 
@@ -54,6 +54,12 @@ module WaxTasks
       @hash.select! { |k, _v| fields.include? k }
     end
 
+    #
+    #
+    def drop_empties!
+      @hash.reject! { |_k, v| v.nil? || v&.empty? }
+    end
+
     #
     #
     def write_to_page(dir)
@@ -63,6 +69,7 @@ module WaxTasks
       if File.exist? path
         0
       else
+        self.drop_empties!
         FileUtils.mkdir_p File.dirname(path)
         File.open(path, 'w') { |f| f.puts "#{@hash.to_yaml}---" }
         1

data/lib/wax_tasks/utils.rb

@@ -108,7 +108,7 @@ module WaxTasks
     # Converts string to snake case and swaps out special chars
     # @return [String]
     def self.slug(str)
-      Utils.remove_diacritics(str).to_s.downcase.tr(' ', '_').gsub(/[^\w-]/, '')
+      Utils.remove_diacritics(str).to_s.tr(' ', '_').gsub(/[^\w-]/, '')
     end
 
     #

data/lib/wax_tasks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WaxTasks
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/wax_tasks.gemspec

@@ -17,17 +17,18 @@ Gem::Specification.new do |spec|
   end
 
   spec.test_files             = Dir['spec/*']
-  spec.required_ruby_version  = '>= 2.4'
+  spec.required_ruby_version  = '>= 3.0'
   spec.metadata['yard.run']   = 'yri'
 
   spec.requirements << 'imagemagick'
   spec.requirements << 'ghostscript'
 
-  spec.add_runtime_dependency 'progress_bar', '~> 1.3'
-  spec.add_runtime_dependency 'rainbow', '~> 3.0'
-  spec.add_runtime_dependency 'rake', '~> 13.0'
-  spec.add_runtime_dependency 'safe_yaml', '~> 1.0'
+  spec.add_runtime_dependency 'progress_bar'
+  spec.add_runtime_dependency 'rainbow'
+  spec.add_runtime_dependency 'rake'
+  spec.add_runtime_dependency 'safe_yaml'
   spec.add_runtime_dependency 'wax_iiif', '~> 0.2'
 
-  spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'yard'
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: wax_tasks
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Marii Nyrop
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-13 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progress_bar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wax_iiif
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rake tasks for minimal exhibition sites with Minicomp/Wax.
 email:
 - marii@nyu.edu
@@ -146,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -155,10 +169,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick
 - ghostscript
-rubygems_version: 3.1.4
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Rake tasks for minimal exhibition sites with Minicomp/Wax.
 test_files:
-- spec/spec_helper.rb
 - spec/setup.rb
+- spec/spec_helper.rb