natour 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 731b0453c6a936a6207ce9802c212ed6747631eaedac2c88becc01420774f066
-  data.tar.gz: b8558c8228ddc650b44c92632f55d44737cdb9f5ac2114e1b472b8cb860d12d2
+  metadata.gz: b125a5ba293c91fa5efcb56ee32bc6e5ed52c1b8daf82439bcbec6c7b279a29d
+  data.tar.gz: bda03749fc2db89b56adadbb8bfb1522b8e116d294be244f918f9a6142005d07
 SHA512:
-  metadata.gz: a866a26f237240eeb30e6b4ca8aa5e82c1bfb7db472d18951a5fccb6e3c873f6b0683b9c04bfe60202d81442edb3205e7b8a7d44dd4eddad09329c1a4d181d9e
-  data.tar.gz: f181d95ffb4df6445c649a51b6d762bd8d801ccfcdc57c616e8dad7cb30f5b52afe5daf294c1ae76c4ecec9efa719f03dbceae84dd9db7a2fdbfbed870d97f09
+  metadata.gz: c3ddac7902534aec8e14fb546287a45d6fd589c3b4c445b1291bef15d209b7eb9c43484f169ee7e3b9dcac44939b57f4d19d6fae07a261edf6d12499af11d16a
+  data.tar.gz: e1eebd6fa2c8704e25afe48c2120a146d0513f17a55df883d68aad05bbedd08e04173455119abe06ab8ef15894358b650a5590be74435ffd166f27e698c6aef6

data/CHANGELOG.adoc

@@ -6,6 +6,19 @@ The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog^],
 
 == Unreleased
 
+== 0.5.0 - 2021-08-16
+
+=== Added
+
+- Reflect the date of the last update in the revision date
+- Add captions to species lists in the AsciiDoc output
+- Group species lists by taxonomic groups in the AsciiDoc output
+
+=== Fixed
+
+- Support species lists of Flora Helvetica exported from Favoriten
+- Consider botanical names with the authority name preceding the subspecies
+
 == 0.4.0 - 2021-05-02
 
 === Added

data/lib/natour.rb

@@ -1,3 +1,4 @@
+require 'natour/utils/botanical_name_utils'
 require 'natour/utils/date_utils'
 require 'natour/utils/stdout_utils'
 require 'natour/convert'

data/lib/natour/asciinurse.rb

@@ -30,9 +30,10 @@ module Natour
       doc << "= #{title}"
       if author
         doc << author
-        doc << Date.today.strftime('%d.%m.%Y')
+        doc << ':revdate: {docdate}'
       end
       doc << ':figure-caption!:'
+      doc << ':table-caption!:'
       doc << ':pdf-page-mode: none'
       doc << ':title-page:'
       if title_image
@@ -88,35 +89,45 @@ module Natour
         end
       end
       unless species_lists.empty?
-        birds_info = OpenStruct.new(
-          title: 'Vogelarten',
-          headers: %w[Deutscher\ Name Wissenschaftlicher\ Name],
-          columns: %i[name_de name]
-        )
-        plants_info = OpenStruct.new(
-          title: 'Pflanzenarten',
-          headers: %w[Wissenschaftlicher\ Name Deutscher\ Name],
-          columns: %i[name name_de]
-        )
         doc << '<<<'
         doc << ''
         doc << '== Artenlisten'
         doc << ''
-        species_lists.each.with_index(1) do |species_list, index|
-          info = {
-            birds: birds_info,
-            plants: plants_info
-          }[species_list.group]
+        index = 1
+        groups = species_lists.group_by(&:group)
+        [
+          OpenStruct.new(
+            group: :plants,
+            title: 'Pflanzenarten',
+            headers: %w[Wissenschaftlicher\ Name Deutscher\ Name],
+            columns: %i[name name_de]
+          ),
+          OpenStruct.new(
+            group: :birds,
+            title: 'Vogelarten',
+            headers: %w[Deutscher\ Name Wissenschaftlicher\ Name],
+            columns: %i[name_de name]
+          )
+        ].each do |info|
+          group = groups.fetch(info.group, [])
+          next if group.empty?
+
           doc << "=== #{info.title}"
           doc << ''
-          doc << '[cols="1,5,5",options=header]'
-          doc << '|==='
-          doc << "|Nr.|#{info.headers.join('|')}"
-          species_list.each do |species|
-            doc << "|{counter:species_list#{index}}|#{info.columns.map { |method| species.send(method) }.join('|')}"
+          group.each do |species_list|
+            caption = '.Tabelle {counter:species_lists}'
+            caption << ": #{species_list.description}" if species_list.description
+            doc << caption
+            doc << '[cols="1,5,5",options=header]'
+            doc << '|==='
+            doc << "|Nr.|#{info.headers.join('|')}"
+            species_list.each do |species|
+              doc << "|{counter:species_list#{index}}|#{info.columns.map { |method| species.send(method) }.join('|')}"
+            end
+            doc << '|==='
+            doc << ''
+            index += 1
           end
-          doc << '|==='
-          doc << ''
         end
       end
       doc.join("\n")

data/lib/natour/convert.rb

@@ -3,6 +3,7 @@ require 'pathname'
 require 'asciidoctor'
 require 'asciidoctor-pdf'
 require 'vips'
+require 'time'
 
 module Natour
   module_function
@@ -41,6 +42,25 @@ module Natour
       end
     end
 
+    %w[
+      revdate
+      docdate
+      doctime
+      docdatetime
+      localdate
+      localtime
+      localdatetime
+    ].each do |attr_name|
+      date_time = Time.parse(doc.attr(attr_name))
+      if attr_name.end_with?('datetime')
+        doc.set_attr(attr_name, date_time.strftime('%d.%m.%Y %H:%M:%S'))
+      elsif attr_name.end_with?('date')
+        doc.set_attr(attr_name, date_time.strftime('%d.%m.%Y'))
+      elsif attr_name.end_with?('time')
+        doc.set_attr(attr_name, date_time.strftime('%H:%M:%S'))
+      end
+    end
+
     if backend == 'pdf'
       Dir.mktmpdir do |tmp_dir|
         tmp_dir = Pathname(tmp_dir)

data/lib/natour/species_list.rb

@@ -49,16 +49,16 @@ module Natour
                       .map { |description| Species.new(*description.scan(/>([^&(]+)</).flatten.reverse) }
                       .sort_by(&:name_de).uniq
         [SpeciesList.new(filename, date, :ornitho_ch, :birds, name, nil, items)]
-      when /^Favoriten/
+      when /^(Favoriten|NUMMER_FLORA)/
         CSV.open(filename, 'r:bom|utf-8', col_sep: ';', skip_blanks: true) do |csv|
-          chunks = csv.reject { |row| row.count == 1 && row[0] != 'Favoriten' }
-                      .reject { |row| row.count == 4 && row[0] == 'NUMMER_FLORA' }
+          chunks = csv.reject { |row| row.count == 1 }
+                      .map { |row| row[0] == 'NUMMER_FLORA' ? ['Favoriten'] : row }
                       .slice_before { |row| row.count == 1 || row.count == 3 }
                       .reject { |rows| rows.count == 1 }
           chunks.map do |rows|
             name, description = rows.shift
             date = DateUtils.parse(name, Pathname(filename).basename).compact.first
-            items = rows.map { |row| Species.new(row[1][/^(([^ ]+ [^ ]+)(( aggr\.)|( subsp\. [^ ]+))?)/, 1], row[2]) }
+            items = rows.map { |row| Species.new(BotanicalNameUtils.parse(row[1]), row[2]) }
                         .sort_by(&:name).uniq
             SpeciesList.new(
               filename,
@@ -75,7 +75,7 @@ module Natour
         CSV.open(filename, 'r:bom|utf-16le:utf-8', col_sep: "\t", headers: true) do |csv|
           date = DateUtils.parse(Pathname(filename).basename).compact.first
           items = csv.select { |row| row[0] }
-                     .map { |row| Species.new(row[11][/^(([^ ]+ [^ ]+)(( aggr\.)|( subsp\. [^ ]+))?)/, 1], nil) }
+                     .map { |row| Species.new(BotanicalNameUtils.parse(row[11]), nil) }
                      .sort_by(&:name).uniq
           [SpeciesList.new(filename, date, :info_flora, :plants, nil, nil, items)]
         end

data/lib/natour/utils/botanical_name_utils.rb

@@ -0,0 +1,12 @@
+module Natour
+  module BotanicalNameUtils
+    module_function
+
+    def parse(name)
+      result = name.match(/^([^ ]+ [^ ]+)(( aggr\.)|(.*( subsp\. [^ ]+)))?.*$/)
+      return unless result
+
+      "#{result[1]}#{result[3]}#{result[5]}"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natour
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Simon Gysi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -199,6 +199,7 @@ files:
 - lib/natour/species.rb
 - lib/natour/species_list.rb
 - lib/natour/station.rb
+- lib/natour/utils/botanical_name_utils.rb
 - lib/natour/utils/date_utils.rb
 - lib/natour/utils/stdout_utils.rb
 homepage: https://rubygems.org/gems/natour