natour 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59d15bbec4750fd92158c6cbff64a201bad92792600a03a0f430e0c77ddcbea0
-  data.tar.gz: 1b6dedc5f83f66173d77a176d2d20815b4055e2b93c98ecd6d6b26117219c03f
+  metadata.gz: 6a5853cf54dee642dc7cf5e2fef40e7a3379266ead197977c4804146b8334ef0
+  data.tar.gz: 13b08bc14434447bb5e6b18605f1c8a1fdadef8bba17e47154eec829095b3e13
 SHA512:
-  metadata.gz: 7dd61ac963164d480e626414bef161e1f1a702d26a2ff71e733a796610b18b7942a5f6ce400329a7c9b3f0566ea501d20f7926285d923d85a4eda4835331f14f
-  data.tar.gz: 1ad29625fc06e4f738c7e7127d3381aa701ec033618c9d2a5c1b7167b56b1890f3ba4c8035a8bfe4f6dba33ddf5a3d6b842f0650a1da22c19b04b149c51c5977
+  metadata.gz: f829da1ae7ae12e9f753274e8200c8d3de4e0d7e6c8cf13d5cdcb6c2c1abb4bf0ce5d8837e22ff32ed4589d2f30c7a4d5175831c24dfe8e642a8cf279be96fa6
+  data.tar.gz: d144ee6947ada5321c828772db6364770dc8bea4616a3022e4c1f99bdc9a3df23e9f8bcd9c0e0dcf29fd74c945513539d19050d8780f0805e32e3ecd981ef69b

data/.natour.yml

@@ -0,0 +1,28 @@
+---
+:report:
+  :create:
+    :out_dir: null
+    :out_file: null
+    :overwrite: false
+    :track_formats:
+      - :gpx
+      - :fit
+    :map: true
+    :map_layers: []
+    :adoc_author: null
+  :convert:
+    :out_dir: null
+    :out_file: null
+    :overwrite: false
+    :backend: :pdf
+    :draft: false
+    :draft_backend: null
+    :image_maxdim: 1800
+:map:
+  :create:
+    :out_dir: null
+    :out_file: null
+    :overwrite: false
+    :gps_colors: []
+    :map_layers: []
+    :image_size: [1200, 900]

data/CHANGELOG.adoc

@@ -4,8 +4,27 @@ All notable changes to this project will be documented in this file.
 
 The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog^], and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Versioning^].
 
+IMPORTANT: As per Semantic Versioning, the major version zero is for initial development and anything may change at any time.
+
 == Unreleased
 
+== 0.11.0 - 2023-04-15
+
+=== Changed
+
+- Specify files to load for a configuration instead of a file and directories.
+- The configuration files must now be named `.natour.yml` (prefixed with a dot).
+
+=== Fixed
+
+- Do not abort creating reports if GPX files do not contain tracks.
+
+== 0.10.0 - 2023-02-18
+
+=== Fixed
+
+- Prevent orphaned section titles and table captions in PDF output.
+
 == 0.9.0 - 2022-10-08
 
 === Added
@@ -31,21 +50,11 @@ The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog^],
 === Changed
 
 - Rename arguments of `Natour::MapGeoAdmin.save_image`, i.e. `tracks` to `gps_files`, `layers` to `map_layers` and `size` to `image_size`.
-+
-IMPORTANT: This is a breaking change.
 - Improve the error reporting on the command line interface in case of file errors.
 - Rework the configuration; the structure and naming follows the command line interface and the keys are of type Ruby Symbol. For details, see the README file.
-+
-IMPORTANT: This is a breaking change. Adapt the configuration file accordingly.
 - Rework the command line interface. Use `natour --help` to get more information.
-+
-IMPORTANT: This is a breaking change. Adapt the commands accordingly.
 - Change `backend` and `draft_backend` arguments of `Natour::convert_report` to symbols.
-+
-IMPORTANT: This is a breaking change. Adapt the configuration file accordingly.
 - Rename `Natour::create` to `Natour::create_reports` and `Natour::convert` to `Natour::convert_report`.
-+
-IMPORTANT: This is a breaking change.
 
 === Fixed
 
@@ -102,8 +111,6 @@ IMPORTANT: This is a breaking change.
 === Removed
 
 - Remove redundant method `Natour::Image.portrait?`.
-+
-IMPORTANT: This is a breaking change. Use `Natour::Image.landscape?` instead.
 
 == 0.3.0 - 2021-03-07
 
@@ -128,8 +135,6 @@ IMPORTANT: This is a breaking change. Use `Natour::Image.landscape?` instead.
 === Changed
 
 - Rename `Natour::SpeciesList.name` to `Natour::SpeciesList.title`.
-+
-IMPORTANT: This is a breaking change.
 - Return an empty array from `Natour::SpeciesList.load_file` if the format is unknown.
 - Change the format of the start time in the AsciiDoc output from _12:30_ to _12:30 Uhr_.
 - Change the format of the duration in the AsciiDoc output from _1h30_ to _1:30 h_.

data/README.adoc

@@ -90,38 +90,11 @@ NOTE: Use `natour --help` to get more information.
 
 === Configuration
 
-The configuration is built by loading https://yaml.org/[YAML^] files in hierarchical order. The files must be named `natour.yml` and are loaded first from the home directory of the current user and then from the current working directory. The values of the previously loaded files are overwritten by the values of the files loaded later. The values are stored internally in nested, dictionary-like collections (Ruby `Hash`), where the structure follows to the command line interface. All keys are of type Ruby `Symbol` and correspond to the commands and options, with middle hyphens replaced by underscores, leading hyphens removed, and without the `no-` prefix for boolean switches. The following configuration file shows all entries and their default values.
+The configuration is built by loading https://yaml.org/[YAML^] files in hierarchical order. The files must be named `.natour.yml` and are loaded first from the home directory of the current user and then from the current working directory. The values of the previously loaded files are overwritten by the values of the files loaded later. The values are stored internally in nested, dictionary-like collections (Ruby `Hash`), where the structure follows to the command line interface. All keys are of type Ruby `Symbol` and correspond to the commands and options, with middle hyphens replaced by underscores, leading hyphens removed, and without the `no-` prefix for boolean switches. The following configuration file shows all entries and their default values.
 
 [source,yml]
 ----
----
-:report:
-  :create:
-    :out_dir: null
-    :out_file: null
-    :overwrite: false
-    :track_formats:
-      - :gpx
-      - :fit
-    :map: true
-    :map_layers: []
-    :adoc_author: null
-  :convert:
-    :out_dir: null
-    :out_file: null
-    :overwrite: false
-    :backend: :pdf
-    :draft: false
-    :draft_backend: null
-    :image_maxdim: 1800
-:map:
-  :create:
-    :out_dir: null
-    :out_file: null
-    :overwrite: false
-    :gps_colors: []
-    :map_layers: []
-    :image_size: [1200, 900]
+include::.natour.yml[]
 ----
 
 How to restrict GPS tracks to the FIT format (see https://developer.garmin.com/fit/[FIT SDK^]) and add additional map layers (see https://api3.geo.admin.ch/api/faq/index.html#which-layers-are-available[API FAQ - GeoAdmin API 3.0 documentation^]) is shown in the example below.

data/bin/natour

@@ -125,41 +125,11 @@ class NatourCmd < Clamp::Command
   end
 end
 
-config = Natour::Config.load_file(
-  Pathname($PROGRAM_NAME).basename.sub_ext('.yml'),
-  default: {
-    report: {
-      create: {
-        out_dir: nil,
-        out_file: nil,
-        overwrite: false,
-        track_formats: %i[gpx fit],
-        map: true,
-        map_layers: [],
-        adoc_author: nil
-      },
-      convert: {
-        out_dir: nil,
-        out_file: nil,
-        overwrite: false,
-        backend: :pdf,
-        draft: false,
-        draft_backend: nil,
-        image_maxdim: 1800
-      }
-    },
-    map: {
-      create: {
-        out_dir: nil,
-        out_file: nil,
-        overwrite: false,
-        gps_colors: [],
-        map_layers: [],
-        image_size: [1200, 900]
-      }
-    }
-  }
-)
+config = Natour::Config.load_files([
+  "#{__dir__}/../.natour.yml",
+  Pathname(Dir.home).join('.natour.yml'),
+  Pathname(Dir.pwd).join('.natour.yml')
+])
 
 NatourCmd.run(
   Pathname($PROGRAM_NAME).basename,

data/lib/natour/asciinurse.rb

@@ -124,7 +124,7 @@ module Natour
             end
             cols = [1] + [5 * info.columns.size / columns.size] * columns.size
             doc << caption
-            doc << "[cols=\"#{cols.join(',')}\",options=header]"
+            doc << "[%breakable,cols=\"#{cols.join(',')}\",options=header]"
             doc << '|==='
             doc << "|Nr.|#{columns.map(&:header).join('|')}"
             species_list.each do |species|

data/lib/natour/config.rb

@@ -4,12 +4,9 @@ require 'yaml'
 
 module Natour
   class Config
-    def self.load_file(filename, default: {}, dirs: [Dir.home, Dir.pwd])
-      configs = dirs.map do |dir|
-        config = YAML.safe_load(
-          File.read(Pathname(dir).join(filename)),
-          permitted_classes: [Symbol]
-        )
+    def self.load_files(filenames, default: {})
+      configs = filenames.map do |filename|
+        config = YAML.safe_load(File.read(filename), permitted_classes: [Symbol])
         config || {}
       rescue Errno::ENOENT
         {}

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

@@ -8,7 +8,9 @@ font:
       bold: dejavuserifcondensed-bold.ttf
       bold_italic: dejavuserifcondensed-bold_italic.ttf
 base:
-  font-family: DejaVu Serif Condensed
+  font_family: DejaVu Serif Condensed
+heading:
+  min_height_after: auto
 footer:
   recto:
     left:

data/lib/natour/gps_track.rb

@@ -29,7 +29,8 @@ module Natour
       format = Pathname(filename).extname.to_s.delete_prefix('.').to_sym if format == :auto
       case format
       when :gpx
-        GPXFile.new(filename)
+        gpx_file = GPXFile.new(filename)
+        gpx_file if gpx_file.types.include?(:track)
       when :fit
         FITFile.new(filename)
       end

data/lib/natour/gpx_file.rb

@@ -9,9 +9,16 @@ module Natour
       'xmlns:gpxtrkx' => 'http://www.garmin.com/xmlschemas/TrackStatsExtension/v1'
     }.freeze
 
+    attr_reader :types
+
     def initialize(filename)
       @doc = Nokogiri.XML(File.read(filename, mode: 'r:utf-8'))
 
+      @types = []
+      @types << :waypoint if @doc.at('/xmlns:gpx/xmlns:wpt', GPX_XMLNS)
+      @types << :route if @doc.at('/xmlns:gpx/xmlns:rte', GPX_XMLNS)
+      @types << :track if @doc.at('/xmlns:gpx/xmlns:trk', GPX_XMLNS)
+
       stats = @doc.at('/xmlns:gpx/xmlns:trk/xmlns:extensions/gpxtrkx:TrackStatsExtension', GPX_XMLNS)
       if stats
         ascent = stats.at('./gpxtrkx:Ascent', GPX_XMLNS).text.to_i
@@ -23,7 +30,7 @@ module Natour
       start_point = to_track_point(@doc.at('/xmlns:gpx/xmlns:trk/xmlns:trkseg[1]/xmlns:trkpt[1]', GPX_XMLNS))
       end_point = to_track_point(@doc.at('/xmlns:gpx/xmlns:trk/xmlns:trkseg[last()]/xmlns:trkpt[last()]', GPX_XMLNS))
 
-      super(filename, start_point.time&.to_date, ascent, descent, distance, duration, start_point, end_point)
+      super(filename, start_point&.time&.to_date, ascent, descent, distance, duration, start_point, end_point)
     end
 
     def to_gpx
@@ -33,6 +40,8 @@ module Natour
     private
 
     def to_track_point(trkpt)
+      return nil unless trkpt
+
       GPSTrackPoint.new(
         trkpt['lat'].to_f,
         trkpt['lon'].to_f,

data/lib/natour/report.rb

@@ -51,6 +51,7 @@ module Natour
                                                     .join(',')
                        Pathname.glob("**/*.{#{track_pattern}}")
                                .map { |filename| GPSTrack.load_file(filename.to_s) }
+                               .compact
                                .sort_by { |gps_track| [gps_track.date, gps_track.path] }
                      end
 

data/lib/natour/utils/errno_utils.rb

@@ -3,7 +3,9 @@ module Natour
     module_function
 
     def split_message(error)
-      error.message.split(/ @ | - /, 3)
+      tokens = error.message.split(/ @ | - /, 3)
+      tokens.insert(1, *[nil] * (3 - tokens.size))
+      tokens
     end
   end
 end

data/lib/natour/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Natour
-  VERSION = '0.9.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natour
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Simon Gysi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2023-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +213,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".natour.yml"
 - CHANGELOG.adoc
 - LICENSE
 - README.adoc