natour 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb00323054987bfbb4e15631640c781d2e44f1c1a86dae3d7fafca37ecdfe0d8
-  data.tar.gz: 99cb9c130f9aefaecb5c68684b1e52ccd12628ae2b1d0e4e316a485a304ce761
+  metadata.gz: 653a7f10629f9d5cb63e991eba1e4693e88dcf3b26d0a92978f98601d8223507
+  data.tar.gz: 8e8671274bab8ac94bec16bcd5d967cdd337ccfb81e63b406d3d066d0689951d
 SHA512:
-  metadata.gz: 35670a2a3872135b9cad97eac2c27af4205aaea5cf1db6b38c8757589e281061ad6b22b3469e2c4ae0c350701541fdea92170d837ed4e931445f26d2f2bb7aa7
-  data.tar.gz: a784e70dba0803b538a58676f143e38f93b9d252d706ae470bb91bc90caef687c86464179ae2d53d20522595af02e0aadfb1cdc7b89b60f1d36449547e7b7e92
+  metadata.gz: f8a3ec14f64440b08bc1e291ac20bd7cff86cef27509010c253779eab32ca26098667b8d5b13b216f8f486174b326f201941201da98a4b4ed8e22d3a43d2407f
+  data.tar.gz: 3554afc251f92900f32fe59e925c690cc9f1de77f7e3b84c0a94c5885a2706543ddca2b0a6cd50c11a0ea13918923c3e1766ef7059d938ed89fae49d49135a8c

data/CHANGELOG.adoc

@@ -6,6 +6,18 @@ The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog^],
 
 == Unreleased
 
+== 0.3.0 - 2021-03-07
+
+=== Changed
+
+- Sort the reports according to their GPS track
+- Bump minimum required Ruby version to 2.5
+- Change font in PDF output to support ♀ and ♂ symbols
+
+=== Fixed
+
+- Make source code compatible with Ruby version 2.5
+
 == 0.2.0 - 2021-01-24
 
 === Added

data/README.adoc

@@ -45,7 +45,7 @@ sudo apt install build-essential patch ruby-dev zlib1g-dev liblzma-dev
 +
 [source,shell]
 ----
-sudo apt install libvips42
+sudo apt install libvips
 ----
 
 . Install https://www.google.com/chrome/[Google Chrome-Webbroser^]

data/lib/natour/config.rb

@@ -5,14 +5,12 @@ module Natour
   class Config
     def self.load_file(filename, default: {}, dirs: [Dir.home, Dir.pwd])
       dirs.map do |dir|
-        begin
-          YAML.safe_load(
-            File.read(Pathname(dir).join(filename)),
-            permitted_classes: [Symbol]
-          )
-        rescue Errno::ENOENT
-          {}
-        end
+        YAML.safe_load(
+          File.read(Pathname(dir).join(filename)),
+          [Symbol]
+        )
+      rescue Errno::ENOENT
+        {}
       end.reduce(default, &:merge)
     end
   end

data/lib/natour/convert.rb

@@ -16,7 +16,8 @@ module Natour
       standalone: true,
       attributes: {
         'pdf-theme' => 'natour',
-        'pdf-themesdir' => "#{__dir__}/data/themes"
+        'pdf-themesdir' => "#{__dir__}/data/themes",
+        'pdf-fontsdir' => "#{__dir__}/data/fonts"
       }
     )
 

data/lib/natour/data/themes/natour-theme.yml

@@ -1,5 +1,14 @@
 ---
 extends: default
+font:
+  catalog:
+    DejaVu Serif Condensed:
+      normal: dejavuserifcondensed-normal.ttf
+      italic: dejavuserifcondensed-italic.ttf
+      bold: dejavuserifcondensed-bold.ttf
+      bold_italic: dejavuserifcondensed-bold_italic.ttf
+base:
+  font-family: DejaVu Serif Condensed
 footer:
   recto:
     left:

data/lib/natour/report.rb

@@ -47,6 +47,7 @@ module Natour
                      else
                        Pathname.glob("**/*.{#{track_formats.join(',')}}", File::FNM_CASEFOLD)
                                .map { |filename| GPSTrack.load_file(filename.to_s) }
+                               .sort_by { |gps_track| [gps_track.date, gps_track.path] }
                      end
 
         if create_map

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natour
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Simon Gysi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -70,14 +70,14 @@ dependencies:
   name: fit4ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '3.7'
 - !ruby/object:Gem::Dependency
@@ -180,6 +180,10 @@ files:
 - lib/natour/config.rb
 - lib/natour/convert.rb
 - lib/natour/create.rb
+- lib/natour/data/fonts/dejavuserifcondensed-bold.ttf
+- lib/natour/data/fonts/dejavuserifcondensed-bold_italic.ttf
+- lib/natour/data/fonts/dejavuserifcondensed-italic.ttf
+- lib/natour/data/fonts/dejavuserifcondensed-normal.ttf
 - lib/natour/data/js/bootstrap.min.js
 - lib/natour/data/js/jquery-3.5.1.slim.min.js
 - lib/natour/data/js/loader.js
@@ -201,6 +205,8 @@ homepage: https://rubygems.org/gems/natour
 licenses:
 - MIT
 metadata:
+  bug_tracker_uri: https://github.com/simongysi/natour/issues
+  changelog_uri: https://github.com/simongysi/natour/blob/main/CHANGELOG.adoc
   source_code_uri: https://github.com/simongysi/natour
 post_install_message:
 rdoc_options: []
@@ -210,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="