natour 0.7.0 → 0.9.0

data/lib/natour/config.rb

@@ -1,17 +1,20 @@
+require 'deep_merge/rails_compat'
 require 'pathname'
 require 'yaml'
 
 module Natour
   class Config
     def self.load_file(filename, default: {}, dirs: [Dir.home, Dir.pwd])
-      dirs.map do |dir|
-        YAML.safe_load(
+      configs = dirs.map do |dir|
+        config = YAML.safe_load(
           File.read(Pathname(dir).join(filename)),
           permitted_classes: [Symbol]
         )
+        config || {}
       rescue Errno::ENOENT
         {}
-      end.reduce(default, &:merge)
+      end
+      configs.reduce(default) { |dst, src| dst.deeper_merge!(src, overwrite_arrays: true) }
     end
   end
 end

data/lib/natour/{convert.rb → convert_report.rb}

@@ -1,15 +1,15 @@
-require 'fileutils'
-require 'pathname'
 require 'asciidoctor'
 require 'asciidoctor-pdf'
-require 'vips'
+require 'fileutils'
+require 'pathname'
 require 'time'
+require 'vips'
 
 module Natour
   module_function
 
-  def convert(filename, out_dir: nil, out_file: nil, overwrite: false,
-              backend: 'pdf', draft: false, draft_backend: nil, image_maxdim: 16000)
+  def convert_report(filename, out_dir: nil, out_file: nil, overwrite: false,
+                     backend: :pdf, draft: false, draft_backend: nil, image_maxdim: 16000)
     backend = if draft
                 draft_backend || backend
               else
@@ -65,7 +65,7 @@ module Natour
       end
     end
 
-    if backend == 'pdf'
+    if backend == :pdf
       Dir.mktmpdir do |tmp_dir|
         tmp_dir = Pathname(tmp_dir)
 

data/lib/natour/{create.rb → create_reports.rb}

@@ -1,12 +1,14 @@
+require 'pathname'
+
 module Natour
   module_function
 
-  def create(dir, out_dir: nil, out_file: nil, overwrite: false,
-             track_formats: %i[gpx fit], create_map: true, map_layers: [], adoc_author: nil)
+  def create_reports(dir, out_dir: nil, out_file: nil, overwrite: false,
+                     track_formats: %i[gpx fit], create_map: true, map_layers: [], adoc_author: nil)
     out_dir = Pathname(out_dir || dir)
     out_file = Pathname(out_file || "#{Pathname(dir).realpath.basename}.adoc")
     reports = Report.load_directory(
-      dir, track_formats: track_formats, create_map: create_map, map_layers: map_layers
+      dir, track_formats: track_formats, create_map: create_map, overwrite_map: overwrite, map_layers: map_layers
     )
     reports.map.with_index(1) do |report, index|
       filename = if index < 2