natour 0.3.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 653a7f10629f9d5cb63e991eba1e4693e88dcf3b26d0a92978f98601d8223507
-  data.tar.gz: 8e8671274bab8ac94bec16bcd5d967cdd337ccfb81e63b406d3d066d0689951d
+  metadata.gz: 6c649407352883c9e93ab6d6470413127d54803bb35dc72beb83292c9e521626
+  data.tar.gz: dbeb8f8ae4a412d7832c07ab66d717d40bb5e2ecd096fb076655ef65a6840b53
 SHA512:
-  metadata.gz: f8a3ec14f64440b08bc1e291ac20bd7cff86cef27509010c253779eab32ca26098667b8d5b13b216f8f486174b326f201941201da98a4b4ed8e22d3a43d2407f
-  data.tar.gz: 3554afc251f92900f32fe59e925c690cc9f1de77f7e3b84c0a94c5885a2706543ddca2b0a6cd50c11a0ea13918923c3e1766ef7059d938ed89fae49d49135a8c
+  metadata.gz: b5a810b2ea0220c9eded025e0f00f8e4f782a42b54128f71a2929a84a535e75f45bb3ddff0cf72f7dad08e047c1aaef3b88800e778901405357efd11336b5db0
+  data.tar.gz: a928d426c1840cb57fb7ab58064850572fc2a7e14aeda6086b2c9560c8b2d7e3e8253c268a9070bef91e4c7fb2c0f26daf2e5664a043f29b595d192a0299137f

data/CHANGELOG.adoc

@@ -6,6 +6,57 @@ The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog^],
 
 == Unreleased
 
+== 0.7.0 - 2022-02-14
+
+=== Added
+
+- Add support for Ruby 3.0 and 3.1
+- Support species lists from Vogelführer Birdlife Schweiz
+
+=== Changed
+
+- Return the filenames from `create` and `convert`
+
+=== Removed
+
+- Drop support for Ruby 2.5
+
+=== Fixed
+
+- Add revision date to the AsciiDoc output regardless of the author
+- Prevent conversion from being aborted if a built-in date/time attribute is missing
+
+== 0.6.0 - 2021-11-20
+
+=== Fixed
+
+- Support GPX files containing only mandatory elements (i.e. no extensions)
+- Consider also the image dimensions to determine the orientation, even if the tag is present
+
+== 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
+
+- Show date/time of images in draft output
+- Support preferred conversion backend for draft output
+
+=== Changed
+
+- Remove redundant method `Image.portrait?`
+
 == 0.3.0 - 2021-03-07
 
 === Changed

data/README.adoc

@@ -1,6 +1,6 @@
 = natour
 
-This https://rubygems.org/[RubyGem^] provides an application and a library for reports on nature activities.
+This https://rubygems.org/gems/natour[RubyGem^] provides an application and a library for reports on nature activities.
 
 == Installation
 

data/bin/natour

@@ -17,6 +17,7 @@ config = Natour::Config.load_file(
     'adoc-author' => nil,
     'backend' => 'pdf',
     'draft' => false,
+    'draft-backend' => nil,
     'image-maxdim' => 1800
   }
 )
@@ -27,10 +28,11 @@ option_parser = OptionParser.new do |opts|
   opts.separator(WordWrap.ww(
     'If PATH refers to a directory, one or more reports are created in ' \
     'AsciiDoc format. GPS tracks, images and species lists (Kosmos ' \
-    'Vogelführer, ornitho.ch, Flora Helvetica, Info Flora Online-Feldbuch) ' \
-    'are included. Images of the map section covered by the GPS tracks are ' \
-    'also created and included. If PATH refers to an AsciiDoc file, it is ' \
-    'converted to PDF (or any other supported format).'
+    'Vogelführer, Vogelführer Birdlife Schweiz, ornitho.ch, Flora Helvetica,' \
+    ' Info Flora Online-Feldbuch) are included. Images of the map section ' \
+    'covered by the GPS tracks are also created and included. If PATH refers' \
+    ' to an AsciiDoc file, it is converted to PDF (or any other supported ' \
+    'format).'
   ))
   opts.separator('')
   opts.separator('General:')
@@ -69,6 +71,9 @@ option_parser = OptionParser.new do |opts|
   opts.on('--[no-]draft', 'Show additional information (e.g. image paths)') do |value|
     config['draft'] = value
   end
+  opts.on('--draft-backend BACKEND', 'Preferred conversion backend for draft (pdf, html5 ...)') do |value|
+    config['draft-backend'] = value
+  end
   opts.on('--image-maxdim DIM', 'Shrink oversized images (PDF only)') do |value|
     config['image-maxdim'] = value.to_i
   end
@@ -106,6 +111,7 @@ else
     overwrite: config['overwrite'],
     backend: config['backend'],
     draft: config['draft'],
+    draft_backend: config['draft-backend'],
     image_maxdim: config['image-maxdim']
   )
 end

data/lib/natour/asciinurse.rb

@@ -28,11 +28,10 @@ module Natour
 
       doc = []
       doc << "= #{title}"
-      if author
-        doc << author
-        doc << Date.today.strftime('%d.%m.%Y')
-      end
+      doc << author if author
+      doc << ':revdate: {docdate}'
       doc << ':figure-caption!:'
+      doc << ':table-caption!:'
       doc << ':pdf-page-mode: none'
       doc << ':title-page:'
       if title_image
@@ -77,10 +76,10 @@ module Natour
         doc << '== Bilder'
         doc << ''
         images.each do |image|
-          width = if image.portrait?
-                    '40%'
-                  else
+          width = if image.landscape?
                     '80%'
+                  else
+                    '40%'
                   end
           doc << '.Abbildung {counter:image}'
           doc << "image::#{Pathname(doc_root).join(image.path)}[width=#{width}]"
@@ -88,35 +87,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: ['Wissenschaftlicher Name', 'Deutscher Name'],
+            columns: %i[name name_de]
+          ),
+          OpenStruct.new(
+            group: :birds,
+            title: 'Vogelarten',
+            headers: ['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/config.rb

@@ -7,7 +7,7 @@ module Natour
       dirs.map do |dir|
         YAML.safe_load(
           File.read(Pathname(dir).join(filename)),
-          [Symbol]
+          permitted_classes: [Symbol]
         )
       rescue Errno::ENOENT
         {}

data/lib/natour/convert.rb

@@ -3,12 +3,19 @@ require 'pathname'
 require 'asciidoctor'
 require 'asciidoctor-pdf'
 require 'vips'
+require 'time'
 
 module Natour
   module_function
 
   def convert(filename, out_dir: nil, out_file: nil, overwrite: false,
-              backend: 'pdf', draft: false, image_maxdim: 16000)
+              backend: 'pdf', draft: false, draft_backend: nil, image_maxdim: 16000)
+    backend = if draft
+                draft_backend || backend
+              else
+                backend
+              end
+
     doc = Asciidoctor.load_file(
       filename,
       backend: backend,
@@ -26,10 +33,35 @@ module Natour
     out_file = Pathname(
       out_file || "#{doc.attr('docname')}#{doc.attr('outfilesuffix')}"
     )
+    filename = out_dir.join(out_file)
 
     if draft
       doc.find_by(context: :image).each do |node|
-        node.title = "#{node.title} [#{node.attr('target')}]"
+        target = node.attr('target')
+        image = Image.load_file(dir.join(target).to_s)
+        node.title = "#{node.title} [#{[target, image.date_time].compact.join('|')}]"
+      end
+    end
+
+    %w[
+      revdate
+      docdate
+      doctime
+      docdatetime
+      localdate
+      localtime
+      localdatetime
+    ].each do |attr_name|
+      attr_value = doc.attr(attr_name)
+      next unless attr_value
+
+      date_time = Time.parse(attr_value)
+      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
 
@@ -40,32 +72,24 @@ module Natour
         title_logo_image = doc.attr('title-logo-image')
         if title_logo_image
           target = title_logo_image[/^image:{1,2}(.*?)\[(.*?)\]$/, 1]
-          options = {}
-          options[:autorotate] = true if target =~ /\.jpe?g$/i
-          image = Vips::Image.new_from_file(dir.join(target).to_s, options)
-          scale = image_maxdim / image.size.max.to_f
-          image = image.resize(scale) if scale < 1.0
+          image = Image.load_file(dir.join(target).to_s).autorotate.shrink_to(image_maxdim)
           new_target = tmp_dir.join("title_logo_image_#{Pathname(target).basename}").to_s
-          suppress_output { image.write_to_file(new_target) }
+          image.save_as(new_target)
           doc.set_attr('title-logo-image', title_logo_image.gsub(target, new_target))
         end
 
         doc.find_by(context: :image).each.with_index do |node, index|
           target = node.attr('target')
-          options = {}
-          options[:autorotate] = true if target =~ /\.jpe?g$/i
-          image = Vips::Image.new_from_file(dir.join(target).to_s, options)
-          scale = image_maxdim / image.size.max.to_f
-          image = image.resize(scale) if scale < 1.0
+          image = Image.load_file(dir.join(target).to_s).autorotate.shrink_to(image_maxdim)
           new_target = tmp_dir.join("image#{index}_#{Pathname(target).basename}").to_s
-          suppress_output { image.write_to_file(new_target) }
+          image.save_as(new_target)
           node.set_attr('target', new_target)
         end
 
         FileUtils.mkdir_p(out_dir)
         mode = File::WRONLY | File::CREAT | File::TRUNC | File::BINARY
         mode |= File::EXCL unless overwrite
-        File.open(out_dir.join(out_file), mode) do |file|
+        File.open(filename, mode) do |file|
           doc.write(doc.convert, file)
         end
       end
@@ -73,9 +97,11 @@ module Natour
       FileUtils.mkdir_p(out_dir)
       mode = File::WRONLY | File::CREAT | File::TRUNC
       mode |= File::EXCL unless overwrite
-      File.open(out_dir.join(out_file), mode) do |file|
+      File.open(filename, mode) do |file|
         doc.write(doc.convert, file)
       end
     end
+
+    filename.to_s
   end
 end

data/lib/natour/create.rb

@@ -8,13 +8,14 @@ module Natour
     reports = Report.load_directory(
       dir, track_formats: track_formats, create_map: create_map, map_layers: map_layers
     )
-    reports.each.with_index(1) do |report, index|
+    reports.map.with_index(1) do |report, index|
       filename = if index < 2
                    out_dir.join(out_file)
                  else
                    out_dir.join("#{out_file.basename('.*')} (#{index})#{out_file.extname}")
                  end
       report.save_adoc(filename, overwrite: overwrite, author: adoc_author)
+      filename.to_s
     end
   end
 end

data/lib/natour/gps_track.rb

@@ -71,10 +71,14 @@ module Natour
     end
 
     def round_duration(duration, hours: 0, minutes: 0, seconds: 0)
+      return unless duration
+
       Duration.new(round_multiple_of(duration.to_i, (hours * 60 + minutes) * 60 + seconds))
     end
 
     def round_time(time, hours: 0, minutes: 0, seconds: 0)
+      return unless time
+
       Time.at(round_multiple_of(time.to_i, (hours * 60 + minutes) * 60 + seconds))
     end
   end

data/lib/natour/gpx_file.rb

@@ -1,26 +1,29 @@
 require 'nokogiri'
 require 'duration'
-require 'date'
-require 'time'
+require 'timeliness'
 
 module Natour
   class GPXFile < GPSTrack
+    GPX_XMLNS = {
+      'xmlns' => 'http://www.topografix.com/GPX/1/1',
+      'xmlns:gpxtrkx' => 'http://www.garmin.com/xmlschemas/TrackStatsExtension/v1'
+    }.freeze
+
     def initialize(filename)
       @doc = Nokogiri.XML(File.read(filename, mode: 'r:utf-8'))
 
-      date = Date.parse(@doc.at('/xmlns:gpx/xmlns:metadata/xmlns:time').text)
-      stats = @doc.at('/xmlns:gpx/xmlns:trk/xmlns:extensions/gpxtrkx:TrackStatsExtension')
+      stats = @doc.at('/xmlns:gpx/xmlns:trk/xmlns:extensions/gpxtrkx:TrackStatsExtension', GPX_XMLNS)
       if stats
-        ascent = stats.at('./gpxtrkx:Ascent').text.to_i
-        descent = stats.at('./gpxtrkx:Descent').text.to_i
-        distance = stats.at('./gpxtrkx:Distance').text.to_i
-        duration = Duration.new(stats.at('./gpxtrkx:TotalElapsedTime').text.to_i)
+        ascent = stats.at('./gpxtrkx:Ascent', GPX_XMLNS).text.to_i
+        descent = stats.at('./gpxtrkx:Descent', GPX_XMLNS).text.to_i
+        distance = stats.at('./gpxtrkx:Distance', GPX_XMLNS).text.to_i
+        duration = Duration.new(stats.at('./gpxtrkx:TotalElapsedTime', GPX_XMLNS).text.to_i)
       end
 
-      start_point = to_track_point(@doc.at('/xmlns:gpx/xmlns:trk/xmlns:trkseg[1]/xmlns:trkpt[1]'))
-      end_point = to_track_point(@doc.at('/xmlns:gpx/xmlns:trk/xmlns:trkseg[last()]/xmlns:trkpt[last()]'))
+      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, 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,8 +36,8 @@ module Natour
       GPSTrackPoint.new(
         trkpt['lat'].to_f,
         trkpt['lon'].to_f,
-        trkpt.at('./xmlns:ele').text.to_f,
-        Time.parse(trkpt.at('./xmlns:time').text)
+        trkpt.at('./xmlns:ele')&.text&.to_f,
+        Timeliness.parse(trkpt.at('./xmlns:time')&.text)
       )
     end
   end

data/lib/natour/image.rb

@@ -1,29 +1,54 @@
 require 'vips'
 require 'timeliness'
+require 'fileutils'
+require 'pathname'
 
 module Natour
   class Image
     attr_reader :path
     attr_reader :date_time
 
-    def initialize(path)
+    def initialize(path, image)
       @path = path
-      image = Vips::Image.new_from_file(path)
-      width, height = image.size
-      @portrait = width < height
-      get_field = ->(name) { image.get(name) if image.get_fields.include?(name) }
-      orientation = get_field.call('exif-ifd0-Orientation')
-      @portrait = orientation[/^(\d) \(/, 1].to_i.between?(5, 8) if orientation
-      date_time = get_field.call('exif-ifd0-DateTime')
+      @image = image
+      @landscape = image.width >= image.height
+      orientation = get_field('exif-ifd0-Orientation')
+      @landscape = !@landscape if orientation && orientation[/^(\d) \(/, 1].to_i.between?(5, 8)
+      date_time = get_field('exif-ifd0-DateTime')
       @date_time = Timeliness.parse(date_time[/^(.*?) \(/, 1], format: 'yyyy:mm:dd hh:nn:ss') if date_time
     end
 
-    def portrait?
-      @portrait
+    def self.load_file(filename)
+      Image.new(filename, Vips::Image.new_from_file(filename))
     end
 
     def landscape?
-      !portrait?
+      @landscape
+    end
+
+    def autorotate
+      Image.new(@path, @image.autorot)
+    end
+
+    def shrink_to(maxdim)
+      scale = maxdim / @image.size.max.to_f
+      image = if scale < 1.0
+                @image.resize(scale)
+              else
+                @image.copy
+              end
+      Image.new(@path, image)
+    end
+
+    def save_as(filename)
+      FileUtils.mkdir_p(Pathname(filename).dirname)
+      StdoutUtils.suppress_output { @image.write_to_file(filename) }
+    end
+
+    private
+
+    def get_field(name)
+      @image.get(name) if @image.get_fields.include?(name)
     end
   end
 end

data/lib/natour/report.rb

@@ -34,18 +34,22 @@ module Natour
         path = Pathname(dir)
         title = Pathname.pwd.basename.to_s.encode('utf-8')
                         .gsub(/^\d{4}-\d{2}-\d{2}( |_|-)?/, '')
-        images = Pathname.glob('**/*.{jpg,jpeg}', File::FNM_CASEFOLD)
-                         .map { |filename| Image.new(filename.to_s) }
+        images = Pathname.glob('**/*.{[j|J][p|P][g|G],[j|J][p|P][e|E][g|G]}')
+                         .map { |filename| Image.load_file(filename.to_s) }
                          .sort_by { |image| [image.date_time ? 0 : 1, image.date_time, image.path] }
         species_lists =
-          Pathname.glob('**/*.{csv,kml}', File::FNM_CASEFOLD)
+          Pathname.glob('**/*.{[c|C][s|S][v|V],[k|K][m|M][l|L]}')
                   .map { |filename| SpeciesList.load_file(filename.to_s) }
                   .flatten
                   .sort_by { |species_list| [species_list.type, species_list.date ? 0 : 1, species_list.date] }
         gps_tracks = if track_formats.empty?
                        []
                      else
-                       Pathname.glob("**/*.{#{track_formats.join(',')}}", File::FNM_CASEFOLD)
+                       track_patterns = { gpx: '[g|G][p|P][x|X]', fit: '[f|F][i|I][t|T]' }
+                       track_pattern = track_formats.map { |track_format| track_patterns[track_format] }
+                                                    .compact
+                                                    .join(',')
+                       Pathname.glob("**/*.{#{track_pattern}}")
                                .map { |filename| GPSTrack.load_file(filename.to_s) }
                                .sort_by { |gps_track| [gps_track.date, gps_track.path] }
                      end
@@ -58,7 +62,7 @@ module Natour
                 gps_track.save_gpx(track, overwrite: true)
                 filename = Pathname(gps_track.path).sub_ext('.jpg')
                 map.save_image(filename, tracks: [track], layers: map_layers)
-                Image.new(filename.to_s)
+                Image.load_file(filename.to_s)
               end
             end
           end

data/lib/natour/species_list.rb

@@ -24,9 +24,9 @@ module Natour
     def self.load_file(filename)
       block = IO.binread(filename, 128)
       header = if block.unpack('CC') == [0xff, 0xfe]
-                 block[2..-1].force_encoding('utf-16le').encode('utf-8')
+                 block[2..].force_encoding('utf-16le').encode('utf-8')
                elsif block.unpack('CCC') == [0xef, 0xbb, 0xbf]
-                 block[3..-1].force_encoding('utf-8')
+                 block[3..].force_encoding('utf-8')
                else
                  block
                end
@@ -34,13 +34,20 @@ module Natour
       case header
       when /^Primary/
         CSV.open(filename, 'r:windows-1252:utf-8', headers: true, liberal_parsing: true) do |csv|
-          date = DateParser.parse(Pathname(filename).basename).compact.first
+          date = DateUtils.parse(Pathname(filename).basename).compact.first
           items = csv.map { |row| Species.new(row[1], row[0]) }
                      .sort_by(&:name_de).uniq
           [SpeciesList.new(filename, date, :kosmos_vogelfuehrer, :birds, nil, nil, items)]
         end
+      when /^Name/
+        CSV.open(filename, 'r:bom|utf-8', headers: true) do |csv|
+          date = DateUtils.parse(Pathname(filename).basename).compact.first
+          items = csv.map { |row| Species.new(row[1], row[0]) }
+                     .sort_by(&:name_de).uniq
+          [SpeciesList.new(filename, date, :birdlife_vogelfuehrer, :birds, nil, nil, items)]
+        end
       when /^<\?xml.*?www\.ornitho\.ch/m
-        date = DateParser.parse(Pathname(filename).basename).compact.first
+        date = DateUtils.parse(Pathname(filename).basename).compact.first
         doc = Nokogiri.XML(File.read(filename, mode: 'r:utf-8'))
         folder = doc.at('/xmlns:kml/xmlns:Document/xmlns:Folder/xmlns:Folder/xmlns:Folder')
         name = folder.at('./xmlns:name').text
@@ -49,16 +56,16 @@ module Natour
                       .map { |description| Species.new(*description.scan(/&gt;([^&(]+)&lt;/).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 = DateParser.parse(name, Pathname(filename).basename).compact.first
-            items = rows.map { |row| Species.new(row[1][/^(([^ ]+ [^ ]+)(( aggr\.)|( subsp\. [^ ]+))?)/, 1], row[2]) }
+            date = DateUtils.parse(name, Pathname(filename).basename).compact.first
+            items = rows.map { |row| Species.new(BotanicalNameUtils.parse(row[1]), row[2]) }
                         .sort_by(&:name).uniq
             SpeciesList.new(
               filename,
@@ -73,9 +80,9 @@ module Natour
         end
       when /^obs_id/
         CSV.open(filename, 'r:bom|utf-16le:utf-8', col_sep: "\t", headers: true) do |csv|
-          date = DateParser.parse(Pathname(filename).basename).compact.first
+          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

data/lib/natour/{helpers/date_parser.rb → utils/date_utils.rb}

@@ -1,7 +1,7 @@
 require 'timeliness'
 
 module Natour
-  module DateParser
+  module DateUtils
     module_function
 
     def parse(*args)

data/lib/natour/utils/stdout_utils.rb

@@ -0,0 +1,16 @@
+module Natour
+  module StdoutUtils
+    module_function
+
+    def suppress_output
+      orig_stdout = $stdout.clone
+      orig_stderr = $stderr.clone
+      $stdout.reopen(File.new(File::NULL, 'w'))
+      $stderr.reopen(File.new(File::NULL, 'w'))
+      yield
+    ensure
+      $stdout.reopen(orig_stdout)
+      $stderr.reopen(orig_stderr)
+    end
+  end
+end

data/lib/natour.rb

@@ -1,5 +1,6 @@
-require 'natour/helpers/date_parser'
-require 'natour/helpers/suppress_output'
+require 'natour/utils/botanical_name_utils'
+require 'natour/utils/date_utils'
+require 'natour/utils/stdout_utils'
 require 'natour/convert'
 require 'natour/create'
 require 'natour/asciinurse'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natour
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Simon Gysi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -70,16 +70,16 @@ dependencies:
   name: fit4ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: word_wrap
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +168,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.25'
 description:
 email: simon.gysi@gmail.com
 executables:
@@ -192,8 +206,6 @@ files:
 - lib/natour/gps_track.rb
 - lib/natour/gps_track_point.rb
 - lib/natour/gpx_file.rb
-- lib/natour/helpers/date_parser.rb
-- lib/natour/helpers/suppress_output.rb
 - lib/natour/image.rb
 - lib/natour/map_geo_admin.rb
 - lib/natour/public_transport.rb
@@ -201,7 +213,10 @@ files:
 - lib/natour/species.rb
 - lib/natour/species_list.rb
 - lib/natour/station.rb
-homepage: https://rubygems.org/gems/natour
+- lib/natour/utils/botanical_name_utils.rb
+- lib/natour/utils/date_utils.rb
+- lib/natour/utils/stdout_utils.rb
+homepage: https://github.com/simongysi/natour
 licenses:
 - MIT
 metadata:
@@ -216,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/natour/helpers/suppress_output.rb

@@ -1,14 +0,0 @@
-module Natour
-  module_function
-
-  def suppress_output
-    orig_stdout = $stdout.clone
-    orig_stderr = $stderr.clone
-    $stdout.reopen(File.new(File::NULL, 'w'))
-    $stderr.reopen(File.new(File::NULL, 'w'))
-    yield
-  ensure
-    $stdout.reopen(orig_stdout)
-    $stderr.reopen(orig_stderr)
-  end
-end