pandocomatic 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f309756a052d15289809ed50817aab915542e43
-  data.tar.gz: ccdebf26491d9731513ff08523bd96884745c1a3
+  metadata.gz: bc3b0f46b5d3816c21b8094da1fb7eddecda65db
+  data.tar.gz: 5c318325fc7518da70779be34c7d8c42fcf2e68c
 SHA512:
-  metadata.gz: 960aeb18970b6f4b0bd1aae7507a2dbe0ce4a3edb93332b8f194654ddf781ffe2dd21d3f6323e83dd88feb4c601094bd246326418133b25085a52f27f785de91
-  data.tar.gz: 1c0e60f1571f89322890fc6aef04105f9f8760b019d0e352868b55c51035fc93c910829ede0a18919c16acce1f8862ee5ccc3dbbe6c83c3f220d835f68457d3c
+  metadata.gz: 92021af87c7f9811cd9c38cf3c53a78a7c6adb2c20fc4fd61d2b0e6544f07040ed50fca3566e0b0ca23bfb0a5e20006bbf8af4efd212fb5ec8ccf3d4445b8990
+  data.tar.gz: b4c29729de6543873bb40eb84e93f943ca9c3c54e6afe1da31a424b704633eeb9884eabbc1a2d90a05738d0d3b8e93139410f243ac0cfacaa6f292766e0f5fd2

data/lib/pandocomatic/configuration.rb

@@ -153,14 +153,29 @@ module Pandocomatic
 
         def reset_template name, template
             if @templates.has_key? name then
-                @templates[name].merge!(template) do |setting, oldval, newval|
-                    case setting
+                fields = ['glob', 'preprocessors', 'pandoc', 'postprocessors']
+                fields.each do |field|
+                    case field
                     when 'preprocessors', 'postprocessors', 'glob'
-                        oldval.concat(newval).uniq
+                        if @templates[name][field] then
+                            if template[field] then
+                                @templates[name][field].concat(template[field]).uniq!
+                            end
+                        else
+                            if template[field] then
+                                @templates[name][field] = template[field]
+                            end
+                        end
                     when 'pandoc'
-                        oldval.merge newval
-                    else
-                        newval
+                        if @templates[name][field] then
+                            if template[field] then
+                                @templates[name][field].merge! template[field]
+                            end
+                        else
+                            if template[field] then
+                                @templates[name][field] = template[field]
+                            end
+                        end
                     end
                 end
             else

data/lib/pandocomatic/dir_converter.rb

@@ -8,8 +8,8 @@ module Pandocomatic
   class DirConverter
 
     def initialize src, dst, config
-      @src_root = File.absolute_path src
-      @dst_root = File.absolute_path dst
+      @src_root = src
+      @dst_root = dst
       @config = config
     end
 
@@ -101,7 +101,7 @@ module Pandocomatic
       if src_target.start_with? '.' then
         full_src_target = File.expand_path src_target, File.dirname(src)
         dst_target = src_target
-          if full_src_target.start_with? @src_root
+          if full_src_target.start_with? File.absolute_path(@src_root)
             File.symlink dst_target, dst unless File.exist? dst
           else
             warn "Skipping link #{src} because it points to outside the source tree"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru